diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/accounts/doctype/bank_reconciliation/bank_reconciliation.py index 05c043265dc..980af5844f8 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.py +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr, flt, getdate, now, nowdate from webnotes.model import db_exists from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/accounts/doctype/budget_distribution/budget_distribution.py b/accounts/doctype/budget_distribution/budget_distribution.py index 976fa84c956..f2fff5a0ac6 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.py +++ b/accounts/doctype/budget_distribution/budget_distribution.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import flt from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import msgprint class DocType: diff --git a/accounts/doctype/c_form/c_form.py b/accounts/doctype/c_form/c_form.py index 2636b0cfc4e..e574708a141 100644 --- a/accounts/doctype/c_form/c_form.py +++ b/accounts/doctype/c_form/c_form.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import flt, getdate from webnotes.model.doc import make_autoname -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist class DocType: def __init__(self,d,dl): diff --git a/accounts/doctype/cost_center/cost_center.py b/accounts/doctype/cost_center/cost_center.py index d23b08681cc..8340a8b39fc 100644 --- a/accounts/doctype/cost_center/cost_center.py +++ b/accounts/doctype/cost_center/cost_center.py @@ -16,7 +16,7 @@ from __future__ import unicode_literals import webnotes -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import msgprint from webnotes.utils.nestedset import DocTypeNestedSet diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py index 4408068b355..2acf08efd65 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.py +++ b/accounts/doctype/journal_voucher/journal_voucher.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cint, cstr, flt, fmt_money, formatdate, getdate from webnotes.model.doc import addchild, make_autoname -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint from setup.utils import get_company_currency diff --git a/accounts/doctype/mis_control/mis_control.py b/accounts/doctype/mis_control/mis_control.py index 953fed00fc8..6c4828abf44 100644 --- a/accounts/doctype/mis_control/mis_control.py +++ b/accounts/doctype/mis_control/mis_control.py @@ -17,11 +17,13 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cint, cstr, flt, get_defaults, get_first_day, get_last_day, has_common +from webnotes.utils import cint, cstr, flt, get_first_day, get_last_day, has_common from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import session, msgprint +import webnotes.defaults + sql = webnotes.conn.sql from accounts.utils import get_balance_on, get_fiscal_year @@ -65,7 +67,7 @@ class DocType: #--- from month and to month (for MIS - Comparison Report) ------- month_list = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'] - fiscal_start_month = sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(get_defaults()['fiscal_year'])) + fiscal_start_month = sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(webnotes.defaults.get_global_value("fiscal_year"))) fiscal_start_month = fiscal_start_month and fiscal_start_month[0][0] or 1 mon = [''] for i in range(fiscal_start_month,13): mon.append(month_list[i-1]) diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py index b75142b66e2..ba4dec37151 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import flt from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import msgprint class DocType: diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/accounts/doctype/period_closing_voucher/period_closing_voucher.py index 80e993aff9a..9269661c0aa 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.py +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr, flt, getdate from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/accounts/doctype/pos_setting/pos_setting.py b/accounts/doctype/pos_setting/pos_setting.py index 7f820fee05a..0e68e2aced9 100755 --- a/accounts/doctype/pos_setting/pos_setting.py +++ b/accounts/doctype/pos_setting/pos_setting.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index f1c57586172..3318e4e5dc7 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -17,12 +17,14 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import add_days, cint, cstr, flt, formatdate, get_defaults -from webnotes.model.wrapper import getlist +from webnotes.utils import add_days, cint, cstr, flt, formatdate +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint, _ from setup.utils import get_company_currency +import webnotes.defaults + sql = webnotes.conn.sql from controllers.buying_controller import BuyingController @@ -32,10 +34,6 @@ class DocType(BuyingController): self.tname = 'Purchase Invoice Item' self.fname = 'entries' -# ************************** Trigger Functions **************************** - - # Credit To - # ---------- def get_credit_to(self): acc_head = sql("select name, credit_days from `tabAccount` where (name = %s or (master_name = %s and master_type = 'supplier')) and docstatus != 2", (cstr(self.doc.supplier) + " - " + self.get_company_abbr(),self.doc.supplier)) @@ -57,9 +55,6 @@ class DocType(BuyingController): return ret - - # Get Default Cost Center and Expense Head from Item Master - # ---------------------------------------------------------- def get_default_values(self,args): import json args = json.loads(args) @@ -73,9 +68,6 @@ class DocType(BuyingController): ret['cost_center'] = cost_center and cost_center[0][0] or '' return ret - - # Get Items based on PO or PR - # ---------------------------- def pull_details(self): if self.doc.purchase_receipt_main: self.validate_duplicate_docname('purchase_receipt') @@ -118,16 +110,9 @@ class DocType(BuyingController): ret={'add_tax_rate' :rate and flt(rate[0][0]) or 0 } return ret - - -# *************************** Server Utility Functions ***************************** - # Get Company abbr - # ----------------- def get_company_abbr(self): return sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0] - # Check whether PO or PR is already fetched - # ------------------------------------------ def validate_duplicate_docname(self,doctype): for d in getlist(self.doclist, 'entries'): if doctype == 'purchase_receipt' and cstr(self.doc.purchase_receipt_main) == cstr(d.purchase_receipt): @@ -138,11 +123,6 @@ class DocType(BuyingController): msgprint(cstr(self.doc.purchase_order_main) + " purchase order details have already been pulled.") raise Exception , " Validation Error. " - -# **************************** VALIDATE ******************************** - - # Check for Item.is_Purchase_item = 'Yes' and Item is active - # ------------------------------------------------------------------ def check_active_purchase_items(self): for d in getlist(self.doclist, 'entries'): if d.item_code: # extra condn coz item_code is not mandatory in PV @@ -154,8 +134,6 @@ class DocType(BuyingController): msgprint("Item : '%s' is not Purchase Item"%(d.item_code)) raise Exception - # Check Conversion Rate - # ---------------------- def check_conversion_rate(self): default_currency = get_company_currency(self.doc.company) if not default_currency: @@ -259,7 +237,7 @@ class DocType(BuyingController): raise Exception # import_rate rate = flt(sql('select import_rate from `tabPurchase Order Item` where item_code=%s and parent=%s and name = %s', (d.item_code, d.purchase_order, d.po_detail))[0][0]) - if abs(rate - flt(d.import_rate)) > 1 and cint(get_defaults('maintain_same_rate')): + if abs(rate - flt(d.import_rate)) > 1 and cint(webnotes.defaults.get_global_default('maintain_same_rate')): msgprint("Import Rate for %s in the Purchase Order is %s. Rate must be same as Purchase Order Rate" % (d.item_code,rate)) raise Exception @@ -277,9 +255,6 @@ class DocType(BuyingController): msgprint("Aging Date is mandatory for opening entry") raise Exception - - # Set against account for debit to account - #------------------------------------------ def set_against_expense_account(self): against_acc = [] for d in getlist(self.doclist, 'entries'): @@ -287,8 +262,6 @@ class DocType(BuyingController): against_acc.append(d.expense_account) self.doc.against_expense_account = ','.join(against_acc) - #check in manage account if purchase order required or not. - # ==================================================================================== def po_required(self): res = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'po_required'") if res and res[0][0] == 'Yes': @@ -297,8 +270,6 @@ class DocType(BuyingController): msgprint("Purchse Order No. required against item %s"%d.item_code) raise Exception - #check in manage account if purchase receipt required or not. - # ==================================================================================== def pr_required(self): res = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'pr_required'") if res and res[0][0] == 'Yes': diff --git a/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/accounts/doctype/purchase_invoice/test_purchase_invoice.py index 825c7d03c1f..62296bf5bf8 100644 --- a/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -25,7 +25,7 @@ test_dependencies = ["Item", "Cost Center"] class TestPurchaseInvoice(unittest.TestCase): def test_gl_entries(self): - wrapper = webnotes.model_wrapper(self.get_test_doclist()) + wrapper = webnotes.bean(self.get_test_doclist()) # circumvent the disabled calculation call obj = webnotes.get_obj(doc=wrapper.doc, doclist=wrapper.doclist) @@ -54,7 +54,7 @@ class TestPurchaseInvoice(unittest.TestCase): self.assertEqual([d.debit, d.credit], expected_gl_entries.get(d.account)) def test_purchase_invoice_calculation(self): - wrapper = webnotes.model_wrapper(self.get_test_doclist()) + wrapper = webnotes.bean(self.get_test_doclist()) # circumvent the disabled calculation call obj = webnotes.get_obj(doc=wrapper.doc, doclist=wrapper.doclist) diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py index faf06fdfc37..1250db5c283 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj sql = webnotes.conn.sql diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 8df91a5cb44..a24e256ec9c 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -29,6 +29,7 @@ wn.require('app/utilities/doctype/sms_control/sms_control.js'); // On Load // ------- cur_frm.cscript.onload = function(doc,dt,dn) { + cur_frm.cscript.manage_rounded_total(); if(!doc.customer && doc.debit_to) wn.meta.get_docfield(dt, 'debit_to', dn).print_hide = 0; if (doc.__islocal) { if(!doc.due_date) set_multiple(dt,dn,{due_date:get_today()}); diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index 8ffe17d1d74..997339866dc 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, sendmail from webnotes.utils import comma_and from webnotes.model.doc import make_autoname -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import _, msgprint @@ -858,7 +858,7 @@ def manage_recurring_invoices(next_date=None): where posting_date=%s and recurring_id=%s and docstatus=1""", (next_date, recurring_id)): try: - ref_wrapper = webnotes.model_wrapper('Sales Invoice', ref_invoice) + ref_wrapper = webnotes.bean('Sales Invoice', ref_invoice) new_invoice_wrapper = make_new_invoice(ref_wrapper, next_date) send_notification(new_invoice_wrapper) webnotes.conn.commit() @@ -880,7 +880,7 @@ def manage_recurring_invoices(next_date=None): raise Exception, exception_message def make_new_invoice(ref_wrapper, posting_date): - from webnotes.model.wrapper import clone + from webnotes.model.bean import clone from accounts.utils import get_fiscal_year new_invoice = clone(ref_wrapper) diff --git a/accounts/doctype/sales_invoice/test_sales_invoice.py b/accounts/doctype/sales_invoice/test_sales_invoice.py index c222c1aa638..6dcb713d76e 100644 --- a/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -3,7 +3,7 @@ import unittest class TestSalesInvoice(unittest.TestCase): def make(self): - w = webnotes.model_wrapper(webnotes.copy_doclist(test_records[0])) + w = webnotes.bean(webnotes.copy_doclist(test_records[0])) w.insert() w.submit() return w @@ -17,7 +17,7 @@ class TestSalesInvoice(unittest.TestCase): from accounts.doctype.journal_voucher.test_journal_voucher \ import test_records as jv_test_records - jv = webnotes.model_wrapper(webnotes.copy_doclist(jv_test_records[0])) + jv = webnotes.bean(webnotes.copy_doclist(jv_test_records[0])) jv.doclist[1].against_invoice = w.doc.name jv.insert() jv.submit() diff --git a/accounts/doctype/trend_analyzer_control/trend_analyzer_control.py b/accounts/doctype/trend_analyzer_control/trend_analyzer_control.py index b8461bd1c7e..8c9f227886f 100755 --- a/accounts/doctype/trend_analyzer_control/trend_analyzer_control.py +++ b/accounts/doctype/trend_analyzer_control/trend_analyzer_control.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import add_days, add_months, cint, cstr from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/accounts/page/accounts_browser/accounts_browser.py b/accounts/page/accounts_browser/accounts_browser.py index 1a66fe3819a..68f835733d5 100644 --- a/accounts/page/accounts_browser/accounts_browser.py +++ b/accounts/page/accounts_browser/accounts_browser.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import get_defaults +import webnotes.defaults + from accounts.utils import get_balance_on @webnotes.whitelist() @@ -16,8 +17,8 @@ def get_companies(): if r["role"] in roles and r["match"]=="company")) # if match == company is specified and companies are specified in user defaults - if match and webnotes.user.get_defaults().get("company"): - return webnotes.user.get_defaults().get("company") + if match: + return webnotes.defaults.get_user_default_as_list("company") else: return [r[0] for r in webnotes.conn.sql("""select name from tabCompany where docstatus!=2""")] diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py index f99a0781e96..b94864c211a 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.py +++ b/accounts/page/voucher_import_tool/voucher_import_tool.py @@ -65,7 +65,7 @@ def map_fields(field_list, source, target): def import_vouchers(common_values, data, start_idx, import_type): from webnotes.model.doc import Document - from webnotes.model.wrapper import ModelWrapper + from webnotes.model.bean import Bean from accounts.utils import get_fiscal_year from webnotes.utils.dateutils import parse_date @@ -159,7 +159,7 @@ def import_vouchers(common_values, data, start_idx, import_type): If you entered accounts correctly, please check template once"""] raise Exception - doclist = ModelWrapper([jv]+details) + doclist = Bean([jv]+details) doclist.submit() messages.append("""

[row #%s] diff --git a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt index 5702191a7ca..9ee3b111ed7 100644 --- a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt +++ b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt @@ -2,7 +2,7 @@ { "creation": "2012-11-28 11:24:29", "docstatus": 0, - "modified": "2013-02-05 16:54:57", + "modified": "2013-02-21 11:41:51", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,7 +10,7 @@ "doctype": "Report", "is_standard": "Yes", "name": "__common__", - "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note`.`project_name` as \"Project\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description:Data:120\",\n `tabDelivery Note Item`.amount as \"Amount:Currency:110\",\n (`tabDelivery Note Item`.billed_amt * ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabDelivery Note Item`.amount,0) - (ifnull(`tabDelivery Note Item`.billed_amt,0) * ifnull(`tabDelivery Note`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_amt,0) < ifnull(`tabDelivery Note Item`.export_amount,0)\norder by `tabDelivery Note`.posting_date asc", + "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note`.`project_name` as \"Project\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description:Data:120\",\n `tabDelivery Note Item`.amount as \"Amount:Currency:110\",\n (`tabDelivery Note Item`.billed_amt * ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabDelivery Note Item`.amount,0) - (ifnull(`tabDelivery Note Item`.billed_amt,0) * ifnull(`tabDelivery Note`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and `tabDelivery Note`.status != \"Stopped\"\n and ifnull(`tabDelivery Note Item`.billed_amt,0) < ifnull(`tabDelivery Note Item`.export_amount,0)\norder by `tabDelivery Note`.posting_date asc", "ref_doctype": "Sales Invoice" }, { diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt index 7a82c5cdcd3..8e4c641382f 100644 --- a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt +++ b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-14 14:27:05", "docstatus": 0, - "modified": "2013-02-05 16:55:32", + "modified": "2013-02-21 11:42:29", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,7 +10,7 @@ "doctype": "Report", "is_standard": "Yes", "name": "__common__", - "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description:Data:120\",\n `tabSales Order Item`.amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.export_amount,0)\norder by `tabSales Order`.transaction_date asc", + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description:Data:120\",\n `tabSales Order Item`.amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.export_amount,0)\norder by `tabSales Order`.transaction_date asc", "ref_doctype": "Sales Invoice" }, { diff --git a/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.py b/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.py index d876857ff4a..1ab94a4687f 100644 --- a/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.py +++ b/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.py @@ -16,7 +16,9 @@ #get company from __future__ import unicode_literals -company = filter_values.get('company') or get_defaults()['company'] + +import webnotes.defaults +company = filter_values.get('company') or webnotes.defaults.get_user_default('company') # To date if not filter_values.get('clearance_date1'): diff --git a/accounts/search_criteria/creditors_ledger/creditors_ledger.py b/accounts/search_criteria/creditors_ledger/creditors_ledger.py index 8a3030ddc61..cba3993847a 100644 --- a/accounts/search_criteria/creditors_ledger/creditors_ledger.py +++ b/accounts/search_criteria/creditors_ledger/creditors_ledger.py @@ -16,7 +16,9 @@ #get company from __future__ import unicode_literals -company = filter_values.get('company') or get_defaults()['company'] + +import webnotes.defaults +company = filter_values.get('company') or webnotes.defaults.get_user_default('company') #get company letter head l_head = sql("select letter_head from `tabCompany` where name='%s'" % company) diff --git a/accounts/search_criteria/debtors_ledger/debtors_ledger.py b/accounts/search_criteria/debtors_ledger/debtors_ledger.py index 6ba458a90ca..a2e3c36f67e 100644 --- a/accounts/search_criteria/debtors_ledger/debtors_ledger.py +++ b/accounts/search_criteria/debtors_ledger/debtors_ledger.py @@ -16,7 +16,9 @@ #get company from __future__ import unicode_literals -company = filter_values.get('company') or get_defaults()['company'] + +import webnotes.defaults +company = filter_values.get('company') or webnotes.defaults.get_user_default('company') #get company letter head l_head = sql("select letter_head from `tabCompany` where name='%s'" % company) diff --git a/accounts/utils.py b/accounts/utils.py index 4c904adc893..14ceb4e99e9 100644 --- a/accounts/utils.py +++ b/accounts/utils.py @@ -121,7 +121,7 @@ def add_ac(args=None): args = webnotes.form_dict args.pop("cmd") - ac = webnotes.model_wrapper(args) + ac = webnotes.bean(args) ac.doc.doctype = "Account" ac.doc.old_parent = "" ac.doc.freeze_account = "No" @@ -135,7 +135,7 @@ def add_cc(args=None): args = webnotes.form_dict args.pop("cmd") - cc = webnotes.model_wrapper(args) + cc = webnotes.bean(args) cc.doc.doctype = "Cost Center" cc.doc.old_parent = "" cc.ignore_permissions = 1 diff --git a/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt b/buying/DocType Mapper/Material Request-Purchase Order/Material Request-Purchase Order.txt similarity index 58% rename from buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt rename to buying/DocType Mapper/Material Request-Purchase Order/Material Request-Purchase Order.txt index 5727a0eac06..5d01ac03144 100644 --- a/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt +++ b/buying/DocType Mapper/Material Request-Purchase Order/Material Request-Purchase Order.txt @@ -1,124 +1,124 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2010-08-08 17:09:34", + "docstatus": 0, + "modified": "2013-02-18 13:41:16", "modified_by": "Administrator", - "modified": "2012-07-02 11:12:28" + "owner": "Administrator" }, { - "name": "__common__", - "parent": "Purchase Request-Purchase Order", "doctype": "Table Mapper Detail", - "parenttype": "DocType Mapper", - "parentfield": "table_mapper_details" + "name": "__common__", + "parent": "Material Request-Purchase Order", + "parentfield": "table_mapper_details", + "parenttype": "DocType Mapper" }, { - "name": "__common__", - "parent": "Purchase Request-Purchase Order", "doctype": "Field Mapper Detail", - "parenttype": "DocType Mapper", - "parentfield": "field_mapper_details" - }, - { "name": "__common__", - "to_doctype": "Purchase Order", - "module": "Buying", + "parent": "Material Request-Purchase Order", + "parentfield": "field_mapper_details", + "parenttype": "DocType Mapper" + }, + { "doctype": "DocType Mapper", + "from_doctype": "Material Request", + "module": "Buying", + "name": "__common__", "ref_doc_submitted": 1, - "from_doctype": "Purchase Request" + "to_doctype": "Purchase Order" }, { - "name": "Purchase Request-Purchase Order", - "doctype": "DocType Mapper" + "doctype": "DocType Mapper", + "name": "Material Request-Purchase Order" }, { - "map": "Yes", - "match_id": 0, - "to_field": "company", + "checking_operator": "=", "doctype": "Field Mapper Detail", "from_field": "company", - "checking_operator": "=" - }, - { "map": "Yes", - "match_id": 1, - "to_field": "prevdoc_doctype", - "doctype": "Field Mapper Detail", - "from_field": "parenttype" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "prevdoc_docname", - "doctype": "Field Mapper Detail", - "from_field": "parent" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "prevdoc_detail_docname", - "doctype": "Field Mapper Detail", - "from_field": "name" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "stock_uom", - "doctype": "Field Mapper Detail", - "from_field": "uom" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "conversion_factor", - "doctype": "Field Mapper Detail", - "from_field": "eval:flt(1)" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "stock_qty", - "doctype": "Field Mapper Detail", - "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "qty", - "doctype": "Field Mapper Detail", - "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "schedule_date", - "doctype": "Field Mapper Detail", - "from_field": "schedule_date" - }, - { - "map": "No", "match_id": 0, - "to_field": "transaction_date", + "to_field": "company" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "parenttype", + "map": "Yes", + "match_id": 1, + "to_field": "prevdoc_doctype" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "parent", + "map": "Yes", + "match_id": 1, + "to_field": "prevdoc_docname" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "name", + "map": "Yes", + "match_id": 1, + "to_field": "prevdoc_detail_docname" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "uom", + "map": "Yes", + "match_id": 1, + "to_field": "stock_uom" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "eval:flt(1)", + "map": "Yes", + "match_id": 1, + "to_field": "conversion_factor" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)", + "map": "Yes", + "match_id": 1, + "to_field": "stock_qty" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)", + "map": "Yes", + "match_id": 1, + "to_field": "qty" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "schedule_date", + "map": "Yes", + "match_id": 1, + "to_field": "schedule_date" + }, + { + "checking_operator": ">=", "doctype": "Field Mapper Detail", "from_field": "transaction_date", - "checking_operator": ">=" + "map": "No", + "match_id": 0, + "to_field": "transaction_date" }, { - "reference_key": "prevdoc_docname", - "match_id": 0, "doctype": "Table Mapper Detail", - "from_table": "Purchase Request", + "from_table": "Material Request", + "match_id": 0, + "reference_key": "prevdoc_docname", "to_table": "Purchase Order", "validation_logic": "docstatus = 1" }, { + "doctype": "Table Mapper Detail", + "from_field": "indent_details", + "from_table": "Material Request Item", "match_id": 1, "reference_doctype_key": "prevdoc_doctype", "to_field": "po_details", - "doctype": "Table Mapper Detail", - "from_field": "indent_details", - "from_table": "Purchase Request Item", "to_table": "Purchase Order Item", "validation_logic": "qty > ifnull(ordered_qty,0) and docstatus =1" } diff --git a/buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt b/buying/DocType Mapper/Material Request-Supplier Quotation/Material Request-Supplier Quotation.txt similarity index 57% rename from buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt rename to buying/DocType Mapper/Material Request-Supplier Quotation/Material Request-Supplier Quotation.txt index 1d66116ae2a..0e9bc50735d 100644 --- a/buying/DocType Mapper/Purchase Request-Supplier Quotation/Purchase Request-Supplier Quotation.txt +++ b/buying/DocType Mapper/Material Request-Supplier Quotation/Material Request-Supplier Quotation.txt @@ -1,89 +1,89 @@ [ { - "owner": "Administrator", + "creation": "2012-08-06 20:02:53", "docstatus": 0, - "creation": "2012-08-02 18:36:26", + "modified": "2013-02-18 13:41:13", "modified_by": "Administrator", - "modified": "2012-08-03 12:34:09" + "owner": "Administrator" }, { - "name": "__common__", - "parent": "Purchase Request-Supplier Quotation", "doctype": "Table Mapper Detail", - "parenttype": "DocType Mapper", - "parentfield": "table_mapper_details" + "name": "__common__", + "parent": "Material Request-Supplier Quotation", + "parentfield": "table_mapper_details", + "parenttype": "DocType Mapper" }, { - "name": "__common__", - "parent": "Purchase Request-Supplier Quotation", "doctype": "Field Mapper Detail", - "parenttype": "DocType Mapper", - "parentfield": "field_mapper_details" - }, - { "name": "__common__", - "to_doctype": "Supplier Quotation", - "module": "Buying", + "parent": "Material Request-Supplier Quotation", + "parentfield": "field_mapper_details", + "parenttype": "DocType Mapper" + }, + { "doctype": "DocType Mapper", + "from_doctype": "Material Request", + "module": "Buying", + "name": "__common__", "ref_doc_submitted": 1, - "from_doctype": "Purchase Request" + "to_doctype": "Supplier Quotation" }, { - "name": "Purchase Request-Supplier Quotation", - "doctype": "DocType Mapper" + "doctype": "DocType Mapper", + "name": "Material Request-Supplier Quotation" }, { - "map": "Yes", - "match_id": 0, - "to_field": "company", + "checking_operator": "=", "doctype": "Field Mapper Detail", "from_field": "company", - "checking_operator": "=" - }, - { "map": "Yes", - "match_id": 1, - "to_field": "prevdoc_doctype", - "doctype": "Field Mapper Detail", - "from_field": "parenttype" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "prevdoc_docname", - "doctype": "Field Mapper Detail", - "from_field": "parent" - }, - { - "map": "Yes", - "match_id": 1, - "to_field": "prevdoc_detail_docname", - "doctype": "Field Mapper Detail", - "from_field": "name" - }, - { - "map": "No", "match_id": 0, - "to_field": "transaction_date", + "to_field": "company" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "parenttype", + "map": "Yes", + "match_id": 1, + "to_field": "prevdoc_doctype" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "parent", + "map": "Yes", + "match_id": 1, + "to_field": "prevdoc_docname" + }, + { + "doctype": "Field Mapper Detail", + "from_field": "name", + "map": "Yes", + "match_id": 1, + "to_field": "prevdoc_detail_docname" + }, + { + "checking_operator": ">=", "doctype": "Field Mapper Detail", "from_field": "transaction_date", - "checking_operator": ">=" + "map": "No", + "match_id": 0, + "to_field": "transaction_date" }, { - "reference_key": "prevdoc_docname", - "match_id": 0, "doctype": "Table Mapper Detail", - "from_table": "Purchase Request", + "from_table": "Material Request", + "match_id": 0, + "reference_key": "prevdoc_docname", "to_table": "Supplier Quotation", "validation_logic": "docstatus = 1" }, { + "doctype": "Table Mapper Detail", + "from_field": "indent_details", + "from_table": "Material Request Item", "match_id": 1, "reference_doctype_key": "prevdoc_doctype", "to_field": "quotation_items", - "doctype": "Table Mapper Detail", - "from_field": "indent_details", - "from_table": "Purchase Request Item", "to_table": "Supplier Quotation Item", "validation_logic": "docstatus =1" } diff --git a/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt b/buying/DocType Mapper/Sales Order-Material Request/Sales Order-Material Request.txt old mode 100755 new mode 100644 similarity index 57% rename from buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt rename to buying/DocType Mapper/Sales Order-Material Request/Sales Order-Material Request.txt index 500ca8f26f3..f6423d96a40 --- a/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt +++ b/buying/DocType Mapper/Sales Order-Material Request/Sales Order-Material Request.txt @@ -1,91 +1,98 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2011-05-20 10:07:55", + "docstatus": 0, + "modified": "2013-02-20 18:20:27", "modified_by": "Administrator", - "modified": "2012-04-03 12:49:50" + "owner": "Administrator" }, { - "name": "__common__", - "parent": "Sales Order-Purchase Request", "doctype": "Table Mapper Detail", - "parenttype": "DocType Mapper", - "parentfield": "table_mapper_details" + "name": "__common__", + "parent": "Sales Order-Material Request", + "parentfield": "table_mapper_details", + "parenttype": "DocType Mapper" }, { - "name": "__common__", - "parent": "Sales Order-Purchase Request", "doctype": "Field Mapper Detail", - "parenttype": "DocType Mapper", - "parentfield": "field_mapper_details" - }, - { "name": "__common__", - "to_doctype": "Purchase Request", - "module": "Buying", + "parent": "Sales Order-Material Request", + "parentfield": "field_mapper_details", + "parenttype": "DocType Mapper" + }, + { "doctype": "DocType Mapper", + "from_doctype": "Sales Order", + "module": "Buying", + "name": "__common__", "ref_doc_submitted": 1, - "from_doctype": "Sales Order" + "to_doctype": "Material Request" }, { - "name": "Sales Order-Purchase Request", - "doctype": "DocType Mapper" + "doctype": "DocType Mapper", + "name": "Sales Order-Material Request" }, { - "map": "No", - "match_id": 0, - "to_field": "transaction_date", + "checking_operator": ">=", "doctype": "Field Mapper Detail", "from_field": "transaction_date", - "checking_operator": ">=" + "map": "No", + "match_id": 0, + "to_field": "transaction_date" }, { + "doctype": "Field Mapper Detail", + "from_field": "eval:\"Purchase\"", "map": "Yes", "match_id": 0, - "to_field": "company", + "to_field": "material_request_type" + }, + { + "checking_operator": "=", "doctype": "Field Mapper Detail", "from_field": "company", - "checking_operator": "=" + "map": "Yes", + "match_id": 0, + "to_field": "company" }, { + "doctype": "Field Mapper Detail", + "from_field": "parent", "map": "Yes", "match_id": 1, - "to_field": "sales_order_no", - "doctype": "Field Mapper Detail", - "from_field": "parent" + "to_field": "sales_order_no" }, { + "doctype": "Field Mapper Detail", + "from_field": "stock_uom", "map": "Yes", "match_id": 1, - "to_field": "uom", - "doctype": "Field Mapper Detail", - "from_field": "stock_uom" + "to_field": "uom" }, { + "doctype": "Field Mapper Detail", + "from_field": "reserved_warehouse", "map": "Yes", "match_id": 1, - "to_field": "warehouse", - "doctype": "Field Mapper Detail", - "from_field": "reserved_warehouse" + "to_field": "warehouse" }, { - "reference_key": "prevdoc_detail_docname", - "match_id": 1, - "reference_doctype_key": "prevdoc_doctype", - "to_field": "indent_details", "doctype": "Table Mapper Detail", "from_field": "sales_order_details", "from_table": "Sales Order Item", - "to_table": "Purchase Request Item", + "match_id": 1, + "reference_doctype_key": "prevdoc_doctype", + "reference_key": "prevdoc_detail_docname", + "to_field": "indent_details", + "to_table": "Material Request Item", "validation_logic": "docstatus=1" }, { - "reference_key": "prevdoc_docname", - "match_id": 0, "doctype": "Table Mapper Detail", "from_table": "Sales Order", - "to_table": "Purchase Request", + "match_id": 0, + "reference_key": "prevdoc_docname", + "to_table": "Material Request", "validation_logic": "docstatus = 1" } ] \ No newline at end of file diff --git a/buying/doctype/purchase_common/purchase_common.py b/buying/doctype/purchase_common/purchase_common.py index 550fc9f3698..6af08c65202 100644 --- a/buying/doctype/purchase_common/purchase_common.py +++ b/buying/doctype/purchase_common/purchase_common.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import add_days, cint, cstr, flt from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint, _ @@ -33,17 +33,17 @@ class DocType(BuyingController): self.doc = doc self.doclist = doclist - self.chk_tol_for_list = ['Purchase Request - Purchase Order', 'Purchase Order - Purchase Receipt', 'Purchase Order - Purchase Invoice'] + self.chk_tol_for_list = ['Material Request - Purchase Order', 'Purchase Order - Purchase Receipt', 'Purchase Order - Purchase Invoice'] self.update_qty = { - 'Purchase Request - Purchase Order': 'ordered_qty', + 'Material Request - Purchase Order': 'ordered_qty', 'Purchase Order - Purchase Receipt': 'received_qty', 'Purchase Order - Purchase Invoice': 'billed_qty', 'Purchase Receipt - Purchase Invoice': 'billed_qty' } self.update_percent_field = { - 'Purchase Request - Purchase Order': 'per_ordered', + 'Material Request - Purchase Order': 'per_ordered', 'Purchase Order - Purchase Receipt': 'per_received', 'Purchase Order - Purchase Invoice': 'per_billed', 'Purchase Receipt - Purchase Invoice': 'per_billed' @@ -51,7 +51,7 @@ class DocType(BuyingController): # used in validation for items and update_prevdoc_detail self.doctype_dict = { - 'Purchase Request': 'Purchase Request Item', + 'Material Request': 'Material Request Item', 'Purchase Order': 'Purchase Order Item', 'Purchase Receipt': 'Purchase Receipt Item' } @@ -75,7 +75,7 @@ class DocType(BuyingController): item = sql("select lead_time_days from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())" % cstr(d.item_code) , as_dict = 1) ltd = item and cint(item[0]['lead_time_days']) or 0 if ltd and obj.doc.transaction_date: - if d.fields.has_key('lead_time_date') or obj.doc.doctype == 'Purchase Request': + if d.fields.has_key('lead_time_date') or obj.doc.doctype == 'Material Request': d.lead_time_date = cstr(add_days( obj.doc.transaction_date, cint(ltd))) if not d.fields.has_key('prevdoc_docname') or (d.fields.has_key('prevdoc_docname') and not d.prevdoc_docname): d.schedule_date = cstr( add_days( obj.doc.transaction_date, cint(ltd))) @@ -219,7 +219,7 @@ class DocType(BuyingController): raise Exception # Check if UOM has been modified. - if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Purchase Request': + if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Material Request': msgprint("Please check UOM %s of Item %s which is not present in %s %s ." % (d.uom, d.item_code, d.prevdoc_doctype, d.prevdoc_docname)) raise Exception @@ -288,11 +288,11 @@ class DocType(BuyingController): def get_qty(self,curr_doctype,ref_tab_fname,ref_tab_dn,ref_doc_tname, transaction, curr_parent_name): # Get total Quantities of current doctype (eg. PR) except for qty of this transaction #------------------------------ - # please check as UOM changes from Purchase Request - Purchase Order ,so doing following else uom should be same . + # please check as UOM changes from Material Request - Purchase Order ,so doing following else uom should be same . # i.e. in PO uom is NOS then in PR uom should be NOS - # but if in Purchase Request uom KG it can change in PO + # but if in Material Request uom KG it can change in PO - get_qty = (transaction == 'Purchase Request - Purchase Order') and 'qty * conversion_factor' or 'qty' + get_qty = (transaction == 'Material Request - Purchase Order') and 'qty * conversion_factor' or 'qty' qty = sql("select sum(%s) from `tab%s` where %s = '%s' and docstatus = 1 and parent != '%s'"% ( get_qty, curr_doctype, ref_tab_fname, ref_tab_dn, curr_parent_name)) qty = qty and flt(qty[0][0]) or 0 @@ -312,8 +312,8 @@ class DocType(BuyingController): qty, max_qty, max_qty_plus_tol = flt(curr_ref_qty.split('~~~')[0]), flt(curr_ref_qty.split('~~~')[1]), flt(curr_ref_qty.split('~~~')[1]) # Qty above Tolerance should be allowed only once. - # But there is special case for Transaction 'Purchase Request-Purhcase Order' that there should be no restriction - # One can create any no. of PO against same Purchase Request!!! + # But there is special case for Transaction 'Material Request-Purhcase Order' that there should be no restriction + # One can create any no. of PO against same Material Request!!! if qty >= max_qty and is_submit and flt(curr_qty) > 0: reason = (curr_parent_doctype == 'Purchase Order') and 'Ordered' or (curr_parent_doctype == 'Purchase Receipt') and 'Received' or (curr_parent_doctype == 'Purchase Invoice') and 'Billed' msgprint("Error: Item Code : '%s' of '%s' is already %s." %(item_code,ref_dn,reason)) @@ -364,7 +364,7 @@ class DocType(BuyingController): if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname: transaction = cstr(d.prevdoc_doctype) + ' - ' + cstr(obj.doc.doctype) - curr_qty = (transaction == 'Purchase Request - Purchase Order') and flt(d.qty) * flt(d.conversion_factor) or flt(d.qty) + curr_qty = (transaction == 'Material Request - Purchase Order') and flt(d.qty) * flt(d.conversion_factor) or flt(d.qty) self.update_ref_doctype_dict( flt(curr_qty), d.doctype, d.prevdoc_docname, d.prevdoc_doctype, 'prevdoc_detail_docname', d.prevdoc_detail_docname, transaction, d.item_code, is_submit, obj.doc.doctype, obj.doc.name) # for payable voucher diff --git a/buying/doctype/purchase_order/locale/_messages_doc.json b/buying/doctype/purchase_order/locale/_messages_doc.json index b2bfac523aa..31be1c1ade1 100644 --- a/buying/doctype/purchase_order/locale/_messages_doc.json +++ b/buying/doctype/purchase_order/locale/_messages_doc.json @@ -9,6 +9,7 @@ "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.", "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", "Price List", + "Select Material Request", "Net Total*", "Purchase Order Items Supplied", "Taxes", @@ -19,10 +20,10 @@ "Letter Head", "Currency & Price List", "More Info", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", "Net Total (Import)", "% Received", "Select Print Heading", - "Select Purchase Request", "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "Is Subcontracted", "Contact Person", @@ -42,7 +43,6 @@ "Contact", "Purchase Order Items", "Select Supplier Quotation", - "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", "Rate at which supplier's currency is converted to company's base currency", "Currency", "Purchase Taxes and Charges", diff --git a/buying/doctype/purchase_order/locale/ar-doc.json b/buying/doctype/purchase_order/locale/ar-doc.json index 75d94d019b9..b2bccb0efc8 100644 --- a/buying/doctype/purchase_order/locale/ar-doc.json +++ b/buying/doctype/purchase_order/locale/ar-doc.json @@ -59,6 +59,7 @@ "Remarks": "\u062a\u0635\u0631\u064a\u062d\u0627\u062a", "Required raw materials issued to the supplier for producing a sub - contracted item.": "\u0627\u0644\u0645\u0648\u0627\u062f \u0627\u0644\u062e\u0627\u0645 \u0627\u0644\u0644\u0627\u0632\u0645\u0629 \u0627\u0644\u0635\u0627\u062f\u0631\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u0648\u0631\u062f \u0644\u0625\u0646\u062a\u0627\u062c \u0641\u0631\u0639\u064a - \u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062a\u0639\u0627\u0642\u062f \u0639\u0644\u064a\u0647\u0627.", "Rounded Total": "\u062a\u0642\u0631\u064a\u0628 \u0625\u062c\u0645\u0627\u0644\u064a", + "Select Material Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f", "Select Print Heading": "\u062d\u062f\u062f \u0637\u0628\u0627\u0639\u0629 \u0627\u0644\u0639\u0646\u0648\u0627\u0646", "Select Purchase Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0634\u0631\u0627\u0621", "Select Supplier Quotation": "\u062d\u062f\u062f \u0645\u0632\u0648\u062f \u0627\u0642\u062a\u0628\u0627\u0633", @@ -87,6 +88,7 @@ "Total Tax*": "\u0645\u062c\u0645\u0648\u0639 \u0627\u0644\u0636\u0631\u0627\u0626\u0628 *", "Totals": "\u0627\u0644\u0645\u062c\u0627\u0645\u064a\u0639", "Yes": "\u0646\u0639\u0645", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0645\u0648\u0627\u062f \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0637\u0644\u0628 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633\u0627\u062a \u0645\u0632\u0648\u062f \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0645\u0632\u0648\u062f \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633\u0627\u062a \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/locale/es-doc.json b/buying/doctype/purchase_order/locale/es-doc.json index 91b5358f6dc..c1771e02f3d 100644 --- a/buying/doctype/purchase_order/locale/es-doc.json +++ b/buying/doctype/purchase_order/locale/es-doc.json @@ -59,6 +59,7 @@ "Remarks": "Observaciones", "Required raw materials issued to the supplier for producing a sub - contracted item.": "Requeridos materias primas emitidas al proveedor para producir un sub - \u00edtem contratado.", "Rounded Total": "Total redondeado", + "Select Material Request": "Seleccione Solicitud de material", "Select Print Heading": "Seleccione Imprimir Encabezado", "Select Purchase Request": "Seleccione Solicitud de Compra", "Select Supplier Quotation": "Seleccione Cita Proveedor", @@ -87,6 +88,7 @@ "Total Tax*": "* Total de Impuestos", "Totals": "Totales", "Yes": "S\u00ed", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de solicitudes de materiales m\u00faltiples. Seleccione solicitudes de material de uno en uno y haga clic en el bot\u00f3n de abajo.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de varias Ordenes de Compra. Seleccione Ordenes de Compra uno por uno y haga clic en el bot\u00f3n de abajo.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Usted puede hacer una orden de compra de cotizaciones de proveedores m\u00faltiples. Seleccione Citas Proveedor de uno en uno y haga clic en el bot\u00f3n de abajo." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/locale/fr-doc.json b/buying/doctype/purchase_order/locale/fr-doc.json index 31824778611..56d8fab0e28 100644 --- a/buying/doctype/purchase_order/locale/fr-doc.json +++ b/buying/doctype/purchase_order/locale/fr-doc.json @@ -59,6 +59,7 @@ "Remarks": "Remarques", "Required raw materials issued to the supplier for producing a sub - contracted item.": "Mati\u00e8res premi\u00e8res n\u00e9cessaires d\u00e9livr\u00e9s au fournisseur pour la production d'un \u00e9l\u00e9ment sous - traitance.", "Rounded Total": "Totale arrondie", + "Select Material Request": "S\u00e9lectionnez Demande de Mat\u00e9riel", "Select Print Heading": "S\u00e9lectionnez Imprimer Cap", "Select Purchase Request": "S\u00e9lectionnez la demande d'achat", "Select Supplier Quotation": "S\u00e9lectionnez Devis Fournisseur", @@ -87,6 +88,7 @@ "Total Tax*": "* Total de la taxe", "Totals": "Totaux", "Yes": "Oui", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Vous pouvez faire un bon de commande de mat\u00e9riel demandes multiples. S\u00e9lectionnez demandes de mat\u00e9riel, un par un et cliquez sur le bouton ci-dessous.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Vous pouvez faire une commande \u00e0 partir de demandes d'achat multiples. S\u00e9lectionnez Demande d'Achat un par un et cliquez sur le bouton ci-dessous.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Vous pouvez faire une commande de citations multiples fournisseurs. S\u00e9lectionnez Citations fournisseurs un par un et cliquez sur le bouton ci-dessous." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/locale/hi-doc.json b/buying/doctype/purchase_order/locale/hi-doc.json index 4b04ada53f7..fa80296f4a8 100644 --- a/buying/doctype/purchase_order/locale/hi-doc.json +++ b/buying/doctype/purchase_order/locale/hi-doc.json @@ -60,6 +60,7 @@ "Remarks": "\u091f\u093f\u092a\u094d\u092a\u0923\u093f\u092f\u093e\u0901", "Required raw materials issued to the supplier for producing a sub - contracted item.": "\u0906\u0935\u0936\u094d\u092f\u0915 \u0915\u091a\u094d\u091a\u0947 \u090f\u0915 \u0909\u092a \u0915\u0947 \u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u0915\u0947 \u0932\u093f\u090f \u0906\u092a\u0942\u0930\u094d\u0924\u093f\u0915\u0930\u094d\u0924\u093e \u0915\u094b \u091c\u093e\u0930\u0940 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 - \u0905\u0928\u0941\u092c\u0902\u0927\u093f\u0924 \u0906\u0907\u091f\u092e.", "Rounded Total": "\u0917\u094b\u0932 \u0915\u0941\u0932", + "Select Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", "Select Print Heading": "\u091a\u092f\u0928 \u0936\u0940\u0930\u094d\u0937\u0915 \u092a\u094d\u0930\u093f\u0902\u091f", "Select Purchase Request": "\u0916\u0930\u0940\u0926 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", "Select Supplier Quotation": "\u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0915\u094b\u091f\u0947\u0936\u0928 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", @@ -88,6 +89,7 @@ "Total Tax*": "\u0915\u0941\u0932 \u091f\u0948\u0915\u094d\u0938 *", "Totals": "\u092f\u094b\u0917", "Yes": "\u0939\u093e\u0902", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0915\u094b\u091f\u0947\u0936\u0928 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0915\u094b\u091f\u0947\u0936\u0928 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/locale/hr-doc.json b/buying/doctype/purchase_order/locale/hr-doc.json index e18b23348d1..46d61903970 100644 --- a/buying/doctype/purchase_order/locale/hr-doc.json +++ b/buying/doctype/purchase_order/locale/hr-doc.json @@ -59,6 +59,7 @@ "Remarks": "Primjedbe", "Required raw materials issued to the supplier for producing a sub - contracted item.": "Potrebna sirovina izdane dobavlja\u010d za proizvodnju pod - ugovoreni predmet.", "Rounded Total": "Zaobljeni Ukupno", + "Select Material Request": "Odaberite Materijal Zahtjev", "Select Print Heading": "Odaberite Ispis Naslov", "Select Purchase Request": "Odaberite zahtjev za kupnju", "Select Supplier Quotation": "Odaberite Supplier ponudu", @@ -87,6 +88,7 @@ "Total Tax*": "Ukupno poreza *", "Totals": "Ukupan rezultat", "Yes": "Da", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje od vi\u0161e materijala zahtjeva. Odaberite materijalni zahtijevi jedan po jedan i kliknite na gumb ispod.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje iz vi\u0161e Kupiti zahtjeva. Odaberite kupnje Zahtjevi jednu po jednu i kliknite na gumb ispod.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje iz vi\u0161e dobavlja\u010dima Citati. Odaberite dobavlja\u010d Citati jedan po jedan i kliknite na gumb ispod." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/locale/nl-doc.json b/buying/doctype/purchase_order/locale/nl-doc.json index 461261e2c0a..c29e9856154 100644 --- a/buying/doctype/purchase_order/locale/nl-doc.json +++ b/buying/doctype/purchase_order/locale/nl-doc.json @@ -59,6 +59,7 @@ "Remarks": "Opmerkingen", "Required raw materials issued to the supplier for producing a sub - contracted item.": "Benodigde grondstoffen uitgegeven aan de leverancier voor het produceren van een sub - gecontracteerde item.", "Rounded Total": "Afgeronde Totaal", + "Select Material Request": "Selecteer Materiaal aanvragen", "Select Print Heading": "Selecteer Print rubriek", "Select Purchase Request": "Selecteer Purchase Request", "Select Supplier Quotation": "Selecteer Leverancier Offerte", @@ -87,6 +88,7 @@ "Total Tax*": "Totaal BTW *", "Totals": "Totalen", "Yes": "Ja", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "U kunt een bestelling van meerdere Materiaal aanvragen. Selecteer Materiaal Verzoeken een voor een en klikt u op de knop.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "U kunt een bestelling van meerdere aankoopverzoeken. Selecteer inkoopaanvragen een voor een en klikt u op de knop.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "U kunt een bestelling van meerdere Leverancier Quotations. Selecteer Leverancier Offertes een voor een en klikt u op de knop." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/locale/pt-doc.json b/buying/doctype/purchase_order/locale/pt-doc.json index 911db936004..4bc2feec2fb 100644 --- a/buying/doctype/purchase_order/locale/pt-doc.json +++ b/buying/doctype/purchase_order/locale/pt-doc.json @@ -59,6 +59,7 @@ "Remarks": "Observa\u00e7\u00f5es", "Required raw materials issued to the supplier for producing a sub - contracted item.": "Mat\u00e9rias-primas necess\u00e1rias emitidos para o fornecedor para a produ\u00e7\u00e3o de um sub - item contratado.", "Rounded Total": "Total arredondado", + "Select Material Request": "Selecione solicitar material", "Select Print Heading": "Selecione Imprimir t\u00edtulo", "Select Purchase Request": "Selecione Pedido de Compra", "Select Supplier Quotation": "Selecione cota\u00e7\u00e3o Fornecedor", @@ -87,6 +88,7 @@ "Total Tax*": "* Total de impostos", "Totals": "Totais", "Yes": "Sim", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Voc\u00ea pode fazer um pedido de compra de materiais pedidos m\u00faltiplos. Selecione pedidos se um por um e clique no bot\u00e3o abaixo.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Voc\u00ea pode fazer uma ordem de compra de pedidos de compras m\u00faltiplas. Selecione pedidos de compra, um por um e clique no bot\u00e3o abaixo.", "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Voc\u00ea pode fazer uma ordem de compra de Cita\u00e7\u00f5es Fornecedor m\u00faltiplos. Selecione Quotations Fornecedor, um por um e clique no bot\u00e3o abaixo." } \ No newline at end of file diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js index fa377049166..cf1db141c0d 100644 --- a/buying/doctype/purchase_order/purchase_order.js +++ b/buying/doctype/purchase_order/purchase_order.js @@ -109,7 +109,11 @@ cur_frm.fields_dict['po_details'].grid.get_field('project_name').get_query = fun } cur_frm.fields_dict['indent_no'].get_query = function(doc) { - return 'SELECT DISTINCT `tabPurchase Request`.`name` FROM `tabPurchase Request` WHERE `tabPurchase Request`.company = "' + doc.company + '" and `tabPurchase Request`.`docstatus` = 1 and `tabPurchase Request`.`status` != "Stopped" and ifnull(`tabPurchase Request`.`per_ordered`,0) < 99.99 and `tabPurchase Request`.%(key)s LIKE "%s" ORDER BY `tabPurchase Request`.`name` DESC LIMIT 50'; + return 'SELECT DISTINCT `name` FROM `tabMaterial Request` \ + WHERE material_request_type="Purchase" and company = "' + doc.company + + '" and `docstatus` = 1 and `status` != "Stopped" \ + and ifnull(`per_ordered`,0) < 99.99 and %(key)s LIKE "%s" \ + ORDER BY `name` DESC LIMIT 50'; } @@ -208,7 +212,7 @@ cur_frm.pformat.indent_no = function(doc, cdt, cdn){ if(cl.length){ prevdoc_list = new Array(); for(var i=0;i flt(d.received_qty) and \ flt( flt(flt(d.qty) - flt(d.received_qty))*flt(d.conversion_factor)) or 0 - # No updates in Purchase Request on Stop / Unstop - if cstr(d.prevdoc_doctype) == 'Purchase Request' and not is_stopped: + # No updates in Material Request on Stop / Unstop + if cstr(d.prevdoc_doctype) == 'Material Request' and not is_stopped: # get qty and pending_qty of prevdoc curr_ref_qty = pc_obj.get_qty(d.doctype, 'prevdoc_detail_docname', - d.prevdoc_detail_docname, 'Purchase Request Item', - 'Purchase Request - Purchase Order', self.doc.name) + d.prevdoc_detail_docname, 'Material Request Item', + 'Material Request - Purchase Order', self.doc.name) max_qty, qty, curr_qty = flt(curr_ref_qty.split('~~~')[1]), \ flt(curr_ref_qty.split('~~~')[0]), 0 if flt(qty) + flt(po_qty) > flt(max_qty): curr_qty = flt(max_qty) - flt(qty) # special case as there is no restriction - # for Purchase Request - Purchase Order + # for Material Request - Purchase Order curr_qty = curr_qty > 0 and curr_qty or 0 else: curr_qty = flt(po_qty) @@ -232,7 +231,7 @@ class DocType(BuyingController): # 4.Set Status as Cancelled webnotes.conn.set(self.doc,'status','Cancelled') - # 5.Update Purchase Requests Pending Qty and accordingly it's Status + # 5.Update Material Requests Pending Qty and accordingly it's Status pc_obj.update_prevdoc_detail(self,is_submit = 0) # 6.Update Bin @@ -262,7 +261,6 @@ class DocType(BuyingController): self.delete_irrelevant_raw_material() #---------------calculate amt in Purchase Order Item Supplied------------- - self.calculate_amount(d) def add_bom(self, d): #----- fetching default bom from Bill of Materials instead of Item Master -- @@ -315,15 +313,6 @@ class DocType(BuyingController): d.parent = 'old_par:'+self.doc.name d.save() - def calculate_amount(self, d): - amt = 0 - for i in getlist(self.doclist,'po_raw_material_details'): - - if(i.reference_name == d.name): - i.amount = flt(i.required_qty)* flt(i.rate) - amt += i.amount - d.rm_supp_cost = amt - # On Update # ---------------------------------------------------------------------------------------------------- def on_update(self): diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 38c526e5421..101b0a93e57 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-29 17:54:10", + "creation": "2013-01-29 19:25:50", "docstatus": 0, - "modified": "2013-01-29 18:16:48", + "modified": "2013-02-18 13:37:11", "modified_by": "Administrator", "owner": "Administrator" }, @@ -31,9 +31,7 @@ "parent": "Purchase Order", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1 + "read": 1 }, { "doctype": "DocType", @@ -181,16 +179,16 @@ "fieldtype": "Section Break" }, { - "description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", + "description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", "doctype": "DocField", "fieldname": "indent_no", "fieldtype": "Link", "hidden": 0, - "label": "Select Purchase Request", + "label": "Select Material Request", "no_copy": 1, "oldfieldname": "indent_no", "oldfieldtype": "Link", - "options": "Purchase Request", + "options": "Material Request", "print_hide": 1 }, { @@ -814,26 +812,58 @@ "no_copy": 1, "print_hide": 1 }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "Material User", + "submit": 0, + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Material User", + "submit": 0, + "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "Purchase Manager", + "submit": 0, + "write": 0 + }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", - "role": "Purchase User", + "permlevel": 0, + "report": 1, + "role": "Purchase Manager", "submit": 1, "write": 1 }, - { - "doctype": "DocPerm", - "match": "supplier", - "role": "Supplier" - }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", - "role": "Purchase Manager", + "permlevel": 0, + "report": 1, + "role": "Purchase User", "submit": 1, "write": 1 }, @@ -842,8 +872,15 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "role": "Material User", - "submit": 0, - "write": 0 + "permlevel": 1, + "role": "All", + "submit": 0 + }, + { + "doctype": "DocPerm", + "match": "supplier", + "permlevel": 0, + "report": 1, + "role": "Supplier" } ] \ No newline at end of file diff --git a/buying/doctype/purchase_order_item/locale/_messages_doc.json b/buying/doctype/purchase_order_item/locale/_messages_doc.json index 15c8a49671c..905fb5c6178 100644 --- a/buying/doctype/purchase_order_item/locale/_messages_doc.json +++ b/buying/doctype/purchase_order_item/locale/_messages_doc.json @@ -2,7 +2,7 @@ "Supplier Quotation Item", "Item Name", "Discount %", - "Purchase Request Detail No", + "Material Request Detail No", "Prevdoc DocType", "Warehouse", "UOM", @@ -12,18 +12,18 @@ "Project Name", "Brand", "Supplier Part Number", + "Material Request Date", "Stock UOM", "Received Qty", "Buying", - "Purchase Requisition No", "Rate ", "Reqd By Date", + "Material Request No", "Rate*", "Amount*", "Amount", "Ref Rate ", "Item Group", - "Purchase Request Date", "If Supplier Part Number exists for given Item, it gets stored here", "Item Code", "Ref Rate*", diff --git a/buying/doctype/purchase_order_item/locale/ar-doc.json b/buying/doctype/purchase_order_item/locale/ar-doc.json index 49343d69d91..8e0a844bc48 100644 --- a/buying/doctype/purchase_order_item/locale/ar-doc.json +++ b/buying/doctype/purchase_order_item/locale/ar-doc.json @@ -12,6 +12,9 @@ "Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629", "Item Name": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0627\u0633\u0645", "Item Tax Rate": "\u0627\u0644\u0628\u0646\u062f \u0636\u0631\u064a\u0628\u0629", + "Material Request Date": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0627\u0631\u064a\u062e", + "Material Request Detail No": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0644\u0627", + "Material Request No": "\u0637\u0644\u0628 \u0645\u0648\u0627\u062f \u0644\u0627", "Page Break": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0633\u062a\u0631\u0627\u062d\u0629", "Prevdoc DocType": "Prevdoc DOCTYPE", "Project Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639", diff --git a/buying/doctype/purchase_order_item/locale/es-doc.json b/buying/doctype/purchase_order_item/locale/es-doc.json index 916b4261dd4..20812aa2bf3 100644 --- a/buying/doctype/purchase_order_item/locale/es-doc.json +++ b/buying/doctype/purchase_order_item/locale/es-doc.json @@ -12,6 +12,9 @@ "Item Group": "Grupo de art\u00edculos", "Item Name": "Nombre del elemento", "Item Tax Rate": "Art\u00edculo Tasa Impositiva", + "Material Request Date": "Material de la Fecha de Solicitud", + "Material Request Detail No": "Materiales Detalle Solicitud de No", + "Material Request No": "Material de Solicitud de No", "Page Break": "Salto de p\u00e1gina", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Nombre del proyecto", diff --git a/buying/doctype/purchase_order_item/locale/fr-doc.json b/buying/doctype/purchase_order_item/locale/fr-doc.json index 96b41bdbae5..c80efeb3d5b 100644 --- a/buying/doctype/purchase_order_item/locale/fr-doc.json +++ b/buying/doctype/purchase_order_item/locale/fr-doc.json @@ -12,6 +12,9 @@ "Item Group": "Groupe d'\u00e9l\u00e9ments", "Item Name": "Nom d'article", "Item Tax Rate": "Taux d'imposition article", + "Material Request Date": "Date de demande de mat\u00e9riel", + "Material Request Detail No": "D\u00e9tail Demande Support Aucun", + "Material Request No": "Demande de Support Aucun", "Page Break": "Saut de page", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Nom du projet", diff --git a/buying/doctype/purchase_order_item/locale/hi-doc.json b/buying/doctype/purchase_order_item/locale/hi-doc.json index 9321e3edbd5..de4483a1e2d 100644 --- a/buying/doctype/purchase_order_item/locale/hi-doc.json +++ b/buying/doctype/purchase_order_item/locale/hi-doc.json @@ -12,6 +12,9 @@ "Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939", "Item Name": "\u092e\u0926 \u0915\u093e \u0928\u093e\u092e", "Item Tax Rate": "\u0906\u0907\u091f\u092e \u0915\u0930 \u0915\u0940 \u0926\u0930", + "Material Request Date": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0924\u093f\u0925\u093f", + "Material Request Detail No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927 \u0935\u093f\u0938\u094d\u0924\u093e\u0930 \u0928\u0939\u0940\u0902", + "Material Request No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0928\u0939\u0940\u0902", "Page Break": "\u092a\u0943\u0937\u094d\u0920\u093e\u0924\u0930", "Prevdoc DocType": "Prevdoc doctype", "Project Name": "\u0907\u0938 \u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e \u0915\u093e \u0928\u093e\u092e", diff --git a/buying/doctype/purchase_order_item/locale/hr-doc.json b/buying/doctype/purchase_order_item/locale/hr-doc.json index 92c196af5e1..685e3334982 100644 --- a/buying/doctype/purchase_order_item/locale/hr-doc.json +++ b/buying/doctype/purchase_order_item/locale/hr-doc.json @@ -11,6 +11,9 @@ "Item Group": "Stavka Grupa", "Item Name": "Stavka Ime", "Item Tax Rate": "Stavka Porezna stopa", + "Material Request Date": "Materijal Zahtjev Datum", + "Material Request Detail No": "Materijal Zahtjev Detalj Ne", + "Material Request No": "Materijal Zahtjev Ne", "Page Break": "Prijelom stranice", "Prevdoc DocType": "Prevdoc DOCTYPE", "Project Name": "Naziv projekta", diff --git a/buying/doctype/purchase_order_item/locale/nl-doc.json b/buying/doctype/purchase_order_item/locale/nl-doc.json index 71c4778fddb..3d501a02cf7 100644 --- a/buying/doctype/purchase_order_item/locale/nl-doc.json +++ b/buying/doctype/purchase_order_item/locale/nl-doc.json @@ -12,6 +12,9 @@ "Item Group": "Item Group", "Item Name": "Naam van het punt", "Item Tax Rate": "Item Belastingtarief", + "Material Request Date": "Materiaal Aanvraagdatum", + "Material Request Detail No": "Materiaal Aanvraag Detail Geen", + "Material Request No": "Materiaal aanvragen Geen", "Page Break": "Pagina-einde", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Naam van het project", diff --git a/buying/doctype/purchase_order_item/locale/pt-doc.json b/buying/doctype/purchase_order_item/locale/pt-doc.json index 259f62ccfde..a9bbc7e797f 100644 --- a/buying/doctype/purchase_order_item/locale/pt-doc.json +++ b/buying/doctype/purchase_order_item/locale/pt-doc.json @@ -12,6 +12,9 @@ "Item Group": "Grupo Item", "Item Name": "Nome do item", "Item Tax Rate": "Taxa de Imposto item", + "Material Request Date": "Data de Solicita\u00e7\u00e3o de material", + "Material Request Detail No": "Detalhe materiais Pedido N\u00e3o", + "Material Request No": "Pedido de material no", "Page Break": "Quebra de p\u00e1gina", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Nome do projeto", diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt index c8c21cac779..edb30928f95 100755 --- a/buying/doctype/purchase_order_item/purchase_order_item.txt +++ b/buying/doctype/purchase_order_item/purchase_order_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-30 12:49:48", + "creation": "2013-02-07 11:00:11", "docstatus": 0, - "modified": "2013-02-07 10:49:35", + "modified": "2013-02-18 13:39:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -249,11 +249,11 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, - "label": "Purchase Requisition No", + "label": "Material Request No", "no_copy": 0, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Link", - "options": "Purchase Request", + "options": "Material Request", "print_hide": 1, "print_width": "120px", "read_only": 1, @@ -266,7 +266,7 @@ "fieldtype": "Date", "hidden": 1, "in_filter": 1, - "label": "Purchase Request Date", + "label": "Material Request Date", "oldfieldname": "prevdoc_date", "oldfieldtype": "Date", "print_hide": 1, @@ -279,7 +279,7 @@ "fieldtype": "Data", "hidden": 1, "in_filter": 1, - "label": "Purchase Request Detail No", + "label": "Material Request Detail No", "no_copy": 0, "oldfieldname": "prevdoc_detail_docname", "oldfieldtype": "Data", diff --git a/buying/doctype/purchase_request/__init__.py b/buying/doctype/purchase_request/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/buying/doctype/purchase_request/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/buying/doctype/purchase_request/locale/sr-doc.json b/buying/doctype/purchase_request/locale/sr-doc.json deleted file mode 100644 index 9203a88f0bd..00000000000 --- a/buying/doctype/purchase_request/locale/sr-doc.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "% Ordered": "\u041d\u0430\u0440\u0443\u0447\u0435\u043d\u043e%", - "% of materials ordered against this Purchase Requisition": "% \u041c\u0430\u0442\u0435\u0440\u0438\u0458\u0430\u043b\u0430 \u043d\u0430\u0440\u0435\u0434\u0438\u043e \u043f\u0440\u043e\u0442\u0438\u0432 \u043e\u0432\u0435 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0435 \u041d\u0430\u0431\u0430\u0432\u043a\u0430", - "Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template": "\u0414\u043e\u0434\u0430\u0432\u0430\u045a\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u0430 \u0438 \u0443\u0441\u043b\u043e\u0432\u0435 \u0437\u0430 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0443 \u041d\u0430\u0431\u0430\u0432\u043a\u0430. \u0422\u0430\u043a\u043e\u0452\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u0438\u043f\u0440\u0435\u043c\u0438\u0442\u0438 \u0423\u0441\u043b\u043e\u0432\u0438 \u043f\u043e\u0441\u043b\u043e\u0432\u0430\u045a\u0430 \u043c\u0430\u0441\u0442\u0435\u0440 \u0438 \u043a\u043e\u0440\u0438\u0448\u045b\u0435\u045a\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430", - "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "\u041f\u043e\u0441\u043b\u0435 \u043e\u0442\u043a\u0430\u0437\u0438\u0432\u0430\u045a\u0430 \u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0446\u0438\u0458\u0435, \u0434\u0438\u0458\u0430\u043b\u043e\u0433 \u045b\u0435 \u0432\u0430\u0441 \u043f\u0438\u0442\u0430\u0442\u0438 \u0440\u0430\u0437\u043b\u043e\u0433 \u0437\u0430 \u043e\u0442\u043a\u0430\u0437 \u043a\u043e\u0458\u0438 \u045b\u0435 \u0431\u0438\u0442\u0438 \u043f\u0440\u0438\u043a\u0430\u0437\u0430\u043d\u0438 \u0443 \u043e\u0432\u043e\u0458 \u043e\u0431\u043b\u0430\u0441\u0442\u0438", - "Amended From": "\u0418\u0437\u043c\u0435\u045a\u0435\u043d\u0430 \u043e\u0434", - "Amendment Date": "\u0410\u043c\u0430\u043d\u0434\u043c\u0430\u043d \u0414\u0430\u0442\u0443\u043c", - "Buying": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430", - "Cancel Reason": "\u041e\u0442\u043a\u0430\u0436\u0438 \u0440\u0430\u0437\u043b\u043e\u0433", - "Cancelled": "\u041e\u0442\u043a\u0430\u0437\u0430\u043d", - "Company": "\u041a\u043e\u043c\u043f\u0430\u043d\u0438\u0458\u0430", - "Draft": "\u041d\u0430\u0446\u0440\u0442", - "File List": "\u0424\u0438\u043b\u0435 \u041b\u0438\u0441\u0442", - "Filing in Additional Information about the Purchase Requisition will help you analyze your data better.": "\u041f\u043e\u0434\u043d\u043e\u0448\u0435\u045a\u0435 \u0434\u043e\u0434\u0430\u0442\u043d\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0458\u0435 \u043e \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0438 \u041d\u0430\u0431\u0430\u0432\u043a\u0430 \u045b\u0435 \u0432\u0430\u043c \u043f\u043e\u043c\u043e\u045b\u0438 \u0434\u0430 \u0430\u043d\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u0442\u0435 \u043f\u043e\u0434\u0430\u0442\u043a\u0435 \u0431\u043e\u0459\u0435.", - "Fiscal Year": "\u0424\u0438\u0441\u043a\u0430\u043b\u043d\u0430 \u0433\u043e\u0434\u0438\u043d\u0430", - "Get Terms and Conditions": "\u0413\u0435\u0442 \u0423\u0441\u043b\u043e\u0432\u0435", - "IDT": "\u0418\u0414\u0422", - "Items": "\u0410\u0440\u0442\u0438\u043a\u043b\u0438", - "Letter Head": "\u041f\u0438\u0441\u043c\u043e \u0413\u043b\u0430\u0432\u0430", - "More Info": "\u0412\u0438\u0448\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0458\u0430", - "Name of the entity who has requested for the Purchase Requisition": "\u0418\u043c\u0435 \u0435\u043d\u0442\u0438\u0442\u0435\u0442\u0430 \u043a\u043e\u0458\u0438 \u0458\u0435 \u0442\u0440\u0430\u0436\u0438\u043e \u0437\u0430 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0443 \u041d\u0430\u0431\u0430\u0432\u043a\u0430", - "One or multiple Sales Order no which generated this Purchase Requisition": "\u0408\u0435\u0434\u0430\u043d \u0438\u043b\u0438 \u0432\u0438\u0448\u0435 \u043f\u0440\u043e\u0434\u0430\u0458\u0435 \u041d\u0430\u043b\u043e\u0433 \u043d\u0435\u043c\u0430 \u043a\u043e\u0458\u0438 \u0433\u0435\u043d\u0435\u0440\u0438\u0448\u0443 \u043e\u0432\u0443 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0443 \u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0446\u0438\u0458\u0435", - "Pull Sales Order Items": "\u041f\u043e\u0432\u0443\u0446\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u0430\u0458\u0435 \u0441\u0442\u0430\u0432\u043a\u0435 \u043f\u043e\u0440\u0443\u045f\u0431\u0438\u043d\u0435", - "Purchase Request": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0417\u0430\u0445\u0442\u0435\u0432", - "Purchase Requisition Details": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0414\u0435\u0442\u0430\u0459\u0438 \u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0446\u0438\u0458\u0435", - "Remarks": "\u041f\u0440\u0438\u043c\u0435\u0434\u0431\u0435", - "Requested By": "\u0417\u0430\u0445\u0442\u0435\u0432\u0430\u043e", - "Sales Order No": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430 \u041d\u0430\u0440\u0443\u0447\u0438\u0442\u0435 \u041d\u0435\u043c\u0430", - "Select Terms and Conditions": "\u0418\u0437\u0430\u0431\u0435\u0440\u0438\u0442\u0435 \u0423\u0441\u043b\u043e\u0432\u0435", - "Select the relevant company name if you have multiple companies": "\u0418\u0437\u0430\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0434\u0433\u043e\u0432\u0430\u0440\u0430\u0458\u0443\u045b\u0443 \u0438\u043c\u0435 \u043a\u043e\u043c\u043f\u0430\u043d\u0438\u0458\u0435, \u0430\u043a\u043e \u0438\u043c\u0430\u0442\u0435 \u0432\u0438\u0448\u0435 \u043f\u0440\u0435\u0434\u0443\u0437\u0435\u045b\u0430", - "Series": "\u0421\u0435\u0440\u0438\u0458\u0430", - "Status": "\u0421\u0442\u0430\u0442\u0443\u0441", - "Stopped": "\u0417\u0430\u0443\u0441\u0442\u0430\u0432\u0459\u0435\u043d", - "Submitted": "\u041f\u043e\u0434\u043d\u0435\u0442", - "Terms and Conditions": "\u0423\u0441\u043b\u043e\u0432\u0438", - "Terms and Conditions Content": "\u0423\u0441\u043b\u043e\u0432\u0438 \u043a\u043e\u0440\u0438\u0448\u045b\u0435\u045a\u0430 \u0441\u0430\u0434\u0440\u0436\u0430\u0458\u0430", - "The date at which current entry is corrected in the system.": "\u0414\u0430\u0442\u0443\u043c \u043d\u0430 \u043a\u043e\u0458\u0438 \u0442\u0440\u0435\u043d\u0443\u0442\u043d\u0430 \u0441\u0442\u0430\u0432\u043a\u0430 \u0458\u0435 \u0438\u0441\u043f\u0440\u0430\u0432\u0459\u0435\u043d \u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.", - "The date at which current entry is made in system.": "\u0414\u0430\u0442\u0443\u043c \u043d\u0430 \u043a\u043e\u0458\u0438 \u0458\u0435 \u0442\u0440\u0435\u043d\u0443\u0442\u043d\u0438 \u0443\u043d\u043e\u0441 \u043d\u0430\u043f\u0440\u0430\u0432\u0459\u0435\u043d \u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.", - "To manage multiple series please go to Setup > Manage Series": "\u0414\u0430 \u0431\u0438\u0441\u0442\u0435 \u0443\u043f\u0440\u0430\u0432\u0459\u0430\u043b\u0438 \u0432\u0438\u0448\u0435 \u0441\u0435\u0440\u0438\u0458\u0443 \u0438\u0434\u0438\u0442\u0435 \u043d\u0430 \u0421\u0435\u0442\u0443\u043f> \u0423\u043f\u0440\u0430\u0432\u0459\u0430\u045a\u0435 \u0421\u0435\u0440\u0438\u0435\u0441", - "Transaction Date": "\u0422\u0440\u0430\u043d\u0441\u0430\u043a\u0446\u0438\u0458\u0430 \u0414\u0430\u0442\u0443\u043c" -} \ No newline at end of file diff --git a/buying/doctype/purchase_request/locale/ta-doc.json b/buying/doctype/purchase_request/locale/ta-doc.json deleted file mode 100644 index 120e4041152..00000000000 --- a/buying/doctype/purchase_request/locale/ta-doc.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "% Ordered": "% \u0b86\u0ba3\u0bc8\u0baf\u0bbf\u0b9f\u0bcd\u0b9f\u0bbe\u0bb0\u0bcd", - "% of materials ordered against this Purchase Requisition": "\u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0b9f\u0bcd\u0b95\u0bb3\u0bc8% \u0b87\u0ba8\u0bcd\u0ba4 \u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0b8e\u0ba4\u0bbf\u0bb0\u0bbe\u0b95 \u0b89\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bbf\u0b9f\u0bcd\u0b9f\u0bbe\u0bb0\u0bcd", - "Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0b87\u0ba9\u0bcd\u0ba9\u0bc1\u0bae\u0bcd \u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95. \u0ba8\u0bc0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b92\u0bb0\u0bc1 \u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0bae\u0bbe\u0bb8\u0bcd\u0b9f\u0bb0\u0bcd \u0ba4\u0baf\u0bbe\u0bb0\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bbe\u0bae\u0bcd", - "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0baa\u0bbf\u0bb1\u0b95\u0bc1, \u0b92\u0bb0\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b9f\u0bb2\u0bcd \u0baa\u0bc6\u0b9f\u0bcd\u0b9f\u0bbf \u0b87\u0ba8\u0bcd\u0ba4 \u0ba4\u0bc1\u0bb1\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0baa\u0bbf\u0bb0\u0ba4\u0bbf\u0baa\u0bb2\u0bbf\u0ba4\u0bcd\u0ba4\u0ba4\u0bc1 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b95\u0bbe\u0bb0\u0ba3\u0bae\u0bcd \u0b95\u0bc7\u0b9f\u0bcd\u0b9f\u0bc1\u0bb5\u0bbf\u0b9f\u0bc1\u0bae\u0bcd", - "Amended From": "\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bbf\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f", - "Amendment Date": "\u0ba4\u0bbf\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bc7\u0ba4\u0bbf", - "Buying": "\u0bb5\u0bbe\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bb2\u0bcd", - "Cancel Reason": "\u0b95\u0bbe\u0bb0\u0ba3\u0bae\u0bcd \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1", - "Cancelled": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1", - "Company": "\u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0bae\u0bcd", - "Draft": "\u0b95\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bb5\u0bc0\u0b9a\u0bcd\u0b9a\u0bc1", - "File List": "\u0b95\u0bc7\u0bbe\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd", - "Filing in Additional Information about the Purchase Requisition will help you analyze your data better.": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0baa\u0bb1\u0bcd\u0bb1\u0bbf \u0b95\u0bc2\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0b95\u0bb5\u0bb2\u0bcd \u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bb2\u0bcd \u0ba8\u0bc0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0ba8\u0ba9\u0bcd\u0bb1\u0bbe\u0b95 \u0b89\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0ba4\u0bb0\u0bb5\u0bc1 \u0baa\u0b95\u0bc1\u0baa\u0bcd\u0baa\u0bbe\u0baf\u0bcd\u0bb5\u0bc1 \u0b89\u0ba4\u0bb5\u0bc1\u0bae\u0bcd.", - "Fiscal Year": "\u0ba8\u0bbf\u0ba4\u0bbf\u0baf\u0bbe\u0ba3\u0bcd\u0b9f\u0bc1", - "Get Terms and Conditions": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0b95\u0bbf\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1\u0bae\u0bcd", - "IDT": "IDT", - "Items": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0b95\u0bb3\u0bcd", - "Letter Head": "\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf\u0baf\u0b9f\u0b99\u0bcd\u0b95\u0bb2\u0bcd", - "More Info": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd \u0ba4\u0b95\u0bb5\u0bb2\u0bcd", - "Name of the entity who has requested for the Purchase Requisition": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0baa\u0bb1\u0bcd\u0bb1\u0bbf \u0b95\u0bc7\u0b9f\u0bcd\u0b9f\u0bc1 \u0baf\u0bbe\u0bb0\u0bcd \u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0bae\u0bcd \u0baa\u0bc6\u0baf\u0bb0\u0bcd", - "One or multiple Sales Order no which generated this Purchase Requisition": "\u0b87\u0ba8\u0bcd\u0ba4 \u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0b89\u0bb0\u0bc1\u0bb5\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0b92\u0ba9\u0bcd\u0bb1\u0bc1 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0baa\u0bb2 \u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b86\u0ba3\u0bc8 \u0b87\u0bb2\u0bcd\u0bb2\u0bc8", - "Pull Sales Order Items": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0b95\u0bb3\u0bcd \u0b87\u0bb4\u0bc1\u0b95\u0bcd\u0b95", - "Purchase Request": "\u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0bb5\u0bbe\u0b99\u0bcd\u0b95", - "Purchase Requisition Details": "\u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0bb5\u0bbf\u0bb5\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bb5\u0bbe\u0b99\u0bcd\u0b95", - "Remarks": "\u0b95\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd", - "Requested By": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f", - "Sales Order No": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b86\u0ba3\u0bc8 \u0b87\u0bb2\u0bcd\u0bb2\u0bc8", - "Select Terms and Conditions": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1", - "Select the relevant company name if you have multiple companies": "\u0ba8\u0bc0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0baa\u0bb2 \u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd \u0b9a\u0bae\u0bcd\u0baa\u0ba8\u0bcd\u0ba4\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0bc6\u0baf\u0bb0\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1", - "Series": "\u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd", - "Status": "\u0b85\u0ba8\u0bcd\u0ba4\u0bb8\u0bcd\u0ba4\u0bc1", - "Stopped": "\u0ba8\u0bbf\u0bb1\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf", - "Submitted": "\u0b9a\u0bae\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1", - "Terms and Conditions": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd", - "Terms and Conditions Content": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd", - "The date at which current entry is corrected in the system.": "\u0ba4\u0bc7\u0ba4\u0bbf \u0b87\u0ba4\u0bc1 \u0ba4\u0bb1\u0bcd\u0baa\u0bc7\u0bbe\u0ba4\u0bc8\u0baf \u0b89\u0bb3\u0bcd\u0bb3\u0bc0\u0b9f\u0bc1 \u0bae\u0bc1\u0bb1\u0bc8 \u0b9a\u0bb0\u0bbf.", - "The date at which current entry is made in system.": "\u0ba4\u0bb1\u0bcd\u0baa\u0bc7\u0bbe\u0ba4\u0bc8\u0baf \u0b89\u0bb3\u0bcd\u0bb3\u0bc0\u0b9f\u0bc1 \u0b85\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc1\u0bb5\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0ba4\u0bbf.", - "To manage multiple series please go to Setup > Manage Series": "\u0baa\u0bb2 \u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd \u0ba8\u0bbf\u0bb0\u0bcd\u0bb5\u0b95\u0bbf\u0b95\u0bcd\u0b95 \u0b85\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bcd\u0b95> \u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd \u0ba8\u0bbf\u0bb0\u0bcd\u0bb5\u0b95\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd", - "Transaction Date": "\u0baa\u0bb0\u0bbf\u0bb5\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0ba9\u0bc8 \u0ba4\u0bc7\u0ba4\u0bbf" -} \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/__init__.py b/buying/doctype/purchase_request_item/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/buying/doctype/purchase_request_item/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/buying/doctype/purchase_request_item/locale/sr-doc.json b/buying/doctype/purchase_request_item/locale/sr-doc.json deleted file mode 100644 index 50c9bd2c273..00000000000 --- a/buying/doctype/purchase_request_item/locale/sr-doc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Brand": "\u041c\u0430\u0440\u043a\u0430", - "Buying": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430", - "Description": "\u041e\u043f\u0438\u0441", - "Item Code": "\u0428\u0438\u0444\u0440\u0430", - "Item Group": "\u0421\u0442\u0430\u0432\u043a\u0430 \u0413\u0440\u0443\u043f\u0430", - "Item Name": "\u041d\u0430\u0437\u0438\u0432", - "Lead Time Date": "\u041e\u043b\u043e\u0432\u043e \u0414\u0430\u0442\u0443\u043c \u0412\u0440\u0435\u043c\u0435", - "Min Order Qty": "\u041c\u0438\u043d\u0438\u043c\u0430\u043b\u043d\u0430 \u043a\u043e\u043b\u0438\u0447\u0438\u043d\u0430 \u0437\u0430 \u043f\u043e\u0440\u0443\u0447\u0438\u0432\u0430\u045a\u0435", - "Ordered Qty": "\u041d\u0430\u0440\u0443\u0447\u0435\u043d\u043e \u041a\u043e\u043b", - "Page Break": "\u0421\u0442\u0440\u0430\u043d\u0430 \u041f\u0430\u0443\u0437\u0430", - "Projected Qty": "\u041f\u0440\u043e\u0458\u0435\u043a\u0442\u043e\u0432\u0430\u043d\u0438 \u041a\u043e\u043b", - "Purchase Request Item": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0441\u0442\u0430\u0432\u043a\u0443 \u0417\u0430\u0445\u0442\u0435\u0432", - "Quantity": "\u041a\u043e\u043b\u0438\u0447\u0438\u043d\u0430", - "Required Date": "\u041f\u043e\u0442\u0440\u0435\u0431\u0430\u043d \u0434\u0430\u0442\u0443\u043c", - "Sales Order No": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430 \u041d\u0430\u0440\u0443\u0447\u0438\u0442\u0435 \u041d\u0435\u043c\u0430", - "Stock UOM": "\u0411\u0435\u0440\u0437\u0430 \u0423\u041e\u041c", - "Warehouse": "\u041c\u0430\u0433\u0430\u0446\u0438\u043d" -} \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/ta-doc.json b/buying/doctype/purchase_request_item/locale/ta-doc.json deleted file mode 100644 index a4dbae18d3d..00000000000 --- a/buying/doctype/purchase_request_item/locale/ta-doc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Brand": "\u0baa\u0bbf\u0bb0\u0bbe\u0ba3\u0bcd\u0b9f\u0bcd", - "Buying": "\u0bb5\u0bbe\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bb2\u0bcd", - "Description": "\u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0bae\u0bcd", - "Item Code": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0baf\u0bc8 \u0b95\u0bc7\u0bbe\u0b9f\u0bcd", - "Item Group": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0baf\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1", - "Item Name": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf \u0baa\u0bc6\u0baf\u0bb0\u0bcd", - "Lead Time Date": "\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0ba4\u0bc7\u0ba4\u0bbf \u0b87\u0b9f\u0bcd\u0b9f\u0bc1", - "Min Order Qty": "Min \u0b86\u0bb0\u0bcd\u0b9f\u0bb0\u0bcd \u0b85\u0bb3\u0bb5\u0bc1", - "Ordered Qty": "\u0b89\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bbf\u0b9f\u0bcd\u0b9f\u0bbe\u0bb0\u0bcd \u0b85\u0bb3\u0bb5\u0bc1", - "Page Break": "\u0baa\u0b95\u0bcd\u0b95\u0bae\u0bcd \u0baa\u0bbf\u0bb0\u0bc7\u0b95\u0bcd", - "Projected Qty": "\u0ba4\u0bbf\u0b9f\u0bcd\u0b9f\u0bae\u0bbf\u0b9f\u0bcd\u0b9f\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0ba4\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1", - "Purchase Request Item": "\u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd \u0bb5\u0bbe\u0b99\u0bcd\u0b95", - "Quantity": "\u0b85\u0bb3\u0bb5\u0bc1", - "Required Date": "\u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 \u0ba4\u0bc7\u0ba4\u0bbf", - "Sales Order No": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b86\u0ba3\u0bc8 \u0b87\u0bb2\u0bcd\u0bb2\u0bc8", - "Stock UOM": "\u0baa\u0b99\u0bcd\u0b95\u0bc1 \u0bae\u0bc6\u0bbe\u0bb1\u0b9f\u0bcd\u0b9f\u0bc1\u0bb5 \u0baa\u0bb2\u0bcd\u0b95\u0bb2\u0bc8\u0b95\u0bb4\u0b95\u0bae\u0bcd", - "Warehouse": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd\u0b95\u0bb3\u0bcd \u0bb5\u0bc8\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bae\u0bcd \u0b87\u0b9f\u0bae\u0bcd" -} \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/purchase_request_item.py b/buying/doctype/purchase_request_item/purchase_request_item.py deleted file mode 100644 index 7f48feb2ebf..00000000000 --- a/buying/doctype/purchase_request_item/purchase_request_item.py +++ /dev/null @@ -1,22 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -from __future__ import unicode_literals -import webnotes - -class DocType: - def __init__(self, d, dl): - self.doc, self.doclist = d, dl \ No newline at end of file diff --git a/buying/doctype/quality_inspection/quality_inspection.py b/buying/doctype/quality_inspection/quality_inspection.py index 415524f32aa..336aabee8dd 100644 --- a/buying/doctype/quality_inspection/quality_inspection.py +++ b/buying/doctype/quality_inspection/quality_inspection.py @@ -19,7 +19,7 @@ import webnotes from webnotes.model import db_exists from webnotes.model.doc import addchild, make_autoname -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index 096a43e3ff1..3af63b022a5 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -16,8 +16,9 @@ from __future__ import unicode_literals import webnotes +import webnotes.defaults -from webnotes.utils import cint, get_defaults +from webnotes.utils import cint from webnotes import msgprint, _ from webnotes.model.doc import make_autoname @@ -35,7 +36,7 @@ class DocType(TransactionBase): self.add_communication_list() def autoname(self): - supp_master_name = get_defaults()['supp_master_name'] + supp_master_name = webnotes.defaults.get_global_default('supp_master_name') if supp_master_name == 'Supplier Name': if webnotes.conn.exists("Customer", self.doc.supplier_name): @@ -98,7 +99,7 @@ class DocType(TransactionBase): def validate(self): #validation for Naming Series mandatory field... - if get_defaults()['supp_master_name'] == 'Naming Series': + if webnotes.defaults.get_global_default('supp_master_name') == 'Naming Series': if not self.doc.naming_series: msgprint("Series is Mandatory.", raise_exception=1) @@ -161,7 +162,7 @@ class DocType(TransactionBase): def on_rename(self, new, old): #update supplier_name if not naming series - if get_defaults().get('supp_master_name') == 'Supplier Name': + if webnotes.defaults.get_global_default('supp_master_name') == 'Supplier Name': update_fields = [ ('Supplier', 'name'), ('Address', 'supplier'), diff --git a/buying/doctype/supplier_quotation/locale/_messages_doc.json b/buying/doctype/supplier_quotation/locale/_messages_doc.json index a6986001af0..32bb54e4d47 100644 --- a/buying/doctype/supplier_quotation/locale/_messages_doc.json +++ b/buying/doctype/supplier_quotation/locale/_messages_doc.json @@ -17,7 +17,6 @@ "Supplier Address", "Select Print Heading", "More Info", - "Select Purchase Request", "Terms and Conditions HTML", "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "Exchange Rate", @@ -39,6 +38,7 @@ "Buying", "Price List", "Status", + "Select Material Request", "Rounded Total", "Name", "To manage multiple series please go to Setup > Manage Series", @@ -57,7 +57,6 @@ "Totals", "Supplier (vendor) name as entered in supplier master", "Taxes and Charges Deducted", - "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", "Net Total*", "The date at which current entry is made in system.", "Currency & Price List", @@ -69,10 +68,11 @@ "Grand Total", "Get Tax Detail", "Supplier Quotation", - "Taxes and Charges Deducted (Import)", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", "Series", "Draft", "Yes", "Total Tax*", - "In Words will be visible once you save the Purchase Order." + "In Words will be visible once you save the Purchase Order.", + "Taxes and Charges Deducted (Import)" ] \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/ar-doc.json b/buying/doctype/supplier_quotation/locale/ar-doc.json index a76e08c37b1..28417df10fe 100644 --- a/buying/doctype/supplier_quotation/locale/ar-doc.json +++ b/buying/doctype/supplier_quotation/locale/ar-doc.json @@ -46,6 +46,7 @@ "Re-Calculate Values": "\u0625\u0639\u0627\u062f\u0629 \u062d\u0633\u0627\u0628 \u0627\u0644\u0642\u064a\u0645", "Rounded Total": "\u062a\u0642\u0631\u064a\u0628 \u0625\u062c\u0645\u0627\u0644\u064a", "SQTN": "SQTN", + "Select Material Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f", "Select Print Heading": "\u062d\u062f\u062f \u0637\u0628\u0627\u0639\u0629 \u0627\u0644\u0639\u0646\u0648\u0627\u0646", "Select Purchase Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0634\u0631\u0627\u0621", "Select Terms and Conditions": "\u062d\u062f\u062f \u0627\u0644\u0634\u0631\u0648\u0637 \u0648\u0627\u0644\u0623\u062d\u0643\u0627\u0645", @@ -74,5 +75,6 @@ "Total Tax*": "\u0645\u062c\u0645\u0648\u0639 \u0627\u0644\u0636\u0631\u0627\u0626\u0628 *", "Totals": "\u0627\u0644\u0645\u062c\u0627\u0645\u064a\u0639", "Yes": "\u0646\u0639\u0645", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0645\u0648\u0627\u062f \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0637\u0644\u0628 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/es-doc.json b/buying/doctype/supplier_quotation/locale/es-doc.json index f5797d972e6..11f1ba3dfb6 100644 --- a/buying/doctype/supplier_quotation/locale/es-doc.json +++ b/buying/doctype/supplier_quotation/locale/es-doc.json @@ -46,6 +46,7 @@ "Re-Calculate Values": "Vuelva a calcular los valores", "Rounded Total": "Total redondeado", "SQTN": "SQTN", + "Select Material Request": "Seleccione Solicitud de material", "Select Print Heading": "Seleccione Imprimir Encabezado", "Select Purchase Request": "Seleccione Solicitud de Compra", "Select Terms and Conditions": "Seleccione T\u00e9rminos y Condiciones", @@ -74,5 +75,6 @@ "Total Tax*": "* Total de Impuestos", "Totals": "Totales", "Yes": "S\u00ed", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de solicitudes de materiales m\u00faltiples. Seleccione solicitudes de material de uno en uno y haga clic en el bot\u00f3n de abajo.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de varias Ordenes de Compra. Seleccione Ordenes de Compra uno por uno y haga clic en el bot\u00f3n de abajo." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/fr-doc.json b/buying/doctype/supplier_quotation/locale/fr-doc.json index daae1528f30..8ab4fc3f50e 100644 --- a/buying/doctype/supplier_quotation/locale/fr-doc.json +++ b/buying/doctype/supplier_quotation/locale/fr-doc.json @@ -46,6 +46,7 @@ "Re-Calculate Values": "Re-calculer les valeurs", "Rounded Total": "Totale arrondie", "SQTN": "SQTN", + "Select Material Request": "S\u00e9lectionnez Demande de Mat\u00e9riel", "Select Print Heading": "S\u00e9lectionnez Imprimer Cap", "Select Purchase Request": "S\u00e9lectionnez la demande d'achat", "Select Terms and Conditions": "S\u00e9lectionnez Termes et Conditions", @@ -74,5 +75,6 @@ "Total Tax*": "* Total de la taxe", "Totals": "Totaux", "Yes": "Oui", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Vous pouvez faire un bon de commande de mat\u00e9riel demandes multiples. S\u00e9lectionnez demandes de mat\u00e9riel, un par un et cliquez sur le bouton ci-dessous.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Vous pouvez faire une commande \u00e0 partir de demandes d'achat multiples. S\u00e9lectionnez Demande d'Achat un par un et cliquez sur le bouton ci-dessous." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/hi-doc.json b/buying/doctype/supplier_quotation/locale/hi-doc.json index 4526f5eebed..4d21ccee749 100644 --- a/buying/doctype/supplier_quotation/locale/hi-doc.json +++ b/buying/doctype/supplier_quotation/locale/hi-doc.json @@ -47,6 +47,7 @@ "Re-Calculate Values": "\u092a\u0941\u0928\u0903 \u0917\u0923\u0928\u093e \u092e\u093e\u0928", "Rounded Total": "\u0917\u094b\u0932 \u0915\u0941\u0932", "SQTN": "SQTN", + "Select Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", "Select Print Heading": "\u091a\u092f\u0928 \u0936\u0940\u0930\u094d\u0937\u0915 \u092a\u094d\u0930\u093f\u0902\u091f", "Select Purchase Request": "\u0916\u0930\u0940\u0926 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", "Select Terms and Conditions": "\u0928\u093f\u092f\u092e\u094b\u0902 \u0914\u0930 \u0936\u0930\u094d\u0924\u094b\u0902 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", @@ -75,5 +76,6 @@ "Total Tax*": "\u0915\u0941\u0932 \u091f\u0948\u0915\u094d\u0938 *", "Totals": "\u092f\u094b\u0917", "Yes": "\u0939\u093e\u0902", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/hr-doc.json b/buying/doctype/supplier_quotation/locale/hr-doc.json index 5ba980a90d5..dc544fddce7 100644 --- a/buying/doctype/supplier_quotation/locale/hr-doc.json +++ b/buying/doctype/supplier_quotation/locale/hr-doc.json @@ -46,6 +46,7 @@ "Re-Calculate Values": "Ponovno izra\u010dunati vrijednosti", "Rounded Total": "Zaobljeni Ukupno", "SQTN": "SQTN", + "Select Material Request": "Odaberite Materijal Zahtjev", "Select Print Heading": "Odaberite Ispis Naslov", "Select Purchase Request": "Odaberite zahtjev za kupnju", "Select Terms and Conditions": "Odaberite Uvjeti i pravila", @@ -74,5 +75,6 @@ "Total Tax*": "Ukupno poreza *", "Totals": "Ukupan rezultat", "Yes": "Da", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje od vi\u0161e materijala zahtjeva. Odaberite materijalni zahtijevi jedan po jedan i kliknite na gumb ispod.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje iz vi\u0161e Kupiti zahtjeva. Odaberite kupnje Zahtjevi jednu po jednu i kliknite na gumb ispod." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/nl-doc.json b/buying/doctype/supplier_quotation/locale/nl-doc.json index e766ada3ec3..d82803966ce 100644 --- a/buying/doctype/supplier_quotation/locale/nl-doc.json +++ b/buying/doctype/supplier_quotation/locale/nl-doc.json @@ -46,6 +46,7 @@ "Re-Calculate Values": "Re-waarden berekenen", "Rounded Total": "Afgeronde Totaal", "SQTN": "SQTN", + "Select Material Request": "Selecteer Materiaal aanvragen", "Select Print Heading": "Selecteer Print rubriek", "Select Purchase Request": "Selecteer Purchase Request", "Select Terms and Conditions": "Selecteer Algemene Voorwaarden", @@ -74,5 +75,6 @@ "Total Tax*": "Totaal BTW *", "Totals": "Totalen", "Yes": "Ja", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "U kunt een bestelling van meerdere Materiaal aanvragen. Selecteer Materiaal Verzoeken een voor een en klikt u op de knop.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "U kunt een bestelling van meerdere aankoopverzoeken. Selecteer inkoopaanvragen een voor een en klikt u op de knop." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/locale/pt-doc.json b/buying/doctype/supplier_quotation/locale/pt-doc.json index 89ef5268cb2..27916514e9d 100644 --- a/buying/doctype/supplier_quotation/locale/pt-doc.json +++ b/buying/doctype/supplier_quotation/locale/pt-doc.json @@ -46,6 +46,7 @@ "Re-Calculate Values": "Re-calcular valores", "Rounded Total": "Total arredondado", "SQTN": "SQTN", + "Select Material Request": "Selecione solicitar material", "Select Print Heading": "Selecione Imprimir t\u00edtulo", "Select Purchase Request": "Selecione Pedido de Compra", "Select Terms and Conditions": "Selecione Termos e Condi\u00e7\u00f5es", @@ -74,5 +75,6 @@ "Total Tax*": "* Total de impostos", "Totals": "Totais", "Yes": "Sim", + "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Voc\u00ea pode fazer um pedido de compra de materiais pedidos m\u00faltiplos. Selecione pedidos se um por um e clique no bot\u00e3o abaixo.", "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Voc\u00ea pode fazer uma ordem de compra de pedidos de compras m\u00faltiplas. Selecione pedidos de compra, um por um e clique no bot\u00e3o abaixo." } \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/supplier_quotation.js b/buying/doctype/supplier_quotation/supplier_quotation.js index 87bf63cd6f8..6cb764ef084 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.js +++ b/buying/doctype/supplier_quotation/supplier_quotation.js @@ -88,13 +88,11 @@ cur_frm.fields_dict['quotation_items'].grid.get_field('project_name').get_query } cur_frm.fields_dict['indent_no'].get_query = function(doc) { - return "select distinct `tabPurchase Request`.`name` from `tabPurchase Request` \ - where `tabPurchase Request`.company = \"" + doc.company + - "\" and `tabPurchase Request`.`docstatus` = 1 and \ - `tabPurchase Request`.`status` != \"Stopped\" and \ - ifnull(`tabPurchase Request`.`per_ordered`,0) < 99.99 and \ - `tabPurchase Request`.%(key)s LIKE \"%s\" \ - order by `tabPurchase Request`.`name` desc limit 50"; + return "select distinct `name` from `tabMaterial Request` \ + where material_request_type='Purchase' and company = \"" + doc.company + + "\" and `docstatus` = 1 and `status` != \"Stopped\" and \ + ifnull(`per_ordered`,0) < 99.99 and \ + %(key)s LIKE \"%s\" order by `name` desc limit 50"; } cur_frm.cscript.supplier_address = function(doc, dt, dn) { diff --git a/buying/doctype/supplier_quotation/supplier_quotation.py b/buying/doctype/supplier_quotation/supplier_quotation.py index 51a1e07a7fa..0982fd6d9f0 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/buying/doctype/supplier_quotation/supplier_quotation.py @@ -52,12 +52,12 @@ class DocType(BuyingController): def get_indent_details(self): if self.doc.indent_no: - mapper = get_obj("DocType Mapper", "Purchase Request-Supplier Quotation") - mapper.dt_map("Purchase Request", "Supplier Quotation", self.doc.indent_no, - self.doc, self.doclist, """[['Purchase Request', 'Supplier Quotation'], - ['Purchase Request Item', 'Supplier Quotation Item']]""") + mapper = get_obj("DocType Mapper", "Material Request-Supplier Quotation") + mapper.dt_map("Material Request", "Supplier Quotation", self.doc.indent_no, + self.doc, self.doclist, """[['Material Request', 'Supplier Quotation'], + ['Material Request Item', 'Supplier Quotation Item']]""") - from webnotes.model.wrapper import getlist + from webnotes.model.bean import getlist for d in getlist(self.doclist, self.fname): if d.item_code and not d.purchase_rate: d.purchase_ref_rate = d.discount_rate = d.purchase_rate = 0.0 diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index f5fa37d78ac..d180651b196 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-29 17:54:11", + "creation": "2013-01-29 19:25:54", "docstatus": 0, - "modified": "2013-01-29 18:11:12", + "modified": "2013-02-18 13:40:17", "modified_by": "Administrator", "owner": "Administrator" }, @@ -31,9 +31,7 @@ "parent": "Supplier Quotation", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1 + "read": 1 }, { "doctype": "DocType", @@ -167,16 +165,16 @@ "options": "Simple" }, { - "description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", + "description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", "doctype": "DocField", "fieldname": "indent_no", "fieldtype": "Link", "hidden": 0, - "label": "Select Purchase Request", + "label": "Select Material Request", "no_copy": 1, "oldfieldname": "indent_no", "oldfieldtype": "Link", - "options": "Purchase Request", + "options": "Material Request", "print_hide": 1 }, { @@ -679,6 +677,8 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Manufacturing Manager", "submit": 1, "write": 1 @@ -688,6 +688,8 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Purchase Manager", "submit": 1, "write": 1 @@ -697,6 +699,8 @@ "cancel": 0, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Purchase User", "submit": 0, "write": 1 @@ -706,6 +710,8 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Material User", "submit": 0, "write": 0 @@ -715,8 +721,21 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Supplier", "submit": 0, "write": 0 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "All", + "submit": 0, + "write": 0 } ] \ No newline at end of file diff --git a/buying/doctype/supplier_quotation_item/locale/_messages_doc.json b/buying/doctype/supplier_quotation_item/locale/_messages_doc.json index 7cacd483783..c5685ca4f54 100644 --- a/buying/doctype/supplier_quotation_item/locale/_messages_doc.json +++ b/buying/doctype/supplier_quotation_item/locale/_messages_doc.json @@ -2,7 +2,7 @@ "Supplier Quotation Item", "Item Name", "Discount %", - "Purchase Request Detail No", + "Material Request Detail No", "Prevdoc DocType", "Warehouse", "UOM", @@ -11,17 +11,17 @@ "Project Name", "Brand", "Supplier Part Number", - "Purchase Request No", + "Item Code", "Buying", "Rate ", + "Material Request No", "Rate*", "Amount*", "Amount", "Ref Rate ", "Item Group", - "Purchase Request Date", "If Supplier Part Number exists for given Item, it gets stored here", - "Item Code", + "Material Request Date", "Ref Rate*", "Quantity", "Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges", diff --git a/buying/doctype/supplier_quotation_item/locale/ar-doc.json b/buying/doctype/supplier_quotation_item/locale/ar-doc.json index c79b150ec58..cd4f6374381 100644 --- a/buying/doctype/supplier_quotation_item/locale/ar-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/ar-doc.json @@ -11,6 +11,9 @@ "Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629", "Item Name": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0627\u0633\u0645", "Item Tax Rate": "\u0627\u0644\u0628\u0646\u062f \u0636\u0631\u064a\u0628\u0629", + "Material Request Date": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0627\u0631\u064a\u062e", + "Material Request Detail No": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0644\u0627", + "Material Request No": "\u0637\u0644\u0628 \u0645\u0648\u0627\u062f \u0644\u0627", "Page Break": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0633\u062a\u0631\u0627\u062d\u0629", "Prevdoc DocType": "Prevdoc DOCTYPE", "Project Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639", diff --git a/buying/doctype/supplier_quotation_item/locale/es-doc.json b/buying/doctype/supplier_quotation_item/locale/es-doc.json index 612a91ab2bb..d4fa5907ca9 100644 --- a/buying/doctype/supplier_quotation_item/locale/es-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/es-doc.json @@ -11,6 +11,9 @@ "Item Group": "Grupo de art\u00edculos", "Item Name": "Nombre del elemento", "Item Tax Rate": "Art\u00edculo Tasa Impositiva", + "Material Request Date": "Material de la Fecha de Solicitud", + "Material Request Detail No": "Materiales Detalle Solicitud de No", + "Material Request No": "Material de Solicitud de No", "Page Break": "Salto de p\u00e1gina", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Nombre del proyecto", diff --git a/buying/doctype/supplier_quotation_item/locale/fr-doc.json b/buying/doctype/supplier_quotation_item/locale/fr-doc.json index 89845afa221..5dc8190678f 100644 --- a/buying/doctype/supplier_quotation_item/locale/fr-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/fr-doc.json @@ -11,6 +11,9 @@ "Item Group": "Groupe d'\u00e9l\u00e9ments", "Item Name": "Nom d'article", "Item Tax Rate": "Taux d'imposition article", + "Material Request Date": "Date de demande de mat\u00e9riel", + "Material Request Detail No": "D\u00e9tail Demande Support Aucun", + "Material Request No": "Demande de Support Aucun", "Page Break": "Saut de page", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Nom du projet", diff --git a/buying/doctype/supplier_quotation_item/locale/hi-doc.json b/buying/doctype/supplier_quotation_item/locale/hi-doc.json index 80be973b682..97cbc25e02f 100644 --- a/buying/doctype/supplier_quotation_item/locale/hi-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/hi-doc.json @@ -11,6 +11,9 @@ "Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939", "Item Name": "\u092e\u0926 \u0915\u093e \u0928\u093e\u092e", "Item Tax Rate": "\u0906\u0907\u091f\u092e \u0915\u0930 \u0915\u0940 \u0926\u0930", + "Material Request Date": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0924\u093f\u0925\u093f", + "Material Request Detail No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927 \u0935\u093f\u0938\u094d\u0924\u093e\u0930 \u0928\u0939\u0940\u0902", + "Material Request No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0928\u0939\u0940\u0902", "Page Break": "\u092a\u0943\u0937\u094d\u0920\u093e\u0924\u0930", "Prevdoc DocType": "Prevdoc doctype", "Project Name": "\u0907\u0938 \u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e \u0915\u093e \u0928\u093e\u092e", diff --git a/buying/doctype/supplier_quotation_item/locale/hr-doc.json b/buying/doctype/supplier_quotation_item/locale/hr-doc.json index b4489807d6b..0da09b25251 100644 --- a/buying/doctype/supplier_quotation_item/locale/hr-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/hr-doc.json @@ -10,6 +10,9 @@ "Item Group": "Stavka Grupa", "Item Name": "Stavka Ime", "Item Tax Rate": "Stavka Porezna stopa", + "Material Request Date": "Materijal Zahtjev Datum", + "Material Request Detail No": "Materijal Zahtjev Detalj Ne", + "Material Request No": "Materijal Zahtjev Ne", "Page Break": "Prijelom stranice", "Prevdoc DocType": "Prevdoc DOCTYPE", "Project Name": "Naziv projekta", diff --git a/buying/doctype/supplier_quotation_item/locale/nl-doc.json b/buying/doctype/supplier_quotation_item/locale/nl-doc.json index b9003b5b113..0f9b8c4fa7c 100644 --- a/buying/doctype/supplier_quotation_item/locale/nl-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/nl-doc.json @@ -11,6 +11,9 @@ "Item Group": "Item Group", "Item Name": "Naam van het punt", "Item Tax Rate": "Item Belastingtarief", + "Material Request Date": "Materiaal Aanvraagdatum", + "Material Request Detail No": "Materiaal Aanvraag Detail Geen", + "Material Request No": "Materiaal aanvragen Geen", "Page Break": "Pagina-einde", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Naam van het project", diff --git a/buying/doctype/supplier_quotation_item/locale/pt-doc.json b/buying/doctype/supplier_quotation_item/locale/pt-doc.json index 5b21c317e8c..6ec5414502f 100644 --- a/buying/doctype/supplier_quotation_item/locale/pt-doc.json +++ b/buying/doctype/supplier_quotation_item/locale/pt-doc.json @@ -11,6 +11,9 @@ "Item Group": "Grupo Item", "Item Name": "Nome do item", "Item Tax Rate": "Taxa de Imposto item", + "Material Request Date": "Data de Solicita\u00e7\u00e3o de material", + "Material Request Detail No": "Detalhe materiais Pedido N\u00e3o", + "Material Request No": "Pedido de material no", "Page Break": "Quebra de p\u00e1gina", "Prevdoc DocType": "Prevdoc DocType", "Project Name": "Nome do projeto", diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt index ab1f3e47797..cf79f041d52 100644 --- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt +++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-28 10:06:00", + "creation": "2013-01-29 19:25:55", "docstatus": 0, - "modified": "2013-01-29 16:28:05", + "modified": "2013-02-18 13:39:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -208,11 +208,11 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, - "label": "Purchase Request No", + "label": "Material Request No", "no_copy": 0, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Link", - "options": "Purchase Request", + "options": "Material Request", "print_hide": 1, "print_width": "120px", "read_only": 1, @@ -225,7 +225,7 @@ "fieldtype": "Date", "hidden": 1, "in_filter": 1, - "label": "Purchase Request Date", + "label": "Material Request Date", "oldfieldname": "prevdoc_date", "oldfieldtype": "Date", "print_hide": 1, @@ -238,7 +238,7 @@ "fieldtype": "Data", "hidden": 1, "in_filter": 1, - "label": "Purchase Request Detail No", + "label": "Material Request Detail No", "no_copy": 0, "oldfieldname": "prevdoc_detail_docname", "oldfieldtype": "Data", diff --git a/buying/page/buying_home/buying_home.js b/buying/page/buying_home/buying_home.js index 0924ba3e469..922e7acefab 100644 --- a/buying/page/buying_home/buying_home.js +++ b/buying/page/buying_home/buying_home.js @@ -7,9 +7,9 @@ wn.module_page["Buying"] = [ icon: "icon-copy", items: [ { - label: wn._("Purchase Request"), + label: wn._("Material Request"), description: wn._("Request for purchase."), - doctype:"Purchase Request" + doctype:"Material Request" }, { label: wn._("Supplier Quotation"), diff --git a/buying/page/buying_home/locale/_messages_js.json b/buying/page/buying_home/locale/_messages_js.json index f0b690813be..bb8b66fb566 100644 --- a/buying/page/buying_home/locale/_messages_js.json +++ b/buying/page/buying_home/locale/_messages_js.json @@ -1,9 +1,9 @@ [ "Documents", + "Material Request", "Request for purchase.", "Supplier", "Template of terms or contract.", - "Purchase Request", "Terms and Conditions", "Purchase Returns", "All Addresses.", diff --git a/buying/page/buying_home/locale/ar-js.json b/buying/page/buying_home/locale/ar-js.json index a3e02d53f0d..a1bfc1f4d6c 100644 --- a/buying/page/buying_home/locale/ar-js.json +++ b/buying/page/buying_home/locale/ar-js.json @@ -10,6 +10,7 @@ "Item": "\u0628\u0646\u062f", "Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629", "Masters": "\u0627\u0644\u0645\u0627\u062c\u0633\u062a\u064a\u0631", + "Material Request": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f", "Purchase Analytics": "\u0634\u0631\u0627\u0621 \u062a\u062d\u0644\u064a\u0644\u0627\u062a", "Purchase Order": "\u0623\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621", "Purchase Orders given to Suppliers.": "\u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621 \u0646\u0638\u0631\u0627 \u0644\u0644\u0645\u0648\u0631\u062f\u064a\u0646.", diff --git a/buying/page/buying_home/locale/es-js.json b/buying/page/buying_home/locale/es-js.json index 2edbb89e0d5..ce791161ffe 100644 --- a/buying/page/buying_home/locale/es-js.json +++ b/buying/page/buying_home/locale/es-js.json @@ -10,6 +10,7 @@ "Item": "Art\u00edculo", "Item Group": "Grupo de art\u00edculos", "Masters": "Masters", + "Material Request": "Material de Solicitud", "Purchase Analytics": "Compra Analytics", "Purchase Order": "Orden de Compra", "Purchase Orders given to Suppliers.": "Compra \u00f3rdenes dadas a los proveedores.", diff --git a/buying/page/buying_home/locale/fr-js.json b/buying/page/buying_home/locale/fr-js.json index 0e9ad50c3be..550b9f8f5ae 100644 --- a/buying/page/buying_home/locale/fr-js.json +++ b/buying/page/buying_home/locale/fr-js.json @@ -10,6 +10,7 @@ "Item": "Article", "Item Group": "Groupe d'\u00e9l\u00e9ments", "Masters": "Ma\u00eetres", + "Material Request": "Demande de mat\u00e9riel", "Purchase Analytics": "Achat Analytics", "Purchase Order": "Bon de commande", "Purchase Orders given to Suppliers.": "Achetez commandes faites aux fournisseurs.", diff --git a/buying/page/buying_home/locale/hi-js.json b/buying/page/buying_home/locale/hi-js.json index 41aee09ce26..15623e4fb87 100644 --- a/buying/page/buying_home/locale/hi-js.json +++ b/buying/page/buying_home/locale/hi-js.json @@ -10,6 +10,7 @@ "Item": "\u092e\u0926", "Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939", "Masters": "\u0938\u094d\u0928\u093e\u0924\u0915\u094b\u0924\u094d\u0924\u0930", + "Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927", "Purchase Analytics": "\u0916\u0930\u0940\u0926 \u0935\u093f\u0936\u094d\u0932\u0947\u0937\u093f\u0915\u0940", "Purchase Order": "\u0906\u0926\u0947\u0936 \u0916\u0930\u0940\u0926", "Purchase Orders given to Suppliers.": "\u0916\u0930\u0940\u0926 \u0906\u092a\u0942\u0930\u094d\u0924\u093f\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u0947 \u0932\u093f\u090f \u0926\u093f\u090f \u0917\u090f \u0906\u0926\u0947\u0936.", diff --git a/buying/page/buying_home/locale/hr-js.json b/buying/page/buying_home/locale/hr-js.json index c6953a01bb7..048fc9daf8b 100644 --- a/buying/page/buying_home/locale/hr-js.json +++ b/buying/page/buying_home/locale/hr-js.json @@ -10,6 +10,7 @@ "Item": "Stavka", "Item Group": "Stavka Grupa", "Masters": "Majstori", + "Material Request": "Materijal zahtjev", "Purchase Analytics": "Kupnja Analytics", "Purchase Order": "Narud\u017ebenica", "Purchase Orders given to Suppliers.": "Kupnja naloge koje je dao dobavlja\u010de.", diff --git a/buying/page/buying_home/locale/nl-js.json b/buying/page/buying_home/locale/nl-js.json index 9352208093e..b273218512d 100644 --- a/buying/page/buying_home/locale/nl-js.json +++ b/buying/page/buying_home/locale/nl-js.json @@ -10,6 +10,7 @@ "Item": "Item", "Item Group": "Item Group", "Masters": "Masters", + "Material Request": "Materiaal aanvragen", "Purchase Analytics": "Aankoop Analytics", "Purchase Order": "Purchase Order", "Purchase Orders given to Suppliers.": "Inkooporders aan leveranciers.", diff --git a/buying/page/buying_home/locale/pt-js.json b/buying/page/buying_home/locale/pt-js.json index 259a3b69e27..a89e43c948c 100644 --- a/buying/page/buying_home/locale/pt-js.json +++ b/buying/page/buying_home/locale/pt-js.json @@ -10,6 +10,7 @@ "Item": "Item", "Item Group": "Grupo Item", "Masters": "Mestres", + "Material Request": "Pedido de material", "Purchase Analytics": "Analytics compra", "Purchase Order": "Ordem de Compra", "Purchase Orders given to Suppliers.": "As ordens de compra dadas a fornecedores.", diff --git a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt index 8650d20cba5..9cb44a5b00b 100644 --- a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt +++ b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt @@ -21,7 +21,7 @@ "sort_by": "`tabPurchase Order`.`name`", "page_len": 50, "criteria_name": "Pending PO Items To Bill", - "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty" + "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Material Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty" }, { "name": "pending_po_items_to_bill", diff --git a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt index a103fb501dc..51cf16590dc 100644 --- a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt +++ b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt @@ -21,7 +21,7 @@ "sort_by": "`tabPurchase Order`.`name`", "page_len": 50, "criteria_name": "Pending PO Items To Receive", - "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty" + "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Material Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty" }, { "name": "pending_po_items_to_receive", diff --git a/buying/utils.py b/buying/utils.py index 97efbc73333..9d125de24ab 100644 --- a/buying/utils.py +++ b/buying/utils.py @@ -37,7 +37,7 @@ def get_item_details(args): args = webnotes._dict(args) - item_wrapper = webnotes.model_wrapper("Item", args.item_code) + item_wrapper = webnotes.bean("Item", args.item_code) item = item_wrapper.doc from stock.utils import validate_end_of_life @@ -98,7 +98,7 @@ def get_item_details(args): def get_rates_as_per_price_list(args, item_doclist=None): if not item_doclist: - item_doclist = webnotes.model_wrapper("Item", args.item_code).doclist + item_doclist = webnotes.bean("Item", args.item_code).doclist result = item_doclist.get({"parentfield": "ref_rate_details", "price_list_name": args.price_list_name, "ref_currency": args.price_list_currency, diff --git a/controllers/selling_controller.py b/controllers/selling_controller.py index 5ff5637baf7..94a56e33007 100644 --- a/controllers/selling_controller.py +++ b/controllers/selling_controller.py @@ -16,6 +16,7 @@ from __future__ import unicode_literals import webnotes +from webnotes.utils import cint from setup.utils import get_company_currency from controllers.accounts_controller import AccountsController @@ -27,8 +28,13 @@ class SellingController(AccountsController): def set_total_in_words(self): from webnotes.utils import money_in_words company_currency = get_company_currency(self.doc.company) + + disable_rounded_total = cint(webnotes.conn.get_value("Global Defaults", None, + "disable_rounded_total")) + if self.meta.get_field("in_words"): - self.doc.in_words = money_in_words(self.doc.rounded_total, company_currency) + self.doc.in_words = money_in_words(disable_rounded_total and + self.doc.grand_total or self.doc.rounded_total, company_currency) if self.meta.get_field("in_words_export"): - self.doc.in_words_export = money_in_words(self.doc.rounded_total_export, - self.doc.currency) \ No newline at end of file + self.doc.in_words_export = money_in_words(disable_rounded_total and + self.doc.grand_total_export or self.doc.rounded_total_export, self.doc.currency) \ No newline at end of file diff --git a/home/doctype/feed/feed.py b/home/doctype/feed/feed.py index 6e4199b9015..36e09cacfb8 100644 --- a/home/doctype/feed/feed.py +++ b/home/doctype/feed/feed.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/home/page/desktop/desktop.js b/home/page/desktop/desktop.js index df7d23eb671..c298b68218c 100644 --- a/home/page/desktop/desktop.js +++ b/home/page/desktop/desktop.js @@ -9,7 +9,7 @@ erpnext.desktop.refresh = function() { $("#icon-grid .case-wrapper").each(function(i, e) { new_order.push($(this).attr("data-name")); }); - wn.user.set_default("_desktop_items", new_order); + wn.defaults.set_default("_desktop_items", new_order); } }); } diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 42408de3b7b..4fdb6e51009 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,4 +1,12 @@ erpnext.updates = [ + ["21st February, 2013", [ + "Item: Warehouse-wise Re-order Level and Quantity", + "Buying: Purchase Request renamed to Material Request" + ]], + ["20th February, 2013", [ + "Disable Rounded Total: If disable in 'Global Defaults', Rounding related fields \ + in sales cycle transactions and in corresponding print formats will not be visible" + ]], ["15th February, 2013", [ "Calendar: Added new FullCalendar, and Calendar Views", "Leave Application: Added email notifications on Leave Application", @@ -7,29 +15,66 @@ erpnext.updates = [ "Employee: If Employee is linked to a Profile, copy Full Name, Date of Birth, \ Image and Gender to Profile", "Leave Application: Select Leave Approver by their Full Name", + "Fixes in C-Form", ]], + ["12th February, 2013", ["Fixes in Payment Reconciliation "]], ["6th February, 2013", [ "Bookmarks: Add bookmarks via toolbar by clicking on the sign.", + "Fixes in Voucher Import Tool", ]], ["5th February, 2013", [ + "Block Negative Account Balance: If enabled, system will not allow to post entry \ + if balance goes into negative", "Leave Block List: Block users from taking leave on certain days.", + "Added project column in 'To Be Delivered/Billed' report ", + ]], + ["4th February, 2013", [ + "Make gl entry only if amount is there", + "Fixes in Stock Ledger Report" ]], ["2nd February, 2013", [ "Warehouse: Added table Warehouse User to restrict Warehouse Entry per user.", + "Fixes in Gl Entry for Purchase Invoice", + ]], + ["1st February, 2013", [ + "Removed sales order pending items report", + "Fixes in Salary Register Report, Sales Invoice and Budget Control", + ]], + ["31st January, 2013", [ + "New Report: Purchase order items pending to be received", + "GL Mapper deprecated", ]], ["28st January, 2013", [ "List Views are now configurable: To set list views, check 'In List View' in Setup > Customize Form View in the fields table.", + "Fixes in Financial Statements and Features Setup", ]], - ["24st January, 2013", [ + ["25th January, 2013", [ + "Fixes for currency in all Modern/Classic/Spartan print formats", + "Stock Ageing Report: Added show zero values option" + ]], + ["24th January, 2013", [ + "Sales Analytics based on Sales Order/Delivery Note/Sales Invoice", "Integrated Languages in Profile and via browser settings. To set your language, click on your name in the toolbar then 'My Settings...'", + "Fixes in Recurring Invoice", + "Fixes for Territory link to Sales Browser ", + "Check item/item group with same name while creating item group/item", + ]], + ["22nd January, 2013", [ + "Valuation Rate mandatory for opening Stock Reconciliation", + "Show analytics value based on valuation method defined in item master", ]], ["21st January, 2013", [ "Number Formatting: Added Number Format to Global Defaults & Currency", ]], + ["20th January, 2013", [ + "In payment matching tool only show outstanding invoices" + ]], ["18th January, 2013", [ "Buying: Added Price List to purchase cycle", + "C-Form now submittable", ]], ["16th January, 2013", [ + "Incoming rate for sales return as per delivery note outgoing rate", "Job Applicant: Track Job Applicants and extract them from a mailbox like 'jobs@example.com'. See Jobs Email Settings.", "Extract leads: Extract Leads from a mailbox like 'sales@example.com'. See Sales Email Settings.", ]], diff --git a/hr/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js index f098b802c2b..31fdb8e82cc 100644 --- a/hr/doctype/appraisal/appraisal.js +++ b/hr/doctype/appraisal/appraisal.js @@ -26,7 +26,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){ } cur_frm.cscript.onload_post_render = function(doc,cdt,cdn){ - if(doc.__islocal && doc.employee==user_defaults.employee) { + if(doc.__islocal && doc.employee==wn.defaults.get_user_default("employee")) { cur_frm.set_value("employee", ""); cur_frm.set_value("employee_name", "") } diff --git a/hr/doctype/appraisal/appraisal.py b/hr/doctype/appraisal/appraisal.py index 3d49c311d98..eaa609c3ec0 100644 --- a/hr/doctype/appraisal/appraisal.py +++ b/hr/doctype/appraisal/appraisal.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt, getdate -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/hr/doctype/attendance/attendance.py b/hr/doctype/attendance/attendance.py index d1ebc973334..b0f31310e0b 100644 --- a/hr/doctype/attendance/attendance.py +++ b/hr/doctype/attendance/attendance.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import add_days, getdate, now from webnotes.model import db_exists from webnotes.model.doc import make_autoname -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/hr/doctype/attendance_control_panel/attendance_control_panel.py b/hr/doctype/attendance_control_panel/attendance_control_panel.py index bc21f13ffec..dd0deb1784a 100644 --- a/hr/doctype/attendance_control_panel/attendance_control_panel.py +++ b/hr/doctype/attendance_control_panel/attendance_control_panel.py @@ -16,10 +16,11 @@ from __future__ import unicode_literals import webnotes +import webnotes.default -from webnotes.utils import cint, cstr, date_diff, formatdate, get_defaults, getdate, now +from webnotes.utils import cint, cstr, date_diff, formatdate, getdate, now from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import form, msgprint sql = webnotes.conn.sql @@ -30,7 +31,6 @@ class DocType: def __init__(self,d,dt): self.doc, self.doclist = d,dt - #========================================================================== def get_att_list(self): lst = [['Attendance','','','Please fill columns which are Mandatory.',' Please do not modify the structure','',''],['','','','','','',''],['[Mandatory]','','[Mandatory]','[Mandatory]','[Mandatory]','[Mandatory]','[Mandatory]'],['Employee','Employee Name','Attendance Date','Status','Fiscal Year','Company','Naming Series']] @@ -46,7 +46,6 @@ class DocType: return lst - #------------------------------------------------------------------------------ # get date list inbetween from date and to date def date_diff_list(self): import datetime @@ -65,10 +64,9 @@ class DocType: return dt - #------------------------------------------------------------------------------ def get_att_data(self): - fy = get_defaults()['fiscal_year'] #get default fiscal year - comp = get_defaults()['company'] #get default company + fy = webnotes.defaults.get_global_default('fiscal_year') + comp = webnotes.defaults.get_user_default('company') #get naming series of attendance import webnotes.model.doctype @@ -82,7 +80,6 @@ class DocType: return {'fy':fy,'comp':comp,'sr':sr} - #================================================================================= def import_att_data(self): filename = self.doc.file_list.split(',') diff --git a/hr/doctype/department/locale/_messages_doc.json b/hr/doctype/department/locale/_messages_doc.json index 38636d9a207..b0e9b387074 100644 --- a/hr/doctype/department/locale/_messages_doc.json +++ b/hr/doctype/department/locale/_messages_doc.json @@ -3,5 +3,5 @@ "Department", "Trash Reason", "Days for which Holidays are blocked for this department.", - "Holiday Block List" + "Leave Block List" ] \ No newline at end of file diff --git a/hr/doctype/department/locale/ar-doc.json b/hr/doctype/department/locale/ar-doc.json index f2aed8e6ee9..78847fdb9a3 100644 --- a/hr/doctype/department/locale/ar-doc.json +++ b/hr/doctype/department/locale/ar-doc.json @@ -3,5 +3,6 @@ "Department": "\u0642\u0633\u0645", "HR": "HR", "Holiday Block List": "\u0625\u0642\u0627\u0645\u0627\u062a \u0642\u0627\u0626\u0645\u0629", + "Leave Block List": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631", "Trash Reason": "\u0627\u0644\u0633\u0628\u0628 \u0627\u0644\u0642\u0645\u0627\u0645\u0629" } \ No newline at end of file diff --git a/hr/doctype/department/locale/es-doc.json b/hr/doctype/department/locale/es-doc.json index bde2c3ab331..1a1546226e5 100644 --- a/hr/doctype/department/locale/es-doc.json +++ b/hr/doctype/department/locale/es-doc.json @@ -3,5 +3,6 @@ "Department": "Departamento", "HR": "HR", "Holiday Block List": "Holiday lista de bloqueo", + "Leave Block List": "Deja lista de bloqueo", "Trash Reason": "Trash Raz\u00f3n" } \ No newline at end of file diff --git a/hr/doctype/department/locale/fr-doc.json b/hr/doctype/department/locale/fr-doc.json index 037256dc217..da81edd59bb 100644 --- a/hr/doctype/department/locale/fr-doc.json +++ b/hr/doctype/department/locale/fr-doc.json @@ -3,5 +3,6 @@ "Department": "D\u00e9partement", "HR": "RH", "Holiday Block List": "Block List vacances", + "Leave Block List": "Laisser Block List", "Trash Reason": "Raison Corbeille" } \ No newline at end of file diff --git a/hr/doctype/department/locale/hi-doc.json b/hr/doctype/department/locale/hi-doc.json index 7a473423987..6575397a048 100644 --- a/hr/doctype/department/locale/hi-doc.json +++ b/hr/doctype/department/locale/hi-doc.json @@ -3,5 +3,6 @@ "Department": "\u0935\u093f\u092d\u093e\u0917", "HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928", "Holiday Block List": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940", + "Leave Block List": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u091b\u094b\u0921\u093c \u0926\u094b", "Trash Reason": "\u091f\u094d\u0930\u0948\u0936 \u0915\u093e\u0930\u0923" } \ No newline at end of file diff --git a/hr/doctype/department/locale/hr-doc.json b/hr/doctype/department/locale/hr-doc.json index f03d269fe65..1c94d393c74 100644 --- a/hr/doctype/department/locale/hr-doc.json +++ b/hr/doctype/department/locale/hr-doc.json @@ -3,5 +3,6 @@ "Department": "Odsjek", "HR": "HR", "Holiday Block List": "Turisti\u010dka Blok Popis", + "Leave Block List": "Ostavite Block List", "Trash Reason": "Otpad Razlog" } \ No newline at end of file diff --git a/hr/doctype/department/locale/nl-doc.json b/hr/doctype/department/locale/nl-doc.json index 7d41b804fc7..c49156b6b1e 100644 --- a/hr/doctype/department/locale/nl-doc.json +++ b/hr/doctype/department/locale/nl-doc.json @@ -3,5 +3,6 @@ "Department": "Afdeling", "HR": "HR", "Holiday Block List": "Holiday Block List", + "Leave Block List": "Laat Block List", "Trash Reason": "Trash Reden" } \ No newline at end of file diff --git a/hr/doctype/department/locale/pt-doc.json b/hr/doctype/department/locale/pt-doc.json index 046ef3c430d..118cf4a9b3c 100644 --- a/hr/doctype/department/locale/pt-doc.json +++ b/hr/doctype/department/locale/pt-doc.json @@ -3,5 +3,6 @@ "Department": "Departamento", "HR": "HR", "Holiday Block List": "Lista de Bloqueios de f\u00e9rias", + "Leave Block List": "Deixe Lista de Bloqueios", "Trash Reason": "Raz\u00e3o lixo" } \ No newline at end of file diff --git a/hr/doctype/employee/employee.py b/hr/doctype/employee/employee.py index cef6fdc6978..2bd79981595 100644 --- a/hr/doctype/employee/employee.py +++ b/hr/doctype/employee/employee.py @@ -79,7 +79,7 @@ class DocType: from webnotes.profile import add_role add_role(self.doc.user_id, "HR User") - profile_wrapper = webnotes.model_wrapper("Profile", self.doc.user_id) + profile_wrapper = webnotes.bean("Profile", self.doc.user_id) # copy details like Fullname, DOB and Image to Profile if self.doc.employee_name: diff --git a/hr/doctype/expense_claim/expense_claim.py b/hr/doctype/expense_claim/expense_claim.py index 9e476e55952..0aa9ed80b98 100644 --- a/hr/doctype/expense_claim/expense_claim.py +++ b/hr/doctype/expense_claim/expense_claim.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import add_days -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import form, msgprint from webnotes.model.code import get_obj diff --git a/hr/doctype/holiday_list/holiday_list.py b/hr/doctype/holiday_list/holiday_list.py index 5a4c0628100..02181142078 100644 --- a/hr/doctype/holiday_list/holiday_list.py +++ b/hr/doctype/holiday_list/holiday_list.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import add_days, add_years, cint, getdate from webnotes.model import db_exists from webnotes.model.doc import addchild, make_autoname -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/hr/doctype/job_applicant/get_job_applications.py b/hr/doctype/job_applicant/get_job_applications.py index 4737a6a81b5..0b994c5b81d 100644 --- a/hr/doctype/job_applicant/get_job_applications.py +++ b/hr/doctype/job_applicant/get_job_applications.py @@ -31,14 +31,14 @@ class JobsMailbox(POP3Mailbox): name = webnotes.conn.get_value("Job Applicant", {"email_id": mail.from_email}, "name") if name: - applicant = webnotes.model_wrapper("Job Applicant", name) + applicant = webnotes.bean("Job Applicant", name) if applicant.doc.status!="Rejected": applicant.doc.status = "Open" applicant.doc.save() else: name = (mail.from_real_name and (mail.from_real_name + " - ") or "") \ + mail.from_email - applicant = webnotes.model_wrapper({ + applicant = webnotes.bean({ "creation": mail.date, "doctype":"Job Applicant", "applicant_name": name, diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt index 027a447b72d..9027c843df2 100644 --- a/hr/doctype/leave_allocation/leave_allocation.txt +++ b/hr/doctype/leave_allocation/leave_allocation.txt @@ -1,12 +1,13 @@ [ { - "creation": "2013-01-10 16:34:14", + "creation": "2013-02-20 19:10:38", "docstatus": 0, - "modified": "2013-01-22 14:56:04", + "modified": "2013-02-20 19:11:03", "modified_by": "Administrator", "owner": "Administrator" }, { + "allow_import": 1, "autoname": "LAL/.#####", "doctype": "DocType", "is_submittable": 1, diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js index 9df348a17e4..025281826cb 100755 --- a/hr/doctype/leave_application/leave_application.js +++ b/hr/doctype/leave_application/leave_application.js @@ -21,7 +21,8 @@ cur_frm.cscript.onload = function(doc, dt, dn) { if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()}); if(doc.__islocal) { - cur_frm.set_value("status", "Open") + cur_frm.set_value("status", "Open"); + cur_frm.cscript.calculate_total_days(doc, dt, dn); } cur_frm.set_df_property("leave_approver", "options", ""); cur_frm.call({ diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py index 06652ad66d0..07086dcc4de 100755 --- a/hr/doctype/leave_application/leave_application.py +++ b/hr/doctype/leave_application/leave_application.py @@ -18,9 +18,8 @@ from __future__ import unicode_literals import webnotes from webnotes import _ -from webnotes.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_url_to_form, get_fullname +from webnotes.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_url_to_form from webnotes import msgprint -from webnotes.utils.email_lib import sendmail class LeaveDayBlockedError(Exception): pass @@ -33,7 +32,6 @@ class DocType(DocListController): self.previous_doc = None def validate(self): - # if self.doc.leave_approver == self.doc.owner: self.validate_to_date() self.validate_balance_leaves() self.validate_leave_overlap() @@ -41,8 +39,8 @@ class DocType(DocListController): self.validate_block_days() def on_update(self): - if (not self.previous_doc and self.doc.leave_approver) or (self.doc.status == "Open" \ - and self.previous_doc.leave_approver != self.doc.leave_approver): + if (not self.previous_doc and self.doc.leave_approver) or (self.previous_doc and \ + self.doc.status == "Open" and self.previous_doc.leave_approver != self.doc.leave_approver): # notify leave approver about creation self.notify_leave_approver() elif self.previous_doc and \ @@ -73,7 +71,7 @@ class DocType(DocListController): for d in block_dates: webnotes.msgprint(formatdate(d.block_date) + ": " + d.reason) - if self.doc.docstatus == 1: + if self.doc.status == "Approved": raise LeaveDayBlockedError def get_holidays(self): @@ -105,9 +103,7 @@ class DocType(DocListController): raise Exception def validate_balance_leaves(self): - if self.doc.from_date and self.doc.to_date and not is_lwp(self.doc.leave_type): - self.doc.leave_balance = get_leave_balance(self.doc.employee, - self.doc.leave_type, self.doc.fiscal_year)["leave_balance"] + if self.doc.from_date and self.doc.to_date: self.doc.total_leave_days = self.get_total_leave_days()["total_leave_days"] if self.doc.total_leave_days == 0: @@ -115,9 +111,13 @@ class DocType(DocListController): coincide with holiday(s). You need not apply for leave."), raise_exception=1) - if self.doc.leave_balance - self.doc.total_leave_days < 0: - msgprint("There is not enough leave balance for Leave Type: %s" % \ - (self.doc.leave_type,), raise_exception=1) + if not is_lwp(self.doc.leave_type): + self.doc.leave_balance = get_leave_balance(self.doc.employee, + self.doc.leave_type, self.doc.fiscal_year)["leave_balance"] + + if self.doc.leave_balance - self.doc.total_leave_days < 0: + msgprint("There is not enough leave balance for Leave Type: %s" % \ + (self.doc.leave_type,), raise_exception=1) def validate_leave_overlap(self): for d in webnotes.conn.sql("""select name, leave_type, posting_date, @@ -165,7 +165,7 @@ class DocType(DocListController): def _get_message(url=False): name = self.doc.name - employee_name = get_fullname(employee.user_id) + employee_name = cstr(employee.employee_name) if url: name = get_url_to_form(self.doc.doctype, self.doc.name) employee_name = get_url_to_form("Employee", self.doc.employee, label=employee_name) @@ -185,7 +185,7 @@ class DocType(DocListController): args = webnotes._dict(args) from utilities.page.messages.messages import post post({"txt": args.message, "contact": args.message_to, "subject": args.subject, - "notify": True}) + "notify": cint(self.doc.follow_via_email)}) @webnotes.whitelist() def get_leave_balance(employee, leave_type, fiscal_year): @@ -223,9 +223,22 @@ def get_events(start, end): events = [] employee = webnotes.conn.get_default("employee", webnotes.session.user) company = webnotes.conn.get_default("company", webnotes.session.user) - - add_department_leaves(events, start, end, employee, company) + + from webnotes.widgets.reportview import build_match_conditions + match_conditions = build_match_conditions({"doctype": "Leave Application"}) + + # show department leaves for employee + show_department_leaves = match_conditions and \ + len(match_conditions.split("or"))==1 and "employee" in match_conditions + + if show_department_leaves: + add_department_leaves(events, start, end, employee, company) + else: + add_leaves(events, start, end, employee, company, match_conditions) + add_block_dates(events, start, end, employee, company) + add_holidays(events, start, end, employee, company) + return events def add_department_leaves(events, start, end, employee, company): @@ -235,27 +248,33 @@ def add_department_leaves(events, start, end, employee, company): return # department leaves - department_employees = webnotes.conn.sql_list("select name from tabEmployee where department=%s", - department) + department_employees = webnotes.conn.sql_list("""select name from tabEmployee where department=%s + and company=%s""", (department, company)) - for d in webnotes.conn.sql("""select name, from_date, to_date, employee_name, half_day, - status, employee + match_conditions = "employee in (\"%s\")" % '", "'.join(department_employees) + add_leaves(events, start, end, employee, company, match_conditions=match_conditions) + +def add_leaves(events, start, end, employee, company, match_conditions=None): + query = """select name, from_date, to_date, employee_name, half_day, + status, employee, docstatus from `tabLeave Application` where (from_date between %s and %s or to_date between %s and %s) and docstatus < 2 - and status!="Rejected" - and employee in ('%s')""" % ("%s", "%s", "%s", "%s", "', '".join(department_employees)), - (start, end, start, end), as_dict=True): - events.append({ - "name": d.name, - "doctype": "Leave Application", - "from_date": d.from_date, - "to_date": d.to_date, - "status": d.status, - "title": _("Leave by") + " " + d.employee_name + \ - (d.half_day and _(" (Half Day)") or "") - }) + and status!="Rejected" """ + if match_conditions: + query += " and " + match_conditions + for d in webnotes.conn.sql(query, (start, end, start, end), as_dict=True): + events.append({ + "name": d.name, + "doctype": "Leave Application", + "from_date": d.from_date, + "to_date": d.to_date, + "status": d.status, + "title": _("Leave by") + " " + cstr(d.employee_name) + \ + (d.half_day and _(" (Half Day)") or ""), + "docstatus": d.docstatus + }) def add_block_dates(events, start, end, employee, company): # block days @@ -272,4 +291,18 @@ def add_block_dates(events, start, end, employee, company): "name": "_" + str(cnt), }) cnt+=1 + +def add_holidays(events, start, end, employee, company): + applicable_holiday_list = webnotes.conn.get_value("Employee", employee, "holiday_list") + if not applicable_holiday_list: + return + for holiday in webnotes.conn.sql("""select name, holiday_date, description + from `tabHoliday` where parent=%s and holiday_date between %s and %s""", + (applicable_holiday_list, start, end), as_dict=True): + events.append({ + "doctype": "Holiday", + "from_date": holiday.holiday_date, + "title": _("Holiday") + ": " + cstr(holiday.description), + "name": holiday.name + }) diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index f51a91a2f7b..f0f15604e6c 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -1,17 +1,20 @@ [ { - "creation": "2013-02-08 13:17:08", + "creation": "2013-02-18 18:37:56", "docstatus": 0, - "modified": "2013-02-13 12:32:27", + "modified": "2013-02-19 16:30:05", "modified_by": "Administrator", "owner": "Administrator" }, { + "allow_attach": 1, + "allow_import": 1, "autoname": "LAP/.#####", "description": "Apply / Approve Leaves", "doctype": "DocType", "document_type": "Transaction", "is_submittable": 1, + "max_attachments": 3, "module": "HR", "name": "__common__", "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year" @@ -44,7 +47,7 @@ "label": "Status", "no_copy": 1, "options": "Open\nApproved\nRejected", - "permlevel": 2 + "permlevel": 1 }, { "description": "Leave can be approved by users with Role, \"Leave Approver\"", @@ -156,6 +159,16 @@ "label": "More Info", "permlevel": 0 }, + { + "allow_on_submit": 1, + "default": "1", + "doctype": "DocField", + "fieldname": "follow_via_email", + "fieldtype": "Check", + "label": "Follow via Email", + "permlevel": 0, + "print_hide": 1 + }, { "default": "Today", "doctype": "DocField", @@ -178,6 +191,12 @@ "reqd": 1, "search_index": 0 }, + { + "doctype": "DocField", + "fieldname": "column_break_17", + "fieldtype": "Column Break", + "permlevel": 0 + }, { "doctype": "DocField", "fieldname": "company", @@ -208,6 +227,16 @@ "print_hide": 1, "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "file_list", + "fieldtype": "Text", + "hidden": 1, + "label": "File List", + "no_copy": 1, + "permlevel": 0, + "print_hide": 1 + }, { "create": 1, "doctype": "DocPerm", @@ -231,6 +260,7 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "match": "company", "permlevel": 0, "report": 1, "role": "HR User", @@ -254,7 +284,7 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 2, + "permlevel": 1, "report": 1, "role": "HR User", "submit": 0, @@ -265,15 +295,10 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 2, + "permlevel": 1, "report": 1, "role": "Leave Approver", "submit": 0, "write": 1 - }, - { - "doctype": "DocPerm", - "permlevel": 2, - "role": "Employee" } ] \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/_messages_doc.json b/hr/doctype/leave_application/locale/_messages_doc.json index b4afb7a3a19..b7587ffc13d 100644 --- a/hr/doctype/leave_application/locale/_messages_doc.json +++ b/hr/doctype/leave_application/locale/_messages_doc.json @@ -2,6 +2,7 @@ "HR", "To Date", "Leave Approver", + "Follow via Email", "Employee", "Employee Name", "Status", @@ -9,6 +10,7 @@ "Apply / Approve Leaves", "Rejected", "Reason", + "File List", "Half Day", "More Info", "Approved", diff --git a/hr/doctype/leave_application/locale/_messages_py.json b/hr/doctype/leave_application/locale/_messages_py.json index 8c96cd182b8..9d2a3b7e808 100644 --- a/hr/doctype/leave_application/locale/_messages_py.json +++ b/hr/doctype/leave_application/locale/_messages_py.json @@ -1,5 +1,11 @@ [ - " Reason: ", - "You cannot apply for a leave on the following date because it is blocked", - "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave." + "New Leave Application", + "Following dates are blocked for Leave", + "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.", + "Leave by", + "Employee", + "Leave Blocked", + "Holiday", + " (Half Day)", + "Leave Application" ] \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/ar-py.json b/hr/doctype/leave_application/locale/ar-py.json index f13fddd0e97..f154455b6d9 100644 --- a/hr/doctype/leave_application/locale/ar-py.json +++ b/hr/doctype/leave_application/locale/ar-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(\u0646\u0635\u0641 \u064a\u0648\u0645)", " Reason: ": "\u0627\u0644\u0633\u0628\u0628:", + "Employee": "\u0639\u0627\u0645\u0644", + "Following dates are blocked for Leave": "\u064a\u062a\u0645 \u062d\u0638\u0631 \u0627\u0644\u0645\u0648\u0627\u0639\u064a\u062f \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u0625\u062c\u0627\u0632\u0629", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "\u064a\u0627 \u0647\u0644\u0627! \u0627\u0644\u064a\u0648\u0645 (\u0642) \u0627\u0644\u062a\u064a \u0643\u0646\u062a \u0645\u062a\u0642\u062f\u0645\u0627 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0625\u0630\u0646 \\ \u062a\u062a\u0632\u0627\u0645\u0646 \u0645\u0639 \u0639\u0637\u0644\u0629 (\u0642). \u0644\u0627 \u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u062a\u0637\u0628\u064a\u0642 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0625\u0630\u0646.", + "Leave Application": "\u062a\u0631\u0643 \u0627\u0644\u062a\u0637\u0628\u064a\u0642", + "Leave Blocked": "\u062a\u0631\u0643 \u0627\u0644\u0645\u0645\u0646\u0648\u0639", + "Leave by": "\u062a\u0631\u0643 \u0645\u0646 \u0642\u0628\u0644", + "New Leave Application": "\u0625\u062c\u0627\u0632\u0629 \u062c\u062f\u064a\u062f\u0629 \u0627\u0644\u062a\u0637\u0628\u064a\u0642", "You cannot apply for a leave on the following date because it is blocked": "\u0644\u0627 \u064a\u0645\u0643\u0646\u0643 \u0627\u0644\u062a\u0642\u062f\u0645 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0627\u0644\u0625\u062c\u0627\u0632\u0629 \u0641\u064a \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u062a\u0645 \u062d\u0638\u0631\u0647" } \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/es-py.json b/hr/doctype/leave_application/locale/es-py.json index b41ef5a9828..e22484f657e 100644 --- a/hr/doctype/leave_application/locale/es-py.json +++ b/hr/doctype/leave_application/locale/es-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(Medio d\u00eda)", " Reason: ": "Raz\u00f3n:", + "Employee": "Empleado", + "Following dates are blocked for Leave": "Siguientes fechas son bloqueados por la licencia", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "\u00a1Hurra! El d\u00eda (s) en el cual usted est\u00e1 solicitando para salir \\ coincidir con d\u00eda de fiesta (s). No es necesario solicitar permiso.", + "Leave Application": "Deja aplicaci\u00f3n", + "Leave Blocked": "Deja Bloqueados", + "Leave by": "Deja por", + "New Leave Application": "Aplicaci\u00f3n salir de Nueva", "You cannot apply for a leave on the following date because it is blocked": "Usted no puede solicitar una licencia en la siguiente fecha porque est\u00e1 bloqueado" } \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/fr-py.json b/hr/doctype/leave_application/locale/fr-py.json index 107e0c040c9..af170b8dcfb 100644 --- a/hr/doctype/leave_application/locale/fr-py.json +++ b/hr/doctype/leave_application/locale/fr-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(Demi-journ\u00e9e)", " Reason: ": "Raison:", + "Employee": "Employ\u00e9", + "Following dates are blocked for Leave": "Dates suivantes sont bloqu\u00e9es pendant le cong\u00e9", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "Hourra! Le jour (s) sur lequel vous faites une demande d'autorisation \\ co\u00efncider avec s\u00e9jour (s). Vous n'avez pas besoin demander un cong\u00e9.", + "Leave Application": "Demande de cong\u00e9s", + "Leave Blocked": "Laisser Bloqu\u00e9", + "Leave by": "Sortez par", + "New Leave Application": "Nouvelle demande d'autorisation", "You cannot apply for a leave on the following date because it is blocked": "Vous ne pouvez pas demander un cong\u00e9 \u00e0 la date suivante car il est bloqu\u00e9" } \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/hi-py.json b/hr/doctype/leave_application/locale/hi-py.json index 4fae2297399..bf55b7d9942 100644 --- a/hr/doctype/leave_application/locale/hi-py.json +++ b/hr/doctype/leave_application/locale/hi-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(\u0906\u0927\u0947 \u0926\u093f\u0928)", " Reason: ": "\u0915\u093e\u0930\u0923:", + "Employee": "\u0915\u0930\u094d\u092e\u091a\u093e\u0930\u0940", + "Following dates are blocked for Leave": "\u0928\u093f\u092e\u094d\u0928 \u0926\u093f\u0928\u093e\u0902\u0915 \u091b\u094b\u0921\u093c\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0905\u0935\u0930\u0941\u0926\u094d\u0927 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "\u0939\u0941\u0930\u094d\u0930\u0947! \u0926\u093f\u0928 (s) \\ \u091c\u093f\u0938 \u092a\u0930 \u0906\u092a \u091b\u094b\u0921\u093c\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0906\u0935\u0947\u0926\u0928 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902 \u091b\u0941\u091f\u094d\u091f\u0940 (\u090f\u0938) \u0915\u0947 \u0938\u093e\u0925 \u092e\u0947\u0932. \u0906\u092a \u091b\u0941\u091f\u094d\u091f\u0940 \u0915\u0947 \u0932\u093f\u090f \u0932\u093e\u0917\u0942 \u0928\u0939\u0940\u0902 \u0915\u0940 \u091c\u0930\u0942\u0930\u0924 \u0939\u0948.", + "Leave Application": "\u091b\u0941\u091f\u094d\u091f\u0940 \u0915\u0940 \u0905\u0930\u094d\u091c\u093c\u0940", + "Leave Blocked": "\u0905\u0935\u0930\u0941\u0926\u094d\u0927 \u091b\u094b\u0921\u093c \u0926\u094b", + "Leave by": "\u0926\u094d\u0935\u093e\u0930\u093e \u091b\u094b\u0921\u093c \u0926\u094b", + "New Leave Application": "\u0928\u0908 \u091b\u0941\u091f\u094d\u091f\u0940 \u0915\u0947 \u0932\u093f\u090f \u0905\u0930\u094d\u091c\u0940", "You cannot apply for a leave on the following date because it is blocked": "\u0906\u092a \u0928\u093f\u092e\u094d\u0928 \u0926\u093f\u0928\u093e\u0902\u0915 \u092a\u0930 \u091b\u0941\u091f\u094d\u091f\u0940 \u0915\u0947 \u0932\u093f\u090f \u0932\u093e\u0917\u0942 \u0928\u0939\u0940\u0902 \u0939\u0948 \u0915\u094d\u092f\u094b\u0902\u0915\u093f \u092f\u0939 \u092c\u0902\u0926 \u0939\u0948" } \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/hr-py.json b/hr/doctype/leave_application/locale/hr-py.json index 0aba67b01c9..77ebe52ac1a 100644 --- a/hr/doctype/leave_application/locale/hr-py.json +++ b/hr/doctype/leave_application/locale/hr-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(Poludnevni)", " Reason: ": "Razlog:", + "Employee": "Zaposlenik", + "Following dates are blocked for Leave": "Nakon datumi su blokirani dopusta", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "Ura! Dan (e) na koje se prijavljuje za ostaviti \\ podudara s odmora (s). Vi ne trebate podnijeti zahtjev za dopust.", + "Leave Application": "Ostavite aplikaciju", + "Leave Blocked": "Ostavite blokirani", + "Leave by": "Ostavite po", + "New Leave Application": "Novi dopust Primjena", "You cannot apply for a leave on the following date because it is blocked": "Ne mo\u017eete podnijeti zahtjev za dopust na sljede\u0107i dan, jer je blokirana" } \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/nl-py.json b/hr/doctype/leave_application/locale/nl-py.json index ba2a476c8c5..64c5ac2f1a6 100644 --- a/hr/doctype/leave_application/locale/nl-py.json +++ b/hr/doctype/leave_application/locale/nl-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(Halve dag)", " Reason: ": "Reden:", + "Employee": "Werknemer", + "Following dates are blocked for Leave": "Volgende data zijn geblokkeerd voor Verlof", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "Hoera! De dag (en) waarop u een aanvraag voor verlof \\ samenvallen met vakantie (s). Je moet niet van toepassing voor verlof.", + "Leave Application": "Verlofaanvraag", + "Leave Blocked": "Laat Geblokkeerde", + "Leave by": "Laat door", + "New Leave Application": "Nieuwe verlofaanvraag", "You cannot apply for a leave on the following date because it is blocked": "Je kan niet van toepassing zijn voor een verlof op de volgende datum, omdat het is geblokkeerd" } \ No newline at end of file diff --git a/hr/doctype/leave_application/locale/pt-py.json b/hr/doctype/leave_application/locale/pt-py.json index 62c8dd79ecb..b4e8233dd9e 100644 --- a/hr/doctype/leave_application/locale/pt-py.json +++ b/hr/doctype/leave_application/locale/pt-py.json @@ -1,5 +1,12 @@ { + " (Half Day)": "(Meio Dia)", " Reason: ": "Motivo:", + "Employee": "Empregado", + "Following dates are blocked for Leave": "Seguintes datas est\u00e3o bloqueadas para a licen\u00e7a", "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.": "Viva! O dia (s) em que voc\u00ea est\u00e1 aplicando para deixar \\ coincidir com feriado (s). Voc\u00ea n\u00e3o precisa pedir licen\u00e7a.", + "Leave Application": "Deixe Aplica\u00e7\u00e3o", + "Leave Blocked": "Deixe Bloqueados", + "Leave by": "Deixe por", + "New Leave Application": "Aplica\u00e7\u00e3o deixar Nova", "You cannot apply for a leave on the following date because it is blocked": "Voc\u00ea n\u00e3o pode aplicar para uma licen\u00e7a na seguinte data porque est\u00e1 bloqueado" } \ No newline at end of file diff --git a/hr/doctype/leave_application/test_leave_application.py b/hr/doctype/leave_application/test_leave_application.py index 584549add3f..dc1b463e97b 100644 --- a/hr/doctype/leave_application/test_leave_application.py +++ b/hr/doctype/leave_application/test_leave_application.py @@ -5,18 +5,18 @@ from hr.doctype.leave_application.leave_application import LeaveDayBlockedError class TestLeaveApplication(unittest.TestCase): def get_application(self, doclist): - application = webnotes.model_wrapper(doclist) + application = webnotes.bean(copy=doclist) application.doc.from_date = "2013-01-01" application.doc.to_date = "2013-01-05" return application def test_block_list(self): import webnotes - webnotes.conn.set_value("Employee", "_T-Employee-0001", "department", - "_Test Department with Block List") + webnotes.conn.set_value("Department", "_Test Department", "leave_block_list", "_Test Leave Block List") application = self.get_application(test_records[1]) application.insert() + application.doc.status = "Approved" self.assertRaises(LeaveDayBlockedError, application.submit) webnotes.session.user = "test1@example.com" @@ -45,6 +45,7 @@ class TestLeaveApplication(unittest.TestCase): from webnotes.profile import add_role add_role("test@example.com", "Leave Approver") + application.doc.status = "Approved" self.assertRaises(LeaveDayBlockedError, application.submit) diff --git a/hr/doctype/leave_block_list/leave_block_list.txt b/hr/doctype/leave_block_list/leave_block_list.txt index b48416c3df1..dec4819d072 100644 --- a/hr/doctype/leave_block_list/leave_block_list.txt +++ b/hr/doctype/leave_block_list/leave_block_list.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-02-08 15:13:29", + "creation": "2013-02-18 17:43:12", "docstatus": 0, - "modified": "2013-02-14 17:15:32", + "modified": "2013-02-19 18:42:35", "modified_by": "Administrator", "owner": "Administrator" }, @@ -83,7 +83,7 @@ "options": "Leave Block List Date" }, { - "description": "Allow the following users to make Leave Applications for block days.", + "description": "Allow the following users to approve Leave Applications for block days.", "doctype": "DocField", "fieldname": "allow_list", "fieldtype": "Section Break", diff --git a/hr/doctype/leave_block_list/locale/_messages_doc.json b/hr/doctype/leave_block_list/locale/_messages_doc.json new file mode 100644 index 00000000000..47b1fa522b8 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/_messages_doc.json @@ -0,0 +1,16 @@ +[ + "Allow Users", + "Block Holidays on important days.", + "Block Days", + "HR", + "Allow the following users to approve Leave Applications for block days.", + "Company", + "Leave Block List", + "Stop users from making Leave Applications on following days.", + "Applies to Company", + "Year", + "If not checked, the list will have to be added to each Department where it has to be applied.", + "Leave Block List Name", + "Leave Block List Allowed", + "Leave Block List Dates" +] \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/_messages_js.json b/hr/doctype/leave_block_list/locale/_messages_js.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/_messages_js.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/_messages_py.json b/hr/doctype/leave_block_list/locale/_messages_py.json new file mode 100644 index 00000000000..d2e6ee4d62a --- /dev/null +++ b/hr/doctype/leave_block_list/locale/_messages_py.json @@ -0,0 +1,4 @@ +[ + "Date is repeated", + "Block Date" +] \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/ar-doc.json b/hr/doctype/leave_block_list/locale/ar-doc.json new file mode 100644 index 00000000000..de0dc8ed29d --- /dev/null +++ b/hr/doctype/leave_block_list/locale/ar-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "\u0627\u0644\u0633\u0645\u0627\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646", + "Allow the following users to make Leave Applications for block days.": "\u062a\u0633\u0645\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u062c\u0639\u0644 \u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0625\u062c\u0627\u0632\u0629 \u0644\u0639\u062f\u0629 \u0623\u064a\u0627\u0645 \u0643\u062a\u0644\u0629.", + "Applies to Company": "\u064a\u0646\u0637\u0628\u0642 \u0639\u0644\u0649 \u0634\u0631\u0643\u0629", + "Block Days": "\u0643\u062a\u0644\u0629 \u0623\u064a\u0627\u0645", + "Block Holidays on important days.": "\u0645\u0646\u0639 \u0627\u0644\u0625\u062c\u0627\u0632\u0627\u062a \u0641\u064a \u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u0647\u0627\u0645\u0629.", + "Company": "\u0634\u0631\u0643\u0629", + "HR": "HR", + "If not checked, the list will have to be added to each Department where it has to be applied.": "\u0625\u0646 \u0644\u0645 \u064a\u0643\u0646 \u062a\u0645\u060c \u0633\u064a\u0643\u0648\u0646 \u0644\u062f\u064a\u0643 \u0642\u0627\u0626\u0645\u0629 \u062a\u0636\u0627\u0641 \u0625\u0644\u0649 \u0643\u0644 \u0642\u0633\u0645 \u062d\u064a\u062b \u0623\u0646\u0647 \u0644\u0627 \u0628\u062f \u0645\u0646 \u062a\u0637\u0628\u064a\u0642\u0647\u0627.", + "Leave Block List": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631", + "Leave Block List Allowed": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631 \u0645\u0633\u0645\u0648\u062d", + "Leave Block List Dates": "\u062a\u0631\u0643 \u0627\u0644\u062a\u0648\u0627\u0631\u064a\u062e \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631", + "Leave Block List Name": "\u062a\u0631\u0643 \u0627\u0633\u0645 \u0643\u062a\u0644\u0629 \u0642\u0627\u0626\u0645\u0629", + "Stop users from making Leave Applications on following days.": "\u0648\u0642\u0641 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0645\u0646 \u0625\u062c\u0631\u0627\u0621 \u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0639\u0644\u0649 \u0625\u062c\u0627\u0632\u0629 \u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u062a\u0627\u0644\u064a\u0629.", + "Year": "\u0639\u0627\u0645" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/ar-py.json b/hr/doctype/leave_block_list/locale/ar-py.json new file mode 100644 index 00000000000..e50eb48b7b4 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/ar-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "\u0645\u0646\u0639 \u062a\u0627\u0631\u064a\u062e", + "Date is repeated": "\u0648\u064a\u062a\u0643\u0631\u0631 \u0627\u0644\u062a\u0627\u0631\u064a\u062e" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/es-doc.json b/hr/doctype/leave_block_list/locale/es-doc.json new file mode 100644 index 00000000000..4ceaf0eb9a1 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/es-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "Permitir que los usuarios", + "Allow the following users to make Leave Applications for block days.": "Permitir a los usuarios realizar las siguientes aplicaciones dejan para los d\u00edas de bloque.", + "Applies to Company": "Corresponde a la Empresa", + "Block Days": "D\u00edas de bloque", + "Block Holidays on important days.": "Bloque Vacaciones en d\u00edas importantes.", + "Company": "Empresa", + "HR": "HR", + "If not checked, the list will have to be added to each Department where it has to be applied.": "Si no est\u00e1 activada, la lista tendr\u00e1 que ser a\u00f1adido a cada Departamento donde se ha de aplicar.", + "Leave Block List": "Deja lista de bloqueo", + "Leave Block List Allowed": "Deja Lista de bloqueo animales", + "Leave Block List Dates": "Dejar las fechas de listas de bloqueo", + "Leave Block List Name": "Deja Bloquear Nombre de lista", + "Stop users from making Leave Applications on following days.": "Deje que los usuarios realicen aplicaciones dejan en los d\u00edas siguientes.", + "Year": "A\u00f1o" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/es-py.json b/hr/doctype/leave_block_list/locale/es-py.json new file mode 100644 index 00000000000..4c5772b7092 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/es-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "Bloque Fecha", + "Date is repeated": "La fecha se repite" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/fr-doc.json b/hr/doctype/leave_block_list/locale/fr-doc.json new file mode 100644 index 00000000000..05f08c6ebb0 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/fr-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "Autoriser les utilisateurs", + "Allow the following users to make Leave Applications for block days.": "Autoriser les utilisateurs suivants pour faire demandes d'autorisation pour les jours de bloc.", + "Applies to Company": "S'applique \u00e0 l'entreprise", + "Block Days": "Bloquer les jours", + "Block Holidays on important days.": "Bloquer les jours f\u00e9ri\u00e9s importants.", + "Company": "Entreprise", + "HR": "RH", + "If not checked, the list will have to be added to each Department where it has to be applied.": "Si ce n'est pas coch\u00e9e, la liste devra \u00eatre ajout\u00e9 \u00e0 chaque d\u00e9partement o\u00f9 il doit \u00eatre appliqu\u00e9.", + "Leave Block List": "Laisser Block List", + "Leave Block List Allowed": "Laisser Block List admis", + "Leave Block List Dates": "Laisser Dates de listes rouges d'", + "Leave Block List Name": "Laisser Nom de la liste de blocage", + "Stop users from making Leave Applications on following days.": "Emp\u00eacher les utilisateurs de faire des demandes d'autorisation, les jours suivants.", + "Year": "Ann\u00e9e" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/fr-py.json b/hr/doctype/leave_block_list/locale/fr-py.json new file mode 100644 index 00000000000..a1f5dd380ba --- /dev/null +++ b/hr/doctype/leave_block_list/locale/fr-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "Date de bloquer", + "Date is repeated": "La date est r\u00e9p\u00e9t\u00e9e" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/hi-doc.json b/hr/doctype/leave_block_list/locale/hi-doc.json new file mode 100644 index 00000000000..8f5723c7e49 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/hi-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "\u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u094b \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902", + "Allow the following users to make Leave Applications for block days.": "\u0928\u093f\u092e\u094d\u0928 \u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u094b \u092c\u094d\u0932\u0949\u0915 \u0926\u093f\u0928\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u091b\u0941\u091f\u094d\u091f\u0940 \u0905\u0928\u0941\u092a\u094d\u0930\u092f\u094b\u0917 \u092c\u0928\u093e\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902.", + "Applies to Company": "\u0915\u0902\u092a\u0928\u0940 \u0915\u0947 \u0932\u093f\u090f \u0932\u093e\u0917\u0942 \u0939\u094b\u0924\u093e \u0939\u0948", + "Block Days": "\u092c\u094d\u0932\u0949\u0915 \u0926\u093f\u0928", + "Block Holidays on important days.": "\u092e\u0939\u0924\u094d\u0935\u092a\u0942\u0930\u094d\u0923 \u0926\u093f\u0928 \u092a\u0930 \u091b\u0941\u091f\u094d\u091f\u093f\u092f\u093e\u0901 \u092e\u0948.", + "Company": "\u0915\u0902\u092a\u0928\u0940", + "HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928", + "If not checked, the list will have to be added to each Department where it has to be applied.": "\u0905\u0917\u0930 \u091c\u093e\u0901\u091a \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948, \u0907\u0938 \u0938\u0942\u091a\u0940 \u0915\u0947 \u0932\u093f\u090f \u092a\u094d\u0930\u0924\u094d\u092f\u0947\u0915 \u0935\u093f\u092d\u093e\u0917 \u0939\u0948 \u091c\u0939\u093e\u0902 \u0907\u0938\u0947 \u0932\u093e\u0917\u0942 \u0915\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948 \u0915\u0947 \u0932\u093f\u090f \u091c\u094b\u0921\u093c\u093e \u091c\u093e \u0939\u094b\u0917\u093e.", + "Leave Block List": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u091b\u094b\u0921\u093c \u0926\u094b", + "Leave Block List Allowed": "\u091b\u094b\u0921\u093c \u0926\u094b \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0930\u0916 \u0938\u0915\u0924\u0947 \u0939\u0948", + "Leave Block List Dates": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0924\u093f\u0925\u093f\u092f\u093e\u0902 \u091b\u094b\u0921\u093c\u094b", + "Leave Block List Name": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0928\u093e\u092e \u091b\u094b\u0921\u093c \u0926\u094b", + "Stop users from making Leave Applications on following days.": "\u0928\u093f\u092e\u094d\u0928\u0932\u093f\u0916\u093f\u0924 \u0926\u093f\u0928 \u092a\u0930 \u091b\u0941\u091f\u094d\u091f\u0940 \u0905\u0928\u0941\u092a\u094d\u0930\u092f\u094b\u0917 \u092c\u0928\u093e\u0928\u0947 \u0938\u0947 \u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u094b \u092c\u0902\u0926 \u0915\u0930\u094b.", + "Year": "\u0935\u0930\u094d\u0937" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/hi-py.json b/hr/doctype/leave_block_list/locale/hi-py.json new file mode 100644 index 00000000000..ca53d8f5cf8 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/hi-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "\u0924\u093f\u0925\u093f \u092c\u094d\u0932\u0949\u0915", + "Date is repeated": "\u0924\u093f\u0925\u093f \u0926\u094b\u0939\u0930\u093e\u092f\u093e \u0939\u0948" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/hr-doc.json b/hr/doctype/leave_block_list/locale/hr-doc.json new file mode 100644 index 00000000000..23be6a8ede7 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/hr-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "Omogu\u0107iti korisnicima", + "Allow the following users to make Leave Applications for block days.": "Dopusti sljede\u0107i korisnicima da ostavite Prijave za blok dana.", + "Applies to Company": "Odnosi se na Dru\u0161tvo", + "Block Days": "Blok Dani", + "Block Holidays on important days.": "Blok Odmor o va\u017enim dana.", + "Company": "Dru\u0161tvo", + "HR": "HR", + "If not checked, the list will have to be added to each Department where it has to be applied.": "Ako nije ozna\u010deno, popis \u0107e biti dodan u svakom odjela gdje se mora primjenjivati.", + "Leave Block List": "Ostavite Block List", + "Leave Block List Allowed": "Ostavite Block List dopu\u0161tenih", + "Leave Block List Dates": "Ostavite datumi lista blokiranih", + "Leave Block List Name": "Ostavite popis imena Block", + "Stop users from making Leave Applications on following days.": "Prestani korisnike od izrade ostaviti aplikacija na sljede\u0107im danima.", + "Year": "Godina" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/hr-py.json b/hr/doctype/leave_block_list/locale/hr-py.json new file mode 100644 index 00000000000..ba06d74dad6 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/hr-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "Blok Datum", + "Date is repeated": "Datum se ponavlja" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/nl-doc.json b/hr/doctype/leave_block_list/locale/nl-doc.json new file mode 100644 index 00000000000..d3e649b50b6 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/nl-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "Gebruikers toestaan", + "Allow the following users to make Leave Applications for block days.": "Laat de volgende gebruikers te vertrekken Toepassingen maken voor blok dagen.", + "Applies to Company": "Geldt voor Bedrijf", + "Block Days": "Blokkeren Dagen", + "Block Holidays on important days.": "Blok Vakantie op belangrijke dagen.", + "Company": "Vennootschap", + "HR": "HR", + "If not checked, the list will have to be added to each Department where it has to be applied.": "Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast.", + "Leave Block List": "Laat Block List", + "Leave Block List Allowed": "Laat toegestaan \u200b\u200bBlock List", + "Leave Block List Dates": "Laat Block List Data", + "Leave Block List Name": "Laat Block List Name", + "Stop users from making Leave Applications on following days.": "Stop gebruikers van het maken van verlofaanvragen op de volgende dagen.", + "Year": "Jaar" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/nl-py.json b/hr/doctype/leave_block_list/locale/nl-py.json new file mode 100644 index 00000000000..e89506edce0 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/nl-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "Blokkeren Datum", + "Date is repeated": "Datum wordt herhaald" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/pt-doc.json b/hr/doctype/leave_block_list/locale/pt-doc.json new file mode 100644 index 00000000000..70508f1d085 --- /dev/null +++ b/hr/doctype/leave_block_list/locale/pt-doc.json @@ -0,0 +1,16 @@ +{ + "Allow Users": "Permitir que os usu\u00e1rios", + "Allow the following users to make Leave Applications for block days.": "Permitir que os usu\u00e1rios a seguir para fazer aplica\u00e7\u00f5es deixam para os dias de bloco.", + "Applies to Company": "Aplica-se a Empresa", + "Block Days": "Dias bloco", + "Block Holidays on important days.": "Bloquear feriados em dias importantes.", + "Company": "Companhia", + "HR": "HR", + "If not checked, the list will have to be added to each Department where it has to be applied.": "Se n\u00e3o for controlada, a lista dever\u00e1 ser adicionado a cada departamento onde tem de ser aplicado.", + "Leave Block List": "Deixe Lista de Bloqueios", + "Leave Block List Allowed": "Deixe Lista de Bloqueios admitidos", + "Leave Block List Dates": "Deixe as datas Lista de Bloqueios", + "Leave Block List Name": "Deixe o nome Lista de Bloqueios", + "Stop users from making Leave Applications on following days.": "Pare de usu\u00e1rios de fazer aplica\u00e7\u00f5es deixam nos dias seguintes.", + "Year": "Ano" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list/locale/pt-py.json b/hr/doctype/leave_block_list/locale/pt-py.json new file mode 100644 index 00000000000..d2b6e696c3e --- /dev/null +++ b/hr/doctype/leave_block_list/locale/pt-py.json @@ -0,0 +1,4 @@ +{ + "Block Date": "Bloquear Data", + "Date is repeated": "Data \u00e9 repetido" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/_messages_doc.json b/hr/doctype/leave_block_list_allow/locale/_messages_doc.json new file mode 100644 index 00000000000..5f10bee7ce0 --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/_messages_doc.json @@ -0,0 +1,5 @@ +[ + "HR", + "Allow User", + "Leave Block List Allow" +] \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/ar-doc.json b/hr/doctype/leave_block_list_allow/locale/ar-doc.json new file mode 100644 index 00000000000..deaa7158035 --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/ar-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "\u062a\u0633\u0645\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645", + "HR": "HR", + "Leave Block List Allow": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631 \u0627\u0644\u0633\u0645\u0627\u062d" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/es-doc.json b/hr/doctype/leave_block_list_allow/locale/es-doc.json new file mode 100644 index 00000000000..896ad74246e --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/es-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "Permitir al usuario", + "HR": "HR", + "Leave Block List Allow": "Deja Lista de bloqueo Permitir" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/fr-doc.json b/hr/doctype/leave_block_list_allow/locale/fr-doc.json new file mode 100644 index 00000000000..4f3dde907f7 --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/fr-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "Permettre \u00e0 l'utilisateur", + "HR": "RH", + "Leave Block List Allow": "Laisser Block List Autoriser" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/hi-doc.json b/hr/doctype/leave_block_list_allow/locale/hi-doc.json new file mode 100644 index 00000000000..8c1ed60d81e --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/hi-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "\u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0915\u0940 \u0905\u0928\u0941\u092e\u0924\u093f", + "HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928", + "Leave Block List Allow": "\u091b\u094b\u0921\u093c \u0926\u094b \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0915\u0940 \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/hr-doc.json b/hr/doctype/leave_block_list_allow/locale/hr-doc.json new file mode 100644 index 00000000000..11e03f48414 --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/hr-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "Dopusti korisnika", + "HR": "HR", + "Leave Block List Allow": "Ostavite Blok Popis Dopustite" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/nl-doc.json b/hr/doctype/leave_block_list_allow/locale/nl-doc.json new file mode 100644 index 00000000000..cf4e4b8a433 --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/nl-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "Door gebruiker toestaan", + "HR": "HR", + "Leave Block List Allow": "Laat Block List Laat" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_allow/locale/pt-doc.json b/hr/doctype/leave_block_list_allow/locale/pt-doc.json new file mode 100644 index 00000000000..38dd42fe9f1 --- /dev/null +++ b/hr/doctype/leave_block_list_allow/locale/pt-doc.json @@ -0,0 +1,5 @@ +{ + "Allow User": "Permitir que o usu\u00e1rio", + "HR": "HR", + "Leave Block List Allow": "Deixe Lista de Bloqueios Permitir" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/_messages_doc.json b/hr/doctype/leave_block_list_date/locale/_messages_doc.json new file mode 100644 index 00000000000..621b9dc59a6 --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/_messages_doc.json @@ -0,0 +1,6 @@ +[ + "HR", + "Reason", + "Leave Block List Date", + "Block Date" +] \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/ar-doc.json b/hr/doctype/leave_block_list_date/locale/ar-doc.json new file mode 100644 index 00000000000..b92d7349804 --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/ar-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "\u0645\u0646\u0639 \u062a\u0627\u0631\u064a\u062e", + "HR": "HR", + "Leave Block List Date": "\u062a\u0631\u0643 \u0628\u0644\u0648\u0643 \u062a\u0627\u0631\u064a\u062e \u0642\u0627\u0626\u0645\u0629", + "Reason": "\u0633\u0628\u0628" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/es-doc.json b/hr/doctype/leave_block_list_date/locale/es-doc.json new file mode 100644 index 00000000000..2c36f5ae914 --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/es-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "Bloque Fecha", + "HR": "HR", + "Leave Block List Date": "Deje Fecha Lista de bloqueo", + "Reason": "Raz\u00f3n" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/fr-doc.json b/hr/doctype/leave_block_list_date/locale/fr-doc.json new file mode 100644 index 00000000000..6da9539fe20 --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/fr-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "Date de bloquer", + "HR": "RH", + "Leave Block List Date": "Laisser Date de Block List", + "Reason": "Raison" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/hi-doc.json b/hr/doctype/leave_block_list_date/locale/hi-doc.json new file mode 100644 index 00000000000..6ee4f7afa2f --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/hi-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "\u0924\u093f\u0925\u093f \u092c\u094d\u0932\u0949\u0915", + "HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928", + "Leave Block List Date": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0924\u093f\u0925\u093f \u091b\u094b\u0921\u093c \u0926\u094b", + "Reason": "\u0915\u093e\u0930\u0923" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/hr-doc.json b/hr/doctype/leave_block_list_date/locale/hr-doc.json new file mode 100644 index 00000000000..45c6b032564 --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/hr-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "Blok Datum", + "HR": "HR", + "Leave Block List Date": "Ostavite Date Popis Block", + "Reason": "Razlog" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/nl-doc.json b/hr/doctype/leave_block_list_date/locale/nl-doc.json new file mode 100644 index 00000000000..f617baa58bb --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/nl-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "Blokkeren Datum", + "HR": "HR", + "Leave Block List Date": "Laat Block List Datum", + "Reason": "Reden" +} \ No newline at end of file diff --git a/hr/doctype/leave_block_list_date/locale/pt-doc.json b/hr/doctype/leave_block_list_date/locale/pt-doc.json new file mode 100644 index 00000000000..8ef601a9a4a --- /dev/null +++ b/hr/doctype/leave_block_list_date/locale/pt-doc.json @@ -0,0 +1,6 @@ +{ + "Block Date": "Bloquear Data", + "HR": "HR", + "Leave Block List Date": "Deixe Data Lista de Bloqueios", + "Reason": "Raz\u00e3o" +} \ No newline at end of file diff --git a/hr/doctype/leave_control_panel/leave_control_panel.py b/hr/doctype/leave_control_panel/leave_control_panel.py index c81575c1d90..d26efd41fec 100644 --- a/hr/doctype/leave_control_panel/leave_control_panel.py +++ b/hr/doctype/leave_control_panel/leave_control_panel.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cint, cstr, flt, now, nowdate from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/hr/doctype/other_income_detail/locale/_messages_doc.json b/hr/doctype/other_income_detail/locale/_messages_doc.json index cb67d827a64..4b80e722ba8 100644 --- a/hr/doctype/other_income_detail/locale/_messages_doc.json +++ b/hr/doctype/other_income_detail/locale/_messages_doc.json @@ -1,4 +1,10 @@ [ + "Other Income Detail", + "Under Section", + "Modified Amount", + "Actual Amount", "HR", - "Other Income Detail" + "Max. Limit", + "Eligible Amount", + "Particulars" ] \ No newline at end of file diff --git a/hr/doctype/other_income_detail/locale/ar-doc.json b/hr/doctype/other_income_detail/locale/ar-doc.json index dc6aeb2b024..e074de2ee7d 100644 --- a/hr/doctype/other_income_detail/locale/ar-doc.json +++ b/hr/doctype/other_income_detail/locale/ar-doc.json @@ -1,4 +1,10 @@ { + "Actual Amount": "\u0627\u0644\u0645\u0628\u0644\u063a \u0627\u0644\u0641\u0639\u0644\u064a", + "Eligible Amount": "\u0627\u0644\u0645\u0624\u0647\u0644\u0629 \u0627\u0644\u0645\u0628\u0644\u063a", "HR": "HR", - "Other Income Detail": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0625\u064a\u0631\u0627\u062f\u0627\u062a \u0627\u0644\u0623\u062e\u0631\u0649" + "Max. Limit": "\u0645\u0627\u0643\u0633. \u0642\u0635\u0631", + "Modified Amount": "\u062a\u0639\u062f\u064a\u0644 \u0627\u0644\u0645\u0628\u0644\u063a", + "Other Income Detail": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0625\u064a\u0631\u0627\u062f\u0627\u062a \u0627\u0644\u0623\u062e\u0631\u0649", + "Particulars": "\u062a\u0641\u0627\u0635\u064a\u0644", + "Under Section": "\u062a\u062d\u062a \u0627\u0644\u0642\u0633\u0645" } \ No newline at end of file diff --git a/hr/doctype/other_income_detail/locale/es-doc.json b/hr/doctype/other_income_detail/locale/es-doc.json index 4f4056e6fcf..18824fac2c0 100644 --- a/hr/doctype/other_income_detail/locale/es-doc.json +++ b/hr/doctype/other_income_detail/locale/es-doc.json @@ -1,4 +1,10 @@ { + "Actual Amount": "Cantidad real", + "Eligible Amount": "Monto Elegible", "HR": "HR", - "Other Income Detail": "Detalle de otros ingresos" + "Max. Limit": "Max. Limitar", + "Modified Amount": "Monto de la modificaci\u00f3n", + "Other Income Detail": "Detalle de otros ingresos", + "Particulars": "Datos", + "Under Section": "Bajo la Secci\u00f3n" } \ No newline at end of file diff --git a/hr/doctype/other_income_detail/locale/fr-doc.json b/hr/doctype/other_income_detail/locale/fr-doc.json index a343e75fc2f..9f2edb53eb0 100644 --- a/hr/doctype/other_income_detail/locale/fr-doc.json +++ b/hr/doctype/other_income_detail/locale/fr-doc.json @@ -1,4 +1,10 @@ { + "Actual Amount": "Montant r\u00e9el", + "Eligible Amount": "Montant admissible", "HR": "RH", - "Other Income Detail": "D\u00e9tail Autres revenus" + "Max. Limit": "Max. Limiter", + "Modified Amount": "Montant de modification", + "Other Income Detail": "D\u00e9tail Autres revenus", + "Particulars": "Coordonn\u00e9es", + "Under Section": "Conform\u00e9ment \u00e0 l'article" } \ No newline at end of file diff --git a/hr/doctype/other_income_detail/locale/hr-doc.json b/hr/doctype/other_income_detail/locale/hr-doc.json index 6e951130b57..579384648a9 100644 --- a/hr/doctype/other_income_detail/locale/hr-doc.json +++ b/hr/doctype/other_income_detail/locale/hr-doc.json @@ -1,4 +1,10 @@ { + "Actual Amount": "Stvarni iznos", + "Eligible Amount": "Prihvatljivo Iznos", "HR": "HR", - "Other Income Detail": "Ostali prihodi Detalj" + "Max. Limit": "Maks. Ograni\u010diti", + "Modified Amount": "Promijenio Iznos", + "Other Income Detail": "Ostali prihodi Detalj", + "Particulars": "Pojedinosti", + "Under Section": "Pod Odjela" } \ No newline at end of file diff --git a/hr/doctype/other_income_detail/locale/nl-doc.json b/hr/doctype/other_income_detail/locale/nl-doc.json index 654347bf925..868a56e1c85 100644 --- a/hr/doctype/other_income_detail/locale/nl-doc.json +++ b/hr/doctype/other_income_detail/locale/nl-doc.json @@ -1,4 +1,10 @@ { + "Actual Amount": "Werkelijke bedrag", + "Eligible Amount": "In aanmerking komende bedrag", "HR": "HR", - "Other Income Detail": "Overige inkomsten Detail" + "Max. Limit": "Max. Beperken", + "Modified Amount": "Gewijzigd Bedrag", + "Other Income Detail": "Overige inkomsten Detail", + "Particulars": "Bijzonderheden", + "Under Section": "Op grond van artikel" } \ No newline at end of file diff --git a/hr/doctype/other_income_detail/locale/pt-doc.json b/hr/doctype/other_income_detail/locale/pt-doc.json index 1691ae5a3b1..eeae4cf69d9 100644 --- a/hr/doctype/other_income_detail/locale/pt-doc.json +++ b/hr/doctype/other_income_detail/locale/pt-doc.json @@ -1,4 +1,10 @@ { + "Actual Amount": "Valor Real", + "Eligible Amount": "Montante eleg\u00edvel", "HR": "HR", - "Other Income Detail": "Detalhe Outras Receitas" + "Max. Limit": "Max. Limitar", + "Modified Amount": "Quantidade modificado", + "Other Income Detail": "Detalhe Outras Receitas", + "Particulars": "Caracter\u00edsticas", + "Under Section": "Segundo a Se\u00e7\u00e3o" } \ No newline at end of file diff --git a/hr/doctype/salary_manager/salary_manager.py b/hr/doctype/salary_manager/salary_manager.py index 45b78a6fb71..e9b3dd719ea 100644 --- a/hr/doctype/salary_manager/salary_manager.py +++ b/hr/doctype/salary_manager/salary_manager.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cint, flt from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/hr/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py index 0f8e1ce2527..3edf4109547 100644 --- a/hr/doctype/salary_slip/salary_slip.py +++ b/hr/doctype/salary_slip/salary_slip.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import add_days, cint, cstr, flt, getdate from webnotes.model.doc import make_autoname -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint from setup.utils import get_company_currency diff --git a/hr/doctype/salary_structure/salary_structure.py b/hr/doctype/salary_structure/salary_structure.py index 9c5ad246efd..22789e3f499 100644 --- a/hr/doctype/salary_structure/salary_structure.py +++ b/hr/doctype/salary_structure/salary_structure.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr, flt from webnotes.model import db_exists from webnotes.model.doc import addchild, make_autoname -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/hr/page/hr_home/locale/_messages_js.json b/hr/page/hr_home/locale/_messages_js.json index 081d97a3245..d56452f8442 100644 --- a/hr/page/hr_home/locale/_messages_js.json +++ b/hr/page/hr_home/locale/_messages_js.json @@ -3,7 +3,8 @@ "Documents", "Attendance record.", "Employee records.", - "Holiday Block List", + "Leave Block List", + "Type of employment master.", "Template for employee performance appraisals.", "Attendance", "Applicant for a Job (extracted from jobs email).", @@ -45,7 +46,6 @@ "Monthly salary statement.", "Leave Type", "Department", - "Type of employment master.", "Salary Structure", "Company branches.", "List of holidays.", diff --git a/hr/page/hr_home/locale/ar-js.json b/hr/page/hr_home/locale/ar-js.json index 5eda01890f3..a28ba34c6ff 100644 --- a/hr/page/hr_home/locale/ar-js.json +++ b/hr/page/hr_home/locale/ar-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "\u062a\u0631\u0643 \u062a\u0648\u0632\u064a\u0639", "Leave Allocation Tool": "\u062a\u0631\u0643 \u0623\u062f\u0627\u0629 \u062a\u062e\u0635\u064a\u0635", "Leave Application": "\u062a\u0631\u0643 \u0627\u0644\u062a\u0637\u0628\u064a\u0642", + "Leave Block List": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631", "Leave Setup": "\u062a\u0631\u0643 \u0627\u0644\u0625\u0639\u062f\u0627\u062f", "Leave Type": "\u062a\u0631\u0643 \u0646\u0648\u0639", "Leave allocations.": "\u062a\u0631\u0643 \u0627\u0644\u0645\u062e\u0635\u0635\u0627\u062a.", diff --git a/hr/page/hr_home/locale/es-js.json b/hr/page/hr_home/locale/es-js.json index 4f5ce613cce..33339bb318b 100644 --- a/hr/page/hr_home/locale/es-js.json +++ b/hr/page/hr_home/locale/es-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "Deja Asignaci\u00f3n", "Leave Allocation Tool": "Deja herramienta de asignaci\u00f3n de", "Leave Application": "Deja aplicaci\u00f3n", + "Leave Block List": "Deja lista de bloqueo", "Leave Setup": "Deja de configuraci\u00f3n", "Leave Type": "Deja Tipo", "Leave allocations.": "Deja asignaciones.", diff --git a/hr/page/hr_home/locale/fr-js.json b/hr/page/hr_home/locale/fr-js.json index 16497f5a013..67afb3cc0f6 100644 --- a/hr/page/hr_home/locale/fr-js.json +++ b/hr/page/hr_home/locale/fr-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "Laisser Allocation", "Leave Allocation Tool": "Laisser outil de r\u00e9partition", "Leave Application": "Demande de cong\u00e9s", + "Leave Block List": "Laisser Block List", "Leave Setup": "Laisser Setup", "Leave Type": "Laisser Type d'", "Leave allocations.": "Laisser allocations.", diff --git a/hr/page/hr_home/locale/hi-js.json b/hr/page/hr_home/locale/hi-js.json index 20324fae0a4..3f4dfd729ae 100644 --- a/hr/page/hr_home/locale/hi-js.json +++ b/hr/page/hr_home/locale/hi-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "\u0906\u092c\u0902\u091f\u0928 \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Allocation Tool": "\u0906\u092c\u0902\u091f\u0928 \u0909\u092a\u0915\u0930\u0923 \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Application": "\u091b\u0941\u091f\u094d\u091f\u0940 \u0915\u0940 \u0905\u0930\u094d\u091c\u093c\u0940", + "Leave Block List": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Setup": "\u0938\u0947\u091f\u0905\u092a \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Type": "\u092a\u094d\u0930\u0915\u093e\u0930 \u091b\u094b\u0921\u093c \u0926\u094b", "Leave allocations.": "\u0906\u0935\u0902\u091f\u0928 \u091b\u094b\u0921\u093c \u0926\u0947\u0902.", diff --git a/hr/page/hr_home/locale/hr-js.json b/hr/page/hr_home/locale/hr-js.json index fce70e59695..17a36f80920 100644 --- a/hr/page/hr_home/locale/hr-js.json +++ b/hr/page/hr_home/locale/hr-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "Ostavite Raspodjela", "Leave Allocation Tool": "Ostavite raspodjele alat", "Leave Application": "Ostavite aplikaciju", + "Leave Block List": "Ostavite Block List", "Leave Setup": "Ostavite Setup", "Leave Type": "Ostavite Vid", "Leave allocations.": "Ostavite izdvajanja.", diff --git a/hr/page/hr_home/locale/nl-js.json b/hr/page/hr_home/locale/nl-js.json index 16b4121d930..9eb53ee4fa2 100644 --- a/hr/page/hr_home/locale/nl-js.json +++ b/hr/page/hr_home/locale/nl-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "Laat Toewijzing", "Leave Allocation Tool": "Laat Toewijzing Tool", "Leave Application": "Verlofaanvraag", + "Leave Block List": "Laat Block List", "Leave Setup": "Laat Setup", "Leave Type": "Laat Type", "Leave allocations.": "Laat toewijzingen.", diff --git a/hr/page/hr_home/locale/pt-js.json b/hr/page/hr_home/locale/pt-js.json index 2a0f6b0d8eb..ce447512f89 100644 --- a/hr/page/hr_home/locale/pt-js.json +++ b/hr/page/hr_home/locale/pt-js.json @@ -33,6 +33,7 @@ "Leave Allocation": "Deixe Aloca\u00e7\u00e3o", "Leave Allocation Tool": "Deixe Ferramenta de Aloca\u00e7\u00e3o", "Leave Application": "Deixe Aplica\u00e7\u00e3o", + "Leave Block List": "Deixe Lista de Bloqueios", "Leave Setup": "Deixe Setup", "Leave Type": "Deixar Tipo", "Leave allocations.": "Deixe aloca\u00e7\u00f5es.", diff --git a/manufacturing/doctype/bom/bom.py b/manufacturing/doctype/bom/bom.py index 809f36a5f2d..ef07e5e10a0 100644 --- a/manufacturing/doctype/bom/bom.py +++ b/manufacturing/doctype/bom/bom.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cint, cstr, flt, now, nowdate from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint, _ diff --git a/manufacturing/doctype/production_order/production_order.py b/manufacturing/doctype/production_order/production_order.py index 9a09494b92d..a0498e063f5 100644 --- a/manufacturing/doctype/production_order/production_order.py +++ b/manufacturing/doctype/production_order/production_order.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr, flt, now, nowdate from webnotes.model import db_exists from webnotes.model.doc import make_autoname -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json b/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json index 6af1e7775ce..1ff6817e217 100644 --- a/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json @@ -5,7 +5,6 @@ "To Date", "Filter based on item", "From Date", - "Raise Purchase Request", "Use Multi-Level BOM", "Download Materials Required", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty", @@ -16,7 +15,7 @@ "Select Sales Orders", "Pull sales orders (pending to deliver) based on the above criteria", "Create Production Orders", - "Purchase Request For Warehouse", + "Material Request For Warehouse", "Pull items from Sales Order mentioned in the above table.", "Production Planning Tool", "Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.", @@ -26,5 +25,6 @@ "Raise Production Order", "Production Plan Sales Orders", "Separate production order will be created for each finished good item.", - "Clear Table" + "Clear Table", + "Raise Material Request" ] \ No newline at end of file diff --git a/manufacturing/doctype/production_planning_tool/locale/ar-doc.json b/manufacturing/doctype/production_planning_tool/locale/ar-doc.json index 64f8c08cdfb..4005b01c58e 100644 --- a/manufacturing/doctype/production_planning_tool/locale/ar-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/ar-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "\u0625\u0630\u0627 \u0643\u0627\u0646\u062a \u0645\u062d\u062f\u062f\u0629\u060c \u0633\u064a\u0646\u0638\u0631 BOM \u0644\u0628\u0646\u0648\u062f \u0641\u0631\u0639\u064a\u0629 \u0627\u0644\u062c\u0645\u0639\u064a\u0629 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0627\u0644\u0645\u0648\u0627\u062f \u0627\u0644\u062e\u0627\u0645. \u062e\u0644\u0627\u0641 \u0630\u0644\u0643\u060c \u0633\u064a\u062a\u0645 \u0645\u0639\u0627\u0645\u0644\u0629 \u062c\u0645\u064a\u0639 \u0627\u0644\u0628\u0646\u0648\u062f \u0627\u0644\u0641\u0631\u0639\u064a\u0629 \u0627\u0644\u062c\u0645\u0639\u064a\u0629 \u0643\u0645\u0627\u062f\u0629 \u062e\u0627\u0645.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "\u0627\u0644\u0628\u0646\u0648\u062f \u0627\u0644\u062a\u064a \u064a\u0637\u0644\u0628 \u0645\u0646\u0647\u0627 "\u063a\u064a\u0631 \u0645\u062a\u0627\u062d" \u0627\u0644\u0646\u0638\u0631 \u0641\u064a \u062c\u0645\u064a\u0639 \u0627\u0644\u0645\u062e\u0627\u0632\u0646 \u0639\u0644\u0649 \u0623\u0633\u0627\u0633 \u0627\u0644\u0643\u0645\u064a\u0629 \u0627\u0644\u0645\u062a\u0648\u0642\u0639\u0629 \u0648\u0627\u0644\u062d\u062f \u0627\u0644\u0623\u062f\u0646\u0649 \u0627\u0644\u0643\u0645\u064a\u0629 \u062a\u0631\u062a\u064a\u0628", "Manufacturing": "\u062a\u0635\u0646\u064a\u0639", + "Material Request For Warehouse": "\u0637\u0644\u0628 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0627\u0644\u0645\u0648\u0627\u062f \u0645\u0633\u062a\u0648\u062f\u0639", "Materials Requirement Planning (MRP)": "\u0645\u0648\u0627\u062f \u0645\u062a\u0637\u0644\u0628\u0627\u062a \u0627\u0644\u062a\u062e\u0637\u064a\u0637 (MRP)", "Production Plan Items": "\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0625\u0646\u062a\u0627\u062c \u062e\u0637\u0629", "Production Plan Sales Orders": "\u062e\u0637\u0629 \u0627\u0644\u0625\u0646\u062a\u0627\u062c \u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "\u0633\u062d\u0628 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0645\u0646 \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0627\u0644\u0645\u0630\u0643\u0648\u0631\u0629 \u0641\u064a \u0627\u0644\u062c\u062f\u0648\u0644 \u0623\u0639\u0644\u0627\u0647.", "Pull sales orders (pending to deliver) based on the above criteria": "\u0633\u062d\u0628 \u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0628\u064a\u0639 (\u0641\u064a \u0627\u0646\u062a\u0638\u0627\u0631 \u0644\u062a\u0633\u0644\u064a\u0645) \u0628\u0646\u0627\u0621 \u0639\u0644\u0649 \u0627\u0644\u0645\u0639\u0627\u064a\u064a\u0631 \u0627\u0644\u0645\u0630\u0643\u0648\u0631\u0629 \u0623\u0639\u0644\u0627\u0647", "Purchase Request For Warehouse": "\u0634\u0631\u0627\u0621 \u0637\u0644\u0628 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0645\u0633\u062a\u0648\u062f\u0639", + "Raise Material Request": "\u0631\u0641\u0639 \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f", "Raise Production Order": "\u0631\u0641\u0639 \u0623\u0645\u0631 \u0627\u0644\u0625\u0646\u062a\u0627\u062c", "Raise Purchase Request": "\u0631\u0641\u0639 \u0637\u0644\u0628 \u0634\u0631\u0627\u0621", "Select Sales Orders": "\u062d\u062f\u062f \u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a", diff --git a/manufacturing/doctype/production_planning_tool/locale/es-doc.json b/manufacturing/doctype/production_planning_tool/locale/es-doc.json index a678e5656dc..adab9a9785a 100644 --- a/manufacturing/doctype/production_planning_tool/locale/es-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/es-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "Si se selecciona, la lista de materiales para los elementos de sub-ensamble ser\u00e1n considerados para obtener materias primas. De lo contrario, todos los elementos de montaje sub-ser\u00e1 tratada como una materia prima.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "Temas que han solicitado que son "Out of Stock" teniendo en cuenta todos los almacenes basados \u200b\u200ben Cantidad proyectada Cantidad pedido m\u00ednimo y", "Manufacturing": "Fabricaci\u00f3n", + "Material Request For Warehouse": "Material de Solicitud de Almac\u00e9n", "Materials Requirement Planning (MRP)": "Materiales planificaci\u00f3n de necesidades (MRP)", "Production Plan Items": "Elementos del Plan de Producci\u00f3n", "Production Plan Sales Orders": "Fabricaci\u00f3n Ventas pedidos Gu\u00eda", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "Tire de los art\u00edculos en \u00f3rdenes de venta mencionados en el cuadro anterior.", "Pull sales orders (pending to deliver) based on the above criteria": "Tire de \u00f3rdenes de venta (pendiente de entregar) sobre la base de los criterios anteriores", "Purchase Request For Warehouse": "Solicitud de compra para el almac\u00e9n", + "Raise Material Request": "Levante solicitar material", "Raise Production Order": "Levante orden de producci\u00f3n", "Raise Purchase Request": "Elevar solicitud de compra", "Select Sales Orders": "Seleccione \u00f3rdenes de venta", diff --git a/manufacturing/doctype/production_planning_tool/locale/fr-doc.json b/manufacturing/doctype/production_planning_tool/locale/fr-doc.json index 8fe9a13791e..3a1d40585b8 100644 --- a/manufacturing/doctype/production_planning_tool/locale/fr-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/fr-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "Si elle est coch\u00e9e, la nomenclature des sous-ensembles points seront examin\u00e9s pour obtenir des mati\u00e8res premi\u00e8res. Sinon, tous les \u00e9l\u00e9ments du sous-ensemble sera trait\u00e9e comme une mati\u00e8re premi\u00e8re.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "Articles \u00e0 \u00eatre demand\u00e9s, qui sont "Out of Stock" compte tenu de tous les entrep\u00f4ts bas\u00e9s sur quantit\u00e9 projet\u00e9e et qt\u00e9 minimum", "Manufacturing": "Fabrication", + "Material Request For Warehouse": "Demande de mat\u00e9riel pour l'entrep\u00f4t", "Materials Requirement Planning (MRP)": "Planification des besoins mati\u00e8res (MRP)", "Production Plan Items": "\u00c9l\u00e9ments du plan de production", "Production Plan Sales Orders": "Vente Plan d'ordres de production", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "Tirez articles de Commande mentionn\u00e9 dans le tableau ci-dessus.", "Pull sales orders (pending to deliver) based on the above criteria": "Tirez les ordres de vente (en attendant de livrer) sur la base des crit\u00e8res ci-dessus", "Purchase Request For Warehouse": "Demande d'achat pour l'entrep\u00f4t", + "Raise Material Request": "Soulever la Demande de Mat\u00e9riel", "Raise Production Order": "Soulever des ordres de fabrication", "Raise Purchase Request": "Soulever la demande d'achat", "Select Sales Orders": "S\u00e9lectionnez les commandes clients", diff --git a/manufacturing/doctype/production_planning_tool/locale/hi-doc.json b/manufacturing/doctype/production_planning_tool/locale/hi-doc.json index 10932296891..475615fedbc 100644 --- a/manufacturing/doctype/production_planning_tool/locale/hi-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/hi-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "\u0905\u0917\u0930 \u091a\u0947\u0915\u094d\u0921 \u0909\u092a \u0935\u093f\u0927\u093e\u0928\u0938\u092d\u093e \u0906\u0907\u091f\u092e \u0915\u0947 \u0932\u093f\u090f \u092c\u0940\u0913\u090f\u092e \u0915\u091a\u094d\u091a\u0947 \u092e\u093e\u0932 \u092a\u094d\u0930\u093e\u092a\u094d\u0924 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0935\u093f\u091a\u093e\u0930 \u0915\u093f\u092f\u093e \u091c\u093e\u090f\u0917\u093e. \u0905\u0928\u094d\u092f\u0925\u093e, \u0938\u092d\u0940 \u0909\u092a \u0935\u093f\u0927\u093e\u0928\u0938\u092d\u093e \u0935\u0938\u094d\u0924\u0941\u0913\u0902 \u090f\u0915 \u0915\u091a\u094d\u091a\u0947 \u092e\u093e\u0932 \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u0907\u0932\u093e\u091c \u0915\u093f\u092f\u093e \u091c\u093e\u090f\u0917\u093e.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "\u0905\u0928\u0941\u092e\u093e\u0928\u093f\u0924 \u092e\u093e\u0924\u094d\u0930\u093e \u0914\u0930 \u0928\u094d\u092f\u0942\u0928\u0924\u092e \u0906\u0926\u0947\u0936 \u092e\u093e\u0924\u094d\u0930\u093e \u0915\u0947 \u0906\u0927\u093e\u0930 \u092a\u0930 \u0938\u092d\u0940 \u0917\u094b\u0926\u093e\u092e\u094b\u0902 \u092a\u0930 \u0935\u093f\u091a\u093e\u0930 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093f\u092f\u093e \u091c\u093e \u0906\u0907\u091f\u092e \u091c\u094b "\u0938\u094d\u091f\u0949\u0915 \u0938\u0947 \u092c\u093e\u0939\u0930 \u0915\u0930 \u0930\u0939\u0947 \u0939\u0948\u0902"", "Manufacturing": "\u0935\u093f\u0928\u093f\u0930\u094d\u092e\u093e\u0923", + "Material Request For Warehouse": "\u0935\u0947\u092f\u0930\u0939\u093e\u0909\u0938 \u0915\u0947 \u0932\u093f\u090f \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u093e \u0905\u0928\u0941\u0930\u094b\u0927", "Materials Requirement Planning (MRP)": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0906\u0935\u0936\u094d\u092f\u0915\u0924\u093e\u090f\u0901 \u092f\u094b\u091c\u0928\u093e (\u090f\u092e\u0906\u0930\u092a\u0940)", "Production Plan Items": "\u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u092f\u094b\u091c\u0928\u093e \u0906\u0907\u091f\u092e", "Production Plan Sales Orders": "\u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u092f\u094b\u091c\u0928\u093e \u0935\u093f\u0915\u094d\u0930\u092f \u0906\u0926\u0947\u0936", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "\u0909\u092a\u0930\u094b\u0915\u094d\u0924 \u0924\u093e\u0932\u093f\u0915\u093e \u092e\u0947\u0902 \u0909\u0932\u094d\u0932\u093f\u0916\u093f\u0924 \u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0938\u0947 \u0906\u0907\u091f\u092e \u0916\u0940\u0902\u091a\u094b.", "Pull sales orders (pending to deliver) based on the above criteria": "\u0909\u092a\u0930\u094b\u0915\u094d\u0924 \u092e\u093e\u0928\u0926\u0902\u0921\u094b\u0902 \u0915\u0947 \u0906\u0927\u093e\u0930 \u092a\u0930 \u092c\u093f\u0915\u094d\u0930\u0940 \u0915\u0947 \u0906\u0926\u0947\u0936 (\u0935\u093f\u0924\u0930\u093f\u0924 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0932\u0902\u092c\u093f\u0924) \u0916\u0940\u0902\u091a\u094b", "Purchase Request For Warehouse": "\u0916\u0930\u0940\u0926 \u0917\u094b\u0926\u093e\u092e \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927", + "Raise Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0909\u0920\u093e\u090f\u0901", "Raise Production Order": "\u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u0915\u093e \u0906\u0926\u0947\u0936 \u0909\u0920\u093e\u090f\u0901", "Raise Purchase Request": "\u0916\u0930\u0940\u0926 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u0909\u0920\u093e\u090f\u0901", "Select Sales Orders": "\u0935\u093f\u0915\u094d\u0930\u092f \u0906\u0926\u0947\u0936 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", diff --git a/manufacturing/doctype/production_planning_tool/locale/hr-doc.json b/manufacturing/doctype/production_planning_tool/locale/hr-doc.json index e7ab56f6f4a..3847fa8f383 100644 --- a/manufacturing/doctype/production_planning_tool/locale/hr-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/hr-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "Ako je ozna\u010deno, BOM za pod-zbor stavke \u0107e biti uzeti u obzir za dobivanje sirovine. Ina\u010de, sve pod-monta\u017ea stavke \u0107e biti tretirani kao sirovinu.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "Proizvodi se tra\u017ei \u0161to su "Out of Stock" s obzirom na sve skladi\u0161ta na temelju projicirane Qty i minimalne narud\u017ebe Kol", "Manufacturing": "Proizvodnja", + "Material Request For Warehouse": "Materijal Zahtjev za galeriju", "Materials Requirement Planning (MRP)": "Materijali Zahtjev za planiranje (MRP)", "Production Plan Items": "Plan proizvodnje Proizvodi", "Production Plan Sales Orders": "Plan proizvodnje narud\u017ebe", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "Povucite stavke iz prodaje Reda navedene u gornjoj tablici.", "Pull sales orders (pending to deliver) based on the above criteria": "Povucite prodajne naloge (na \u010dekanju za isporuku) na temelju navedenih kriterija", "Purchase Request For Warehouse": "Kupnja Zahtjev za galeriju", + "Raise Material Request": "Podignite Materijal Zahtjev", "Raise Production Order": "Podignite proizvodnom nalogu", "Raise Purchase Request": "Podignite zahtjev za kupnju", "Select Sales Orders": "Odaberite narud\u017ebe", diff --git a/manufacturing/doctype/production_planning_tool/locale/nl-doc.json b/manufacturing/doctype/production_planning_tool/locale/nl-doc.json index 7d78a669697..f1d04f9d210 100644 --- a/manufacturing/doctype/production_planning_tool/locale/nl-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/nl-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "Indien aangevinkt, zal BOM voor sub-assemblage zaken geacht voor het krijgen van grondstoffen. Anders zullen alle subeenheid items worden behandeld als een grondstof.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "Items worden aangevraagd die "Niet op voorraad" rekening houdend met alle magazijnen op basis van verwachte aantal en minimale bestelling qty", "Manufacturing": "Productie", + "Material Request For Warehouse": "Materiaal Request For Warehouse", "Materials Requirement Planning (MRP)": "Materials Requirement Planning (MRP)", "Production Plan Items": "Productie Plan Items", "Production Plan Sales Orders": "Productie Plan Verkooporders", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "Trek items van Verkooporder vermeld in de bovenstaande tabel.", "Pull sales orders (pending to deliver) based on the above criteria": "Trek verkooporders (in afwachting van te leveren) op basis van de bovengenoemde criteria", "Purchase Request For Warehouse": "Koop Request For Warehouse", + "Raise Material Request": "Raise Materiaal aanvragen", "Raise Production Order": "Raise Productieorder", "Raise Purchase Request": "Raise Purchase Request", "Select Sales Orders": "Selecteer Verkooporders", diff --git a/manufacturing/doctype/production_planning_tool/locale/pt-doc.json b/manufacturing/doctype/production_planning_tool/locale/pt-doc.json index 665cbcb6d60..75f6d1dfa7c 100644 --- a/manufacturing/doctype/production_planning_tool/locale/pt-doc.json +++ b/manufacturing/doctype/production_planning_tool/locale/pt-doc.json @@ -13,6 +13,7 @@ "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.": "Se selecionado, o BOM para a sub-montagem itens ser\u00e3o considerados para obter mat\u00e9rias-primas. Caso contr\u00e1rio, todos os itens de sub-montagem vai ser tratado como uma mat\u00e9ria-prima.", "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty": "Os itens a serem solicitados que est\u00e3o "fora de estoque", considerando todos os armaz\u00e9ns com base no qty projetada e qty m\u00ednimo", "Manufacturing": "Fabrico", + "Material Request For Warehouse": "Pedido de material para Armaz\u00e9m", "Materials Requirement Planning (MRP)": "Materiais Requirement Planning (MRP)", "Production Plan Items": "Plano de itens de produ\u00e7\u00e3o", "Production Plan Sales Orders": "Vendas de produ\u00e7\u00e3o do Plano de Ordens", @@ -20,6 +21,7 @@ "Pull items from Sales Order mentioned in the above table.": "Puxe itens da Ordem de Vendas mencionado na tabela acima.", "Pull sales orders (pending to deliver) based on the above criteria": "Puxe pedidos de vendas pendentes (de entregar) com base nos crit\u00e9rios acima", "Purchase Request For Warehouse": "Pedidos de compra do Armaz\u00e9m", + "Raise Material Request": "Levante solicitar material", "Raise Production Order": "Levante Ordem de Produ\u00e7\u00e3o", "Raise Purchase Request": "Levante Pedido de Compra", "Select Sales Orders": "Selecione Pedidos de Vendas", diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/manufacturing/doctype/production_planning_tool/production_planning_tool.py index a6c8458f3f0..1686478f645 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt, cint, nowdate, add_days from webnotes.model.doc import addchild, Document -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint @@ -301,11 +301,11 @@ class DocType: def raise_purchase_request(self): """ - Raise Purchase Request if projected qty is less than qty required + Raise Material Request if projected qty is less than qty required Requested qty should be shortage qty considering minimum order qty """ if not self.doc.purchase_request_for_warehouse: - webnotes.msgprint("Please enter Warehouse for which Purchase Request will be raised", + webnotes.msgprint("Please enter Warehouse for which Material Request will be raised", raise_exception=1) bom_dict = self.get_distinct_items_and_boms()[0] @@ -339,10 +339,10 @@ class DocType: purchase_request_list = [] if items_to_be_requested: for item in items_to_be_requested: - item_wrapper = webnotes.model_wrapper("Item", item) + item_wrapper = webnotes.bean("Item", item) pr_doclist = [ { - "doctype": "Purchase Request", + "doctype": "Material Request", "__islocal": 1, "naming_series": "IDT", "transaction_date": nowdate(), @@ -350,10 +350,11 @@ class DocType: "company": self.doc.company, "fiscal_year": fiscal_year, "requested_by": webnotes.session.user, - "remark": "Automatically raised from Production Planning Tool" + "remark": "Automatically raised from Production Planning Tool", + "material_request_type": "Purchase" }, { - "doctype": "Purchase Request Item", + "doctype": "Material Request Item", "__islocal": 1, "parentfield": "indent_details", "item_code": item, @@ -367,15 +368,15 @@ class DocType: "warehouse": self.doc.purchase_request_for_warehouse } ] - pr_wrapper = webnotes.model_wrapper(pr_doclist) + pr_wrapper = webnotes.bean(pr_doclist) pr_wrapper.ignore_permissions = 1 pr_wrapper.submit() purchase_request_list.append(pr_wrapper.doc.name) if purchase_request_list: - pur_req = ["""%s""" % \ + pur_req = ["""%s""" % \ (p, p) for p in purchase_request_list] - webnotes.msgprint("Following Purchase Request created successfully: \n%s" % + webnotes.msgprint("Following Material Request created successfully: \n%s" % "\n".join(pur_req)) else: webnotes.msgprint("Nothing to request") \ No newline at end of file diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt index dc1eb513996..4b37f9849d5 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt @@ -1,97 +1,97 @@ [ { - "owner": "jai@webnotestech.com", + "creation": "2013-01-21 12:03:47", "docstatus": 0, - "creation": "2013-01-19 10:23:35", + "modified": "2013-02-18 13:43:26", "modified_by": "Administrator", - "modified": "2013-01-19 10:55:55" + "owner": "jai@webnotestech.com" }, { - "read_only": 1, - "issingle": 1, - "in_create": 1, "default_print_format": "Standard", "doctype": "DocType", + "in_create": 1, + "issingle": 1, "module": "Manufacturing", - "name": "__common__" + "name": "__common__", + "read_only": 1 }, { - "name": "__common__", - "parent": "Production Planning Tool", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Production Planning Tool", - "read": 1, - "create": 1, - "submit": 0, - "doctype": "DocPerm", - "write": 1, + "parentfield": "fields", "parenttype": "DocType", - "report": 0, - "permlevel": 0, - "parentfield": "permissions" + "permlevel": 0 }, { - "name": "Production Planning Tool", - "doctype": "DocType" + "create": 1, + "doctype": "DocPerm", + "name": "__common__", + "parent": "Production Planning Tool", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "report": 0, + "submit": 0, + "write": 1 + }, + { + "doctype": "DocType", + "name": "Production Planning Tool" }, { "description": "Select Sales Orders from which you want to create Production Orders.", "doctype": "DocField", - "label": "Select Sales Orders", "fieldname": "select_sales_orders", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Select Sales Orders" }, { "doctype": "DocField", - "width": "50%", "fieldname": "column_break0", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "doctype": "DocField", - "label": "Filter based on item", "fieldname": "fg_item", "fieldtype": "Link", + "label": "Filter based on item", "options": "Item" }, { "doctype": "DocField", - "label": "Filter based on customer", "fieldname": "customer", "fieldtype": "Link", + "label": "Filter based on customer", "options": "Customer" }, { "doctype": "DocField", - "label": "Company", "fieldname": "company", "fieldtype": "Link", - "reqd": 1, - "options": "Company" + "label": "Company", + "options": "Company", + "reqd": 1 }, { "doctype": "DocField", - "width": "50%", "fieldname": "column_break1", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "doctype": "DocField", - "label": "From Date", "fieldname": "from_date", - "fieldtype": "Date" + "fieldtype": "Date", + "label": "From Date" }, { "doctype": "DocField", - "label": "To Date", "fieldname": "to_date", - "fieldtype": "Date" + "fieldtype": "Date", + "label": "To Date" }, { "doctype": "DocField", @@ -102,52 +102,52 @@ { "description": "Pull sales orders (pending to deliver) based on the above criteria", "doctype": "DocField", - "label": "Get Sales Orders", "fieldname": "get_sales_orders", "fieldtype": "Button", + "label": "Get Sales Orders", "options": "get_open_sales_orders" }, { "doctype": "DocField", - "label": "Production Plan Sales Orders", "fieldname": "pp_so_details", "fieldtype": "Table", + "label": "Production Plan Sales Orders", "options": "Production Plan Sales Order" }, { "doctype": "DocField", - "label": "Clear Table", "fieldname": "clear_so_table", "fieldtype": "Button", + "label": "Clear Table", "options": "clear_so_table" }, { "description": "Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.", "doctype": "DocField", - "label": "Create Production Orders", "fieldname": "create_production_orders", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Create Production Orders" }, { "description": "Pull items from Sales Order mentioned in the above table.", "doctype": "DocField", - "label": "Get Items", "fieldname": "get_items_from_so", "fieldtype": "Button", + "label": "Get Items", "options": "get_items_from_so" }, { "doctype": "DocField", - "label": "Production Plan Items", "fieldname": "pp_details", "fieldtype": "Table", + "label": "Production Plan Items", "options": "Production Plan Item" }, { "doctype": "DocField", - "label": "Clear Table", "fieldname": "clear_item_table", "fieldtype": "Button", + "label": "Clear Table", "options": "clear_item_table" }, { @@ -157,72 +157,72 @@ "options": "Simple" }, { - "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", "default": "1", + "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", "doctype": "DocField", - "label": "Use Multi-Level BOM", "fieldname": "use_multi_level_bom", "fieldtype": "Check", + "label": "Use Multi-Level BOM", "reqd": 0 }, { "doctype": "DocField", - "width": "50%", "fieldname": "cb5", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "description": "Separate production order will be created for each finished good item.", "doctype": "DocField", - "label": "Raise Production Order", "fieldname": "raise_production_order", "fieldtype": "Button", + "label": "Raise Production Order", "options": "raise_production_order" }, { "doctype": "DocField", - "label": "Materials Requirement Planning (MRP)", "fieldname": "sb5", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Materials Requirement Planning (MRP)" }, { "description": "Download a report containing all raw materials with their latest inventory status", "doctype": "DocField", - "label": "Download Materials Required", "fieldname": "download_materials_required", - "fieldtype": "Button" + "fieldtype": "Button", + "label": "Download Materials Required" }, { "doctype": "DocField", - "width": "50%", "fieldname": "column_break6", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "doctype": "DocField", - "label": "Purchase Request For Warehouse", "fieldname": "purchase_request_for_warehouse", "fieldtype": "Link", + "label": "Material Request For Warehouse", "options": "Warehouse" }, { "description": "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty", "doctype": "DocField", - "label": "Raise Purchase Request", "fieldname": "raise_purchase_request", "fieldtype": "Button", + "label": "Raise Material Request", "options": "raise_purchase_request" }, { - "role": "System Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "System Manager" }, { - "role": "Manufacturing User", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "Manufacturing User" }, { - "role": "Manufacturing Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "Manufacturing Manager" } ] \ No newline at end of file diff --git a/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json b/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json index 0739e79b98e..eab278c5bda 100644 --- a/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json @@ -6,6 +6,7 @@ "Update Delivery Date", "To Date", "From Date", + "Entries", "Sales Order", "Territory", "Update Sales Order" diff --git a/manufacturing/doctype/update_delivery_date/locale/ar-doc.json b/manufacturing/doctype/update_delivery_date/locale/ar-doc.json index a07eb42ede5..328880a76cf 100644 --- a/manufacturing/doctype/update_delivery_date/locale/ar-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/ar-doc.json @@ -1,6 +1,7 @@ { "Company": "\u0634\u0631\u0643\u0629", "Customer": "\u0632\u0628\u0648\u0646", + "Entries": "\u0645\u0642\u0627\u0644\u0627\u062a", "From Date": "\u0645\u0646 \u062a\u0627\u0631\u064a\u062e", "Get Open Sales Order": "\u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0641\u062a\u062d \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a", "Manufacturing": "\u062a\u0635\u0646\u064a\u0639", diff --git a/manufacturing/doctype/update_delivery_date/locale/es-doc.json b/manufacturing/doctype/update_delivery_date/locale/es-doc.json index d2b40a6c814..70ef66549a7 100644 --- a/manufacturing/doctype/update_delivery_date/locale/es-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/es-doc.json @@ -1,6 +1,7 @@ { "Company": "Empresa", "Customer": "Cliente", + "Entries": "Comentarios", "From Date": "Desde la fecha", "Get Open Sales Order": "Recibe \u00f3rdenes de venta abierto", "Manufacturing": "Fabricaci\u00f3n", diff --git a/manufacturing/doctype/update_delivery_date/locale/fr-doc.json b/manufacturing/doctype/update_delivery_date/locale/fr-doc.json index c8754d85879..1a23a866d25 100644 --- a/manufacturing/doctype/update_delivery_date/locale/fr-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/fr-doc.json @@ -1,6 +1,7 @@ { "Company": "Entreprise", "Customer": "Client", + "Entries": "Entr\u00e9es", "From Date": "Partir de la date", "Get Open Sales Order": "Obtenez Ouvrir Commande", "Manufacturing": "Fabrication", diff --git a/manufacturing/doctype/update_delivery_date/locale/hi-doc.json b/manufacturing/doctype/update_delivery_date/locale/hi-doc.json index 939cd375a24..bb6474cad59 100644 --- a/manufacturing/doctype/update_delivery_date/locale/hi-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/hi-doc.json @@ -1,6 +1,7 @@ { "Company": "\u0915\u0902\u092a\u0928\u0940", "Customer": "\u0917\u094d\u0930\u093e\u0939\u0915", + "Entries": "\u092a\u094d\u0930\u0935\u093f\u0937\u094d\u091f\u093f\u092f\u093e\u0902", "From Date": "\u0926\u093f\u0928\u093e\u0902\u0915 \u0938\u0947", "Get Open Sales Order": "\u0913\u092a\u0928 \u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936", "Manufacturing": "\u0935\u093f\u0928\u093f\u0930\u094d\u092e\u093e\u0923", diff --git a/manufacturing/doctype/update_delivery_date/locale/hr-doc.json b/manufacturing/doctype/update_delivery_date/locale/hr-doc.json index 2c457b6f6ed..06ff481dd7f 100644 --- a/manufacturing/doctype/update_delivery_date/locale/hr-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/hr-doc.json @@ -1,6 +1,7 @@ { "Company": "Dru\u0161tvo", "Customer": "Kupac", + "Entries": "Prijave", "From Date": "Od datuma", "Get Open Sales Order": "Nabavite Otvori prodajnog naloga", "Manufacturing": "Proizvodnja", diff --git a/manufacturing/doctype/update_delivery_date/locale/nl-doc.json b/manufacturing/doctype/update_delivery_date/locale/nl-doc.json index 950755c6451..179809ace2d 100644 --- a/manufacturing/doctype/update_delivery_date/locale/nl-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/nl-doc.json @@ -1,6 +1,7 @@ { "Company": "Vennootschap", "Customer": "Klant", + "Entries": "Inzendingen", "From Date": "Van Datum", "Get Open Sales Order": "Get Open Verkooporder", "Manufacturing": "Productie", diff --git a/manufacturing/doctype/update_delivery_date/locale/pt-doc.json b/manufacturing/doctype/update_delivery_date/locale/pt-doc.json index ffd314f2b85..09ed52bf068 100644 --- a/manufacturing/doctype/update_delivery_date/locale/pt-doc.json +++ b/manufacturing/doctype/update_delivery_date/locale/pt-doc.json @@ -1,6 +1,7 @@ { "Company": "Companhia", "Customer": "Cliente", + "Entries": "Entradas", "From Date": "A partir da data", "Get Open Sales Order": "Obter Ordem de vendas Abrir", "Manufacturing": "Fabrico", diff --git a/manufacturing/doctype/workstation/workstation.py b/manufacturing/doctype/workstation/workstation.py index 1609f6df52a..96f694bbd5e 100644 --- a/manufacturing/doctype/workstation/workstation.py +++ b/manufacturing/doctype/workstation/workstation.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import flt from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/manufacturing/page/manufacturing_home/locale/_messages_js.json b/manufacturing/page/manufacturing_home/locale/_messages_js.json index 639dfc3fdeb..e7a437b2147 100644 --- a/manufacturing/page/manufacturing_home/locale/_messages_js.json +++ b/manufacturing/page/manufacturing_home/locale/_messages_js.json @@ -1,11 +1,11 @@ [ - "Generate Purchase Requests (MRP) and Production Orders.", + "BOM Replace Tool", "Production Order", "Masters", "Documents", "Bill of Materials (BOM)", - "BOM Replace Tool", "Orders released for production.", + "Generate Material Requests (MRP) and Production Orders.", "Production Planning (MRP)", "Where manufacturing operations are carried out.", "Item", diff --git a/manufacturing/page/manufacturing_home/locale/ar-js.json b/manufacturing/page/manufacturing_home/locale/ar-js.json index 3319c903e4e..05a57643fc5 100644 --- a/manufacturing/page/manufacturing_home/locale/ar-js.json +++ b/manufacturing/page/manufacturing_home/locale/ar-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "\u0641\u0627\u062a\u0648\u0631\u0629 \u0627\u0644\u0645\u0648\u0627\u062f", "Bill of Materials (BOM)": "\u0645\u0634\u0631\u0648\u0639 \u0627\u0644\u0642\u0627\u0646\u0648\u0646 \u0627\u0644\u0645\u0648\u0627\u062f (BOM)", "Documents": "\u0648\u062b\u0627\u0626\u0642", + "Generate Material Requests (MRP) and Production Orders.": "\u0625\u0646\u0634\u0627\u0621 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0645\u0648\u0627\u062f (MRP) \u0648\u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0625\u0646\u062a\u0627\u062c.", "Generate Purchase Requests (MRP) and Production Orders.": "\u0625\u0646\u0634\u0627\u0621 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 (MRP) \u0648\u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0625\u0646\u062a\u0627\u062c.", "Item": "\u0628\u0646\u062f", "Masters": "\u0627\u0644\u0645\u0627\u062c\u0633\u062a\u064a\u0631", diff --git a/manufacturing/page/manufacturing_home/locale/es-js.json b/manufacturing/page/manufacturing_home/locale/es-js.json index a5ee59d874c..7122ee78c7c 100644 --- a/manufacturing/page/manufacturing_home/locale/es-js.json +++ b/manufacturing/page/manufacturing_home/locale/es-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "Lista de materiales", "Bill of Materials (BOM)": "Lista de Materiales (BOM)", "Documents": "Documentos", + "Generate Material Requests (MRP) and Production Orders.": "Generar solicitudes de material (MRP) y \u00d3rdenes de Producci\u00f3n.", "Generate Purchase Requests (MRP) and Production Orders.": "Generar Ordenes de Compra (MRP) y \u00d3rdenes de Producci\u00f3n.", "Item": "Art\u00edculo", "Masters": "Masters", diff --git a/manufacturing/page/manufacturing_home/locale/fr-js.json b/manufacturing/page/manufacturing_home/locale/fr-js.json index 774f1feae4a..6457926f00e 100644 --- a/manufacturing/page/manufacturing_home/locale/fr-js.json +++ b/manufacturing/page/manufacturing_home/locale/fr-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "Bill of Materials", "Bill of Materials (BOM)": "Nomenclature (BOM)", "Documents": "Documents", + "Generate Material Requests (MRP) and Production Orders.": "Lieu \u00e0 des demandes de mat\u00e9riel (MRP) et de la proc\u00e9dure de production.", "Generate Purchase Requests (MRP) and Production Orders.": "G\u00e9n\u00e9rer Demande d'Achat (MRP) et de la proc\u00e9dure de production.", "Item": "Article", "Masters": "Ma\u00eetres", diff --git a/manufacturing/page/manufacturing_home/locale/hi-js.json b/manufacturing/page/manufacturing_home/locale/hi-js.json index 72bccb7e713..a755820eb9c 100644 --- a/manufacturing/page/manufacturing_home/locale/hi-js.json +++ b/manufacturing/page/manufacturing_home/locale/hi-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u092c\u093f\u0932", "Bill of Materials (BOM)": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u092c\u093f\u0932 (\u092c\u0940\u0913\u090f\u092e)", "Documents": "\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c", + "Generate Material Requests (MRP) and Production Orders.": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 (\u090f\u092e\u0906\u0930\u092a\u0940) \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u0914\u0930 \u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u0915\u0947 \u0906\u0926\u0947\u0936 \u0909\u0924\u094d\u092a\u0928\u094d\u0928.", "Generate Purchase Requests (MRP) and Production Orders.": "\u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 (\u090f\u092e\u0906\u0930\u092a\u0940) \u0914\u0930 \u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u0915\u0947 \u0906\u0926\u0947\u0936 \u0909\u0924\u094d\u092a\u0928\u094d\u0928.", "Item": "\u092e\u0926", "Masters": "\u0938\u094d\u0928\u093e\u0924\u0915\u094b\u0924\u094d\u0924\u0930", diff --git a/manufacturing/page/manufacturing_home/locale/hr-js.json b/manufacturing/page/manufacturing_home/locale/hr-js.json index 43757035218..7184c4f19be 100644 --- a/manufacturing/page/manufacturing_home/locale/hr-js.json +++ b/manufacturing/page/manufacturing_home/locale/hr-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "Bill materijala", "Bill of Materials (BOM)": "Bill materijala (BOM)", "Documents": "Dokumenti", + "Generate Material Requests (MRP) and Production Orders.": "Generirajte Materijal Upiti (MRP) i radne naloge.", "Generate Purchase Requests (MRP) and Production Orders.": "Generirajte Kupnja Upiti (MRP) i radne naloge.", "Item": "Stavka", "Masters": "Majstori", diff --git a/manufacturing/page/manufacturing_home/locale/nl-js.json b/manufacturing/page/manufacturing_home/locale/nl-js.json index 95b2db761a4..1fe0f483033 100644 --- a/manufacturing/page/manufacturing_home/locale/nl-js.json +++ b/manufacturing/page/manufacturing_home/locale/nl-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "Bill of Materials", "Bill of Materials (BOM)": "Bill of Materials (BOM)", "Documents": "Documenten", + "Generate Material Requests (MRP) and Production Orders.": "Genereer Materiaal Requests (MRP) en productieorders.", "Generate Purchase Requests (MRP) and Production Orders.": "Genereer inkoopaanvragen (MRP) en productieorders.", "Item": "Item", "Masters": "Masters", diff --git a/manufacturing/page/manufacturing_home/locale/pt-js.json b/manufacturing/page/manufacturing_home/locale/pt-js.json index 7b0609e064d..4773ac649a5 100644 --- a/manufacturing/page/manufacturing_home/locale/pt-js.json +++ b/manufacturing/page/manufacturing_home/locale/pt-js.json @@ -4,6 +4,7 @@ "Bill of Materials": "Lista de Materiais", "Bill of Materials (BOM)": "Lista de Materiais (BOM)", "Documents": "Documentos", + "Generate Material Requests (MRP) and Production Orders.": "Gerar Pedidos de Materiais (MRP) e ordens de produ\u00e7\u00e3o.", "Generate Purchase Requests (MRP) and Production Orders.": "Gerar pedidos de compra (MRP) e ordens de produ\u00e7\u00e3o.", "Item": "Item", "Masters": "Mestres", diff --git a/manufacturing/page/manufacturing_home/manufacturing_home.js b/manufacturing/page/manufacturing_home/manufacturing_home.js index cb4222b367b..b7f28edc411 100644 --- a/manufacturing/page/manufacturing_home/manufacturing_home.js +++ b/manufacturing/page/manufacturing_home/manufacturing_home.js @@ -20,7 +20,7 @@ wn.module_page["Manufacturing"] = [ { "route":"Form/Production Planning Tool/Production Planning Tool", "label":wn._("Production Planning Tool"), - "description":wn._("Generate Purchase Requests (MRP) and Production Orders."), + "description":wn._("Generate Material Requests (MRP) and Production Orders."), doctype: "Production Planning Tool" }, ] diff --git a/patches/august_2012/changed_blog_date_format.py b/patches/august_2012/changed_blog_date_format.py index f44dc38ea3b..df51977be5d 100644 --- a/patches/august_2012/changed_blog_date_format.py +++ b/patches/august_2012/changed_blog_date_format.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals def execute(): import webnotes - from webnotes.model.wrapper import ModelWrapper - ModelWrapper("Website Settings", "Website Settings").save() \ No newline at end of file + from webnotes.model.bean import Bean + Bean("Website Settings", "Website Settings").save() \ No newline at end of file diff --git a/patches/december_2012/expense_leave_reload.py b/patches/december_2012/expense_leave_reload.py index 06c67e6993a..867a7956c6e 100644 --- a/patches/december_2012/expense_leave_reload.py +++ b/patches/december_2012/expense_leave_reload.py @@ -4,10 +4,10 @@ def execute(): # new roles roles = [r[0] for r in webnotes.conn.sql("""select name from tabRole""")] if not "Leave Approver" in roles: - webnotes.model_wrapper([{"doctype":"Role", "role_name":"Leave Approver", + webnotes.bean([{"doctype":"Role", "role_name":"Leave Approver", "__islocal":1, "module":"HR"}]).save() if not "Expense Approver" in roles: - webnotes.model_wrapper([{"doctype":"Role", "role_name":"Expense Approver", + webnotes.bean([{"doctype":"Role", "role_name":"Expense Approver", "__islocal":1, "module":"HR"}]).save() # reload diff --git a/patches/february_2013/fix_outstanding.py b/patches/february_2013/fix_outstanding.py index 07ea51a695c..22a6ee17400 100644 --- a/patches/february_2013/fix_outstanding.py +++ b/patches/february_2013/fix_outstanding.py @@ -1,15 +1,24 @@ def execute(): import webnotes from webnotes.utils import flt - for dt in ["Sales Invoice", "Purchase Invoice"]: - records = webnotes.conn.sql("""select name, outstanding_amount from `tab%s` - where docstatus = 1""" % dt) - for r in records: - outstanding = webnotes.conn.sql(""" - select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) from `tabGL Entry` - where against_voucher = %s and against_voucher_type = %s - and ifnull(is_cancelled, 'No') = 'No'""", (r[0], dt)) - if flt(r[1]) != abs(flt(outstanding[0][0])): - # print r, outstanding - webnotes.conn.sql("update `tab%s` set outstanding_amount = %s where name = %s" % - (dt, '%s', '%s'), (abs(flt(outstanding[0][0])), r[0])) \ No newline at end of file + records = webnotes.conn.sql(""" + select against_voucher_type, against_voucher, + sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) as outstanding from `tabGL Entry` + where ifnull(is_cancelled, 'No') = 'No' + and against_voucher_type in ("Sales Invoice", "Purchase Invoice") + and ifnull(against_voucher, '') != '' + group by against_voucher_type, against_voucher""", as_dict=1) + for r in records: + outstanding = webnotes.conn.sql("""select name, outstanding_amount from `tab%s` + where name = %s and docstatus = 1""" % + (r["against_voucher_type"], '%s'), (r["against_voucher"])) + + if outstanding and abs(flt(r["outstanding"])) != flt(outstanding[0][1]): + if ((r["against_voucher_type"]=='Sales Invoice' and flt(r["outstanding"]) >= 0) \ + or (r["against_voucher_type"]=="Purchase Invoice" and flt(["outstanding"]) <= 0)): + webnotes.conn.set_value(r["against_voucher_type"], r["against_voucher"], + "outstanding_amount", abs(flt(r["outstanding"]))) + else: + print r["against_voucher_type"], r["against_voucher"], \ + outstanding[0][1], abs(flt(r["outstanding"])) + \ No newline at end of file diff --git a/patches/february_2013/gle_floating_point_issue_revisited.py b/patches/february_2013/gle_floating_point_issue_revisited.py index 3fc57bd4e59..e407d5080ea 100644 --- a/patches/february_2013/gle_floating_point_issue_revisited.py +++ b/patches/february_2013/gle_floating_point_issue_revisited.py @@ -13,7 +13,7 @@ def execute(): diff = round((flt(r.grand_total) - flt(gle[0]['debit'])), 2) if abs(diff) == 0.01: - # print r.name, r.grand_total, gle[0]['debit'] + # print r.name, r.grand_total, gle[0]['debit'], diff webnotes.conn.sql("""update `tabGL Entry` set debit = debit + %s where name = %s""", (diff, gle[0]['name'])) diff --git a/patches/february_2013/p03_material_request.py b/patches/february_2013/p03_material_request.py new file mode 100644 index 00000000000..612c1084a3b --- /dev/null +++ b/patches/february_2013/p03_material_request.py @@ -0,0 +1,22 @@ +import webnotes, os, sys + +def execute(): + webnotes.reload_doc("core", "doctype", "doctype") + + webnotes.rename_doc("DocType", "Purchase Request Item", "Material Request Item", force=True) + webnotes.rename_doc("DocType", "Purchase Request", "Material Request", force=True) + webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_bill") + webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_receive") + + webnotes.reload_doc("stock", "doctype", "material_request") + webnotes.reload_doc("stock", "doctype", "material_request_item") + + webnotes.conn.sql("""update `tabMaterial Request` set material_request_type='Purchase'""") + + os.system("rm -rf app/buying/doctype/purchase_request") + os.system("rm -rf app/buying/doctype/purchase_request_item") + + os.system("rm -rf app/hr/doctype/holiday_block_list") + os.system("rm -rf app/hr/doctype/holiday_block_list_allow") + os.system("rm -rf app/hr/doctype/holiday_block_list_date") + \ No newline at end of file diff --git a/patches/february_2013/p04_remove_old_doctypes.py b/patches/february_2013/p04_remove_old_doctypes.py new file mode 100644 index 00000000000..7e7ebf519b8 --- /dev/null +++ b/patches/february_2013/p04_remove_old_doctypes.py @@ -0,0 +1,10 @@ +import webnotes, os + +def execute(): + webnotes.delete_doc("DocType", "Product") + webnotes.delete_doc("DocType", "Test") + webnotes.delete_doc("Module Def", "Test") + + os.system("rm -rf app/test") + os.system("rm -rf app/website/doctype/product") + \ No newline at end of file diff --git a/patches/february_2013/p05_leave_application.py b/patches/february_2013/p05_leave_application.py new file mode 100644 index 00000000000..88d166e6132 --- /dev/null +++ b/patches/february_2013/p05_leave_application.py @@ -0,0 +1,9 @@ +import webnotes + +def execute(): + webnotes.reload_doc("hr", "doctype", "leave_application") + + if not webnotes.get_doctype("Leave Application").get({"doctype": "DocField", + "parent": "Leave Application", "permlevel": 2}): + webnotes.conn.sql("""update `tabDocPerm` set permlevel=1 + where parent="Leave Application" and permlevel=2""") \ No newline at end of file diff --git a/patches/february_2013/p06_material_request_mappers.py b/patches/february_2013/p06_material_request_mappers.py new file mode 100644 index 00000000000..374588b6e0e --- /dev/null +++ b/patches/february_2013/p06_material_request_mappers.py @@ -0,0 +1,7 @@ +import webnotes + +def execute(): + webnotes.reload_doc("buying", "DocType Mapper", "Material Request-Purchase Order") + webnotes.reload_doc("buying", "DocType Mapper", "Material Request-Supplier Quotation") + webnotes.reload_doc("buying", "DocType Mapper", "Sales Order-Material Request") + webnotes.reload_doc("stock", "DocType Mapper", "Material Request-Stock Entry") \ No newline at end of file diff --git a/patches/january_2013/holiday_list_patch.py b/patches/january_2013/holiday_list_patch.py index e8e8f8c2986..714c0e89636 100644 --- a/patches/january_2013/holiday_list_patch.py +++ b/patches/january_2013/holiday_list_patch.py @@ -1,7 +1,7 @@ import webnotes def execute(): for name in webnotes.conn.sql("""select name from `tabHoliday List`"""): - holiday_list_wrapper = webnotes.model_wrapper("Holiday List", name[0]) + holiday_list_wrapper = webnotes.bean("Holiday List", name[0]) desc_count = _count([d.description for d in holiday_list_wrapper.doclist.get({"doctype": "Holiday"})]) diff --git a/patches/january_2013/remove_unwanted_permission.py b/patches/january_2013/remove_unwanted_permission.py index deeb1b3b1e3..7053d9fd1aa 100644 --- a/patches/january_2013/remove_unwanted_permission.py +++ b/patches/january_2013/remove_unwanted_permission.py @@ -5,7 +5,7 @@ def execute(): webnotes.conn.sql("""update tabDocPerm set report = 0 where parent = %s""", dt[0]) - doctype = webnotes.model_wrapper("DocType", dt[0]) + doctype = webnotes.bean("DocType", dt[0]) for pl in [1, 2, 3]: if not doctype.doclist.get({"doctype": "DocField", "permlevel": pl}): if doctype.doclist.get({"doctype":"DocPerm", "permlevel":pl}): diff --git a/patches/january_2013/stock_reconciliation_patch.py b/patches/january_2013/stock_reconciliation_patch.py index fa919f45988..9a25ffd94a9 100644 --- a/patches/january_2013/stock_reconciliation_patch.py +++ b/patches/january_2013/stock_reconciliation_patch.py @@ -23,7 +23,7 @@ def move_remarks_to_comments(): where ifnull(remark, '')!=''""") fullname_map = {} for reco, remark, modified_by in result: - webnotes.model_wrapper([{ + webnotes.bean([{ "doctype": "Comment", "comment": remark, "comment_by": modified_by, diff --git a/patches/july_2012/reload_pr_po_mapper.py b/patches/july_2012/reload_pr_po_mapper.py index 74b68c7c01e..a53e3ddf8fd 100644 --- a/patches/july_2012/reload_pr_po_mapper.py +++ b/patches/july_2012/reload_pr_po_mapper.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals def execute(): import webnotes from webnotes.modules import reload_doc - reload_doc('buying', 'DocType Mapper', 'Purchase Request-Purchase Order') \ No newline at end of file + reload_doc('buying', 'DocType Mapper', 'Material Request-Purchase Order') \ No newline at end of file diff --git a/patches/july_2012/supplier_quotation.py b/patches/july_2012/supplier_quotation.py index 84809e52ba3..49fa14dc9b7 100644 --- a/patches/july_2012/supplier_quotation.py +++ b/patches/july_2012/supplier_quotation.py @@ -10,6 +10,6 @@ def execute(): sync('buying', 'purchase_order_item') from webnotes.modules import reload_doc - reload_doc('buying', 'DocType Mapper', 'Purchase Request-Supplier Quotation') + reload_doc('buying', 'DocType Mapper', 'Material Request-Supplier Quotation') reload_doc('buying', 'DocType Mapper', 'Supplier Quotation-Purchase Order') \ No newline at end of file diff --git a/patches/june_2012/cms2.py b/patches/june_2012/cms2.py index c476d91c8db..414af73c007 100644 --- a/patches/june_2012/cms2.py +++ b/patches/june_2012/cms2.py @@ -67,13 +67,13 @@ def save_pages(): } import webnotes - from webnotes.model.wrapper import ModelWrapper + from webnotes.model.bean import Bean import webnotes.modules.patch_handler for dt in query_map: for result in webnotes.conn.sql(query_map[dt], as_dict=1): try: - ModelWrapper(dt, result['name'].encode('utf-8')).save() + Bean(dt, result['name'].encode('utf-8')).save() except Exception, e: webnotes.modules.patch_handler.log(unicode(e)) diff --git a/patches/mar_2012/doctype_get_refactor.py b/patches/mar_2012/doctype_get_refactor.py index 66339db1223..c6bfb3129c1 100644 --- a/patches/mar_2012/doctype_get_refactor.py +++ b/patches/mar_2012/doctype_get_refactor.py @@ -102,7 +102,7 @@ def create_file_list(): 'Project', 'Profile', 'Production Order', 'Product', 'Print Format', 'Price List', 'Purchase Invoice', 'Page', 'Maintenance Visit', 'Maintenance Schedule', 'Letter Head', - 'Leave Application', 'Lead', 'Journal Voucher', 'Item', 'Purchase Request', + 'Leave Application', 'Lead', 'Journal Voucher', 'Item', 'Material Request', 'Expense Claim', 'Opportunity', 'Employee', 'Delivery Note', 'Customer Issue', 'Customer', 'Contact Us Settings', 'Company', 'Bulk Rename Tool', 'Blog', 'BOM', 'About Us Settings'] diff --git a/patches/may_2012/rename_prev_doctype.py b/patches/may_2012/rename_prev_doctype.py index 135b81de594..9b1e0b66172 100644 --- a/patches/may_2012/rename_prev_doctype.py +++ b/patches/may_2012/rename_prev_doctype.py @@ -4,7 +4,7 @@ def execute(): dt_list = webnotes.conn.sql("select parent, fieldname from `tabDocField` where fieldname in ('against_doctype', 'prevdoc_doctype')") ren_dt = { - 'Indent' : 'Purchase Request', + 'Indent' : 'Material Request', 'Enquiry' : 'Opportunity', 'Receivable Voucher' : 'Sales Invoice', 'Payable Voucher' : 'Purchase Invoice' diff --git a/patches/may_2012/renamedt_in_custom_search_criteria.py b/patches/may_2012/renamedt_in_custom_search_criteria.py index a5f73508ded..1522deeb6be 100644 --- a/patches/may_2012/renamedt_in_custom_search_criteria.py +++ b/patches/may_2012/renamedt_in_custom_search_criteria.py @@ -8,8 +8,8 @@ def execute(): 'Payable Voucher' : 'Purchase Invoice', 'PV Detail' : 'Purchase Invoice Item', 'Purchase Tax Detail' : 'Purchase Taxes and Charges', - 'Indent' : 'Purchase Request', - 'Indent Detail' : 'Purchase Request Item', + 'Indent' : 'Material Request', + 'Indent Detail' : 'Material Request Item', 'QA Inspection Report' : 'Quality Inspection', 'Ticket' : 'Task', 'Manage Account' : 'Global Defaults', diff --git a/patches/patch_list.py b/patches/patch_list.py index 472360ed1ad..4cdebc2c885 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -169,8 +169,21 @@ patch_list = [ "patches.february_2013.update_company_in_leave_application", "execute:webnotes.conn.sql_ddl('alter table tabSeries change `name` `name` varchar(100)')", "execute:webnotes.conn.sql('update tabUserRole set parentfield=\"user_roles\" where parentfield=\"userroles\"')", - "patches.february_2013.fix_outstanding", "patches.february_2013.p01_event", "execute:webnotes.delete_doc('Page', 'Calendar')", "patches.february_2013.p02_email_digest", + "patches.february_2013.p03_material_request", + "patches.february_2013.p04_remove_old_doctypes", + "execute:webnotes.delete_doc('DocType', 'Plot Control')", + "patches.february_2013.p05_leave_application", + "patches.february_2013.gle_floating_point_issue_revisited", + "patches.february_2013.fix_outstanding", + 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Classic") # 2013-02-19', + 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-02-19', + 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-02-19', + "execute:webnotes.delete_doc('DocType', 'Service Order')", + "execute:webnotes.delete_doc('DocType', 'Service Quotation')", + "execute:webnotes.delete_doc('DocType', 'Service Order Detail')", + "execute:webnotes.delete_doc('DocType', 'Service Quotation Detail')", + "patches.february_2013.p06_material_request_mappers", ] \ No newline at end of file diff --git a/projects/doctype/project/project.py b/projects/doctype/project/project.py index 3e334e84a32..1de551c7535 100644 --- a/projects/doctype/project/project.py +++ b/projects/doctype/project/project.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import flt, getdate from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/projects/doctype/project_control/project_control.py b/projects/doctype/project_control/project_control.py index d11b260b880..53caab08c96 100644 --- a/projects/doctype/project_control/project_control.py +++ b/projects/doctype/project_control/project_control.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import add_days, cint, cstr, date_diff, flt, now, nowdate, add_days from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint from webnotes.utils.email_lib import sendmail sql = webnotes.conn.sql diff --git a/projects/doctype/task/task.py b/projects/doctype/task/task.py index 79fca9aa9c3..ad2303efafd 100644 --- a/projects/doctype/task/task.py +++ b/projects/doctype/task/task.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import getdate, today from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/projects/doctype/timesheet/timesheet.py b/projects/doctype/timesheet/timesheet.py index 4f4d8243476..6e6e27acd3a 100644 --- a/projects/doctype/timesheet/timesheet.py +++ b/projects/doctype/timesheet/timesheet.py @@ -20,7 +20,7 @@ import time, datetime from webnotes.utils import cint, cstr, getdate, now, nowdate from webnotes.model import db_exists -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 769a3f0488e..0304034cf6b 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -56,7 +56,7 @@ pscript.feature_dict = { }, 'fs_brands': { 'Delivery Note': {'delivery_note_details':['brand']}, - 'Purchase Request': {'indent_details':['brand']}, + 'Material Request': {'indent_details':['brand']}, 'Item': {'fields':['brand']}, 'Purchase Order': {'po_details':['brand']}, 'Purchase Invoice': {'entries':['brand']}, @@ -101,7 +101,7 @@ pscript.feature_dict = { 'fs_item_group_in_details': { 'Delivery Note': {'delivery_note_details':['item_group']}, 'Opportunity': {'enquiry_details':['item_group']}, - 'Purchase Request': {'indent_details':['item_group']}, + 'Material Request': {'indent_details':['item_group']}, 'Item': {'fields':['item_group']}, 'Global Defaults': {'fields':['default_item_group']}, 'Purchase Order': {'po_details':['item_group']}, @@ -118,7 +118,7 @@ pscript.feature_dict = { }, 'fs_page_break': { 'Delivery Note': {'delivery_note_details':['page_break'],'packing_details':['page_break']}, - 'Purchase Request': {'indent_details':['page_break']}, + 'Material Request': {'indent_details':['page_break']}, 'Purchase Order': {'po_details':['page_break']}, 'Purchase Receipt': {'purchase_receipt_details':['page_break']}, 'Purchase Voucher': {'entries':['page_break']}, @@ -174,7 +174,7 @@ pscript.feature_dict = { 'fs_more_info': { 'Delivery Note': {'fields':['More Info']}, 'Opportunity': {'fields':['More Info']}, - 'Purchase Request': {'fields':['More Info']}, + 'Material Request': {'fields':['More Info']}, 'Lead': {'fields':['More Info']}, 'Purchase Invoice': {'fields':['More Info']}, 'Purchase Order': {'fields':['More Info']}, diff --git a/public/js/locale/_messages_js.json b/public/js/locale/_messages_js.json index 51800794e54..0e410a5aeb3 100644 --- a/public/js/locale/_messages_js.json +++ b/public/js/locale/_messages_js.json @@ -42,14 +42,14 @@ "Budget Detail", "Jobs Email Settings", "Website Script", - "Sales and Purchase Return Item", + "Material Request", "Setup", "Timesheet Detail", "Messages", "Batch", "Deduction Type", "Project", - "Warehouse Type", + "Sales BOM Item", "SMS Center", "Sales Taxes and Charges Master", "DocField", @@ -67,6 +67,7 @@ "Maintenance Visit Purpose", "Purchase Invoice", "Product Settings", + "Item Reorder", "Leave Type", "Sales and Purchase Return Tool", "Global Defaults", @@ -93,6 +94,7 @@ "Purchase Invoice Advance", "Shipping Address", "Budget Distribution", + "Leave Block List", "Packing Slip", "Supplier", "State", @@ -117,6 +119,7 @@ "Warehouse User", "Website Slideshow", "Profile Control", + "Purchase Taxes and Charges", "Landed Cost Wizard", "Patch Log", "Report", @@ -134,7 +137,6 @@ "Project Activity", "Documentation", "Purchase Order Item Supplied", - "Purchase Request", "Quotation Lost Reason", "Event Role", "Contact", @@ -154,7 +156,7 @@ "Module Def", "Employee Education", "Currency", - "Purchase Taxes and Charges", + "Material Request Item", "Sales Order Item", "Featured Item", "Sales BOM", @@ -164,17 +166,19 @@ "Company", "Employee Internal Work History", "Appraisal Template Goal", + "Sales and Purchase Return Item", "Support", "Activity Type", "Cost Center", "Holiday Block List", "Delivery Note Item", "Company Control", - "Purchase Request Item", + "Website Settings", "Answer", "Email Settings", "Holiday", "Installation Note", + "Workflow Engine", "Website", "Core", "Item Customer Detail", @@ -239,6 +243,7 @@ "Item Website Specification", "Mode of Payment", "Website Settings", + "Leave Block List Date", "System Console", "To Do", "Permission Control", @@ -257,10 +262,9 @@ "Profile", "Authorization Control", "Product", - "Salary Manager", "Item Quality Inspection Parameter", "MIS Control", - "Sales BOM Item", + "Leave Block List Allow", "Style Settings", "Trash Control", "Salary Structure Earning", @@ -272,6 +276,7 @@ "Stock Reconciliation", "Purchase Receipt", "Address", + "test", "About Us Settings", "Job Applicant", "Manufacturing", @@ -300,7 +305,7 @@ "Stock Entry Detail", "Live Chat", "Item Supplier", - "Cross List Item Group", + "Salary Manager", "Company History", "Website Slideshow Item", "Naming Series Options", @@ -308,7 +313,7 @@ "SMS Settings", "SMS Log", "Newsletter", - "Workflow Engine", + "Warehouse Type", "Workflow Rule", "UserRole" ] \ No newline at end of file diff --git a/public/js/locale/ar-js.json b/public/js/locale/ar-js.json index b02d6167ba0..5f686319a91 100644 --- a/public/js/locale/ar-js.json +++ b/public/js/locale/ar-js.json @@ -120,6 +120,7 @@ "Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629", "Item Price": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0633\u0639\u0631", "Item Quality Inspection Parameter": "\u0645\u0639\u0644\u0645\u0629 \u0627\u0644\u0628\u0646\u062f \u0627\u0644\u062a\u0641\u062a\u064a\u0634 \u0627\u0644\u062c\u0648\u062f\u0629", + "Item Reorder": "\u0627\u0644\u0628\u0646\u062f \u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628", "Item Supplier": "\u0627\u0644\u0628\u0646\u062f \u0645\u0632\u0648\u062f", "Item Tax": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0636\u0631\u0627\u0626\u0628", "Item Website Specification": "\u0627\u0644\u0628\u0646\u062f \u0645\u0648\u0627\u0635\u0641\u0627\u062a \u0627\u0644\u0645\u0648\u0642\u0639", @@ -135,6 +136,9 @@ "Lead": "\u0642\u064a\u0627\u062f\u0629", "Leave Allocation": "\u062a\u0631\u0643 \u062a\u0648\u0632\u064a\u0639", "Leave Application": "\u062a\u0631\u0643 \u0627\u0644\u062a\u0637\u0628\u064a\u0642", + "Leave Block List": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631", + "Leave Block List Allow": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631 \u0627\u0644\u0633\u0645\u0627\u062d", + "Leave Block List Date": "\u062a\u0631\u0643 \u0628\u0644\u0648\u0643 \u062a\u0627\u0631\u064a\u062e \u0642\u0627\u0626\u0645\u0629", "Leave Control Panel": "\u062a\u0631\u0643 \u0644\u0648\u062d\u0629 \u0627\u0644\u062a\u062d\u0643\u0645", "Leave Type": "\u062a\u0631\u0643 \u0646\u0648\u0639", "Letter Head": "\u0631\u0633\u0627\u0644\u0629 \u0631\u0626\u064a\u0633", @@ -147,6 +151,8 @@ "Maintenance Visit Purpose": "\u0635\u064a\u0627\u0646\u0629 \u0632\u064a\u0627\u0631\u0629 \u0627\u0644\u063a\u0631\u0636", "Manufacturing": "\u062a\u0635\u0646\u064a\u0639", "Market Segment": "\u0633\u0648\u0642 \u0627\u0644\u0642\u0637\u0627\u0639", + "Material Request": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f", + "Material Request Item": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0627\u0644\u0625\u063a\u0644\u0627\u0642", "Messages": "\u0631\u0633\u0627\u0626\u0644", "Mode of Payment": "\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u062f\u0641\u0639", "Module Def": "\u0648\u062d\u062f\u0629 \u0645\u0648\u0627\u0637\u0646\u0647", @@ -311,5 +317,6 @@ "Workflow Rule Detail": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0633\u064a\u0631 \u0627\u0644\u0639\u0645\u0644 \u0627\u0644\u0642\u0627\u0639\u062f\u0629", "Workflow State": "\u0627\u0644\u062f\u0648\u0644\u0629 \u0633\u064a\u0631 \u0627\u0644\u0639\u0645\u0644", "Workflow Transition": "\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0633\u064a\u0631 \u0627\u0644\u0639\u0645\u0644", - "Workstation": "\u0645\u062d\u0637\u0629 \u0627\u0644\u0639\u0645\u0644" + "Workstation": "\u0645\u062d\u0637\u0629 \u0627\u0644\u0639\u0645\u0644", + "test": "\u0627\u062e\u062a\u0628\u0627\u0631" } \ No newline at end of file diff --git a/public/js/locale/es-js.json b/public/js/locale/es-js.json index 2b4b2fe88fd..da4ad25f5d5 100644 --- a/public/js/locale/es-js.json +++ b/public/js/locale/es-js.json @@ -120,6 +120,7 @@ "Item Group": "Grupo de art\u00edculos", "Item Price": "Art\u00edculo Precio", "Item Quality Inspection Parameter": "Calidad Inspecci\u00f3n Tema Par\u00e1metro", + "Item Reorder": "Art\u00edculo reorden", "Item Supplier": "Art\u00edculo Proveedor", "Item Tax": "Art\u00edculo Tributaria", "Item Website Specification": "Elemento Especificaci\u00f3n web", @@ -135,6 +136,9 @@ "Lead": "Conducir", "Leave Allocation": "Deja Asignaci\u00f3n", "Leave Application": "Deja aplicaci\u00f3n", + "Leave Block List": "Deja lista de bloqueo", + "Leave Block List Allow": "Deja Lista de bloqueo Permitir", + "Leave Block List Date": "Deje Fecha Lista de bloqueo", "Leave Control Panel": "Deja Panel de control", "Leave Type": "Deja Tipo", "Letter Head": "Carta Head", @@ -147,6 +151,8 @@ "Maintenance Visit Purpose": "Mantenimiento Prop\u00f3sito Visita", "Manufacturing": "Fabricaci\u00f3n", "Market Segment": "Sector de mercado", + "Material Request": "Material de Solicitud", + "Material Request Item": "Art\u00edculo Material Request", "Messages": "Mensajes", "Mode of Payment": "Forma de Pago", "Module Def": "M\u00f3dulo Def", @@ -311,5 +317,6 @@ "Workflow Rule Detail": "Detalle de la regla de flujo de trabajo", "Workflow State": "Estado de flujo de trabajo", "Workflow Transition": "La transici\u00f3n de flujo de trabajo", - "Workstation": "Puesto de trabajo" + "Workstation": "Puesto de trabajo", + "test": "prueba" } \ No newline at end of file diff --git a/public/js/locale/fr-js.json b/public/js/locale/fr-js.json index 012ed59b9fe..88b2927280e 100644 --- a/public/js/locale/fr-js.json +++ b/public/js/locale/fr-js.json @@ -120,6 +120,7 @@ "Item Group": "Groupe d'\u00e9l\u00e9ments", "Item Price": "Prix \u200b\u200bde l'article", "Item Quality Inspection Parameter": "Param\u00e8tre d'inspection Article de qualit\u00e9", + "Item Reorder": "R\u00e9organiser article", "Item Supplier": "Fournisseur d'article", "Item Tax": "Point d'imp\u00f4t", "Item Website Specification": "Sp\u00e9cification Site \u00e9l\u00e9ment", @@ -135,6 +136,9 @@ "Lead": "Conduire", "Leave Allocation": "Laisser Allocation", "Leave Application": "Demande de cong\u00e9s", + "Leave Block List": "Laisser Block List", + "Leave Block List Allow": "Laisser Block List Autoriser", + "Leave Block List Date": "Laisser Date de Block List", "Leave Control Panel": "Laisser le Panneau de configuration", "Leave Type": "Laisser Type d'", "Letter Head": "A en-t\u00eate", @@ -147,6 +151,8 @@ "Maintenance Visit Purpose": "But Visite d'entretien", "Manufacturing": "Fabrication", "Market Segment": "Segment de march\u00e9", + "Material Request": "Demande de mat\u00e9riel", + "Material Request Item": "Article demande de mat\u00e9riel", "Messages": "Messages", "Mode of Payment": "Mode de paiement", "Module Def": "Module Def", @@ -311,5 +317,6 @@ "Workflow Rule Detail": "D\u00e9tail r\u00e8gle de workflow", "Workflow State": "\u00c9tat de workflow", "Workflow Transition": "Transition de workflow", - "Workstation": "Workstation" + "Workstation": "Workstation", + "test": "test" } \ No newline at end of file diff --git a/public/js/locale/hi-js.json b/public/js/locale/hi-js.json index 2062f1b3ee7..c567bcde1ee 100644 --- a/public/js/locale/hi-js.json +++ b/public/js/locale/hi-js.json @@ -126,6 +126,7 @@ "Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939", "Item Price": "\u092e\u0926 \u092e\u0942\u0932\u094d\u092f", "Item Quality Inspection Parameter": "\u0906\u0907\u091f\u092e \u0917\u0941\u0923\u0935\u0924\u094d\u0924\u093e \u0928\u093f\u0930\u0940\u0915\u094d\u0937\u0923 \u092a\u0948\u0930\u093e\u092e\u0940\u091f\u0930", + "Item Reorder": "\u0906\u0907\u091f\u092e \u092a\u0941\u0928\u0903 \u0915\u094d\u0930\u092e\u093f\u0924 \u0915\u0930\u0947\u0902", "Item Supplier": "\u0906\u0907\u091f\u092e \u092a\u094d\u0930\u0926\u093e\u092f\u0915", "Item Tax": "\u0906\u0907\u091f\u092e \u091f\u0948\u0915\u094d\u0938", "Item Website Specification": "\u0906\u0907\u091f\u092e \u0935\u0947\u092c\u0938\u093e\u0907\u091f \u0935\u093f\u0936\u093f\u0937\u094d\u091f\u0924\u093e", @@ -143,6 +144,9 @@ "Lead": "\u0928\u0947\u0924\u0943\u0924\u094d\u0935", "Leave Allocation": "\u0906\u092c\u0902\u091f\u0928 \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Application": "\u091b\u0941\u091f\u094d\u091f\u0940 \u0915\u0940 \u0905\u0930\u094d\u091c\u093c\u0940", + "Leave Block List": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u091b\u094b\u0921\u093c \u0926\u094b", + "Leave Block List Allow": "\u091b\u094b\u0921\u093c \u0926\u094b \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0915\u0940 \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902", + "Leave Block List Date": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0924\u093f\u0925\u093f \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Control Panel": "\u0928\u093f\u092f\u0902\u0924\u094d\u0930\u0923 \u0915\u0915\u094d\u0937 \u091b\u094b\u0921\u093c \u0926\u094b", "Leave Type": "\u092a\u094d\u0930\u0915\u093e\u0930 \u091b\u094b\u0921\u093c \u0926\u094b", "Letter Head": "\u092a\u0924\u094d\u0930\u0936\u0940\u0930\u094d\u0937", @@ -155,6 +159,8 @@ "Maintenance Visit Purpose": "\u0930\u0916\u0930\u0916\u093e\u0935 \u092d\u0947\u0902\u091f \u092a\u094d\u0930\u092f\u094b\u091c\u0928", "Manufacturing": "\u0935\u093f\u0928\u093f\u0930\u094d\u092e\u093e\u0923", "Market Segment": "\u092c\u093e\u091c\u093e\u0930 \u0916\u0902\u0921", + "Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927", + "Material Request Item": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0906\u0907\u091f\u092e", "Messages": "\u0938\u0902\u0926\u0947\u0936", "Mode of Payment": "\u092d\u0941\u0917\u0924\u093e\u0928 \u0915\u0940 \u0930\u0940\u0924\u093f", "Module Def": "\u092e\u0949\u0921\u094d\u092f\u0942\u0932 Def", @@ -324,5 +330,6 @@ "Workflow Rule Detail": "\u0935\u0930\u094d\u0915\u092b\u093c\u094d\u0932\u094b \u0928\u093f\u092f\u092e \u0935\u093f\u0938\u094d\u0924\u093e\u0930", "Workflow State": "\u0915\u093e\u0930\u094d\u092f\u092a\u094d\u0930\u0935\u093e\u0939 \u0930\u093e\u091c\u094d\u092f", "Workflow Transition": "\u0935\u0930\u094d\u0915\u092b\u093c\u094d\u0932\u094b \u0938\u0902\u0915\u094d\u0930\u092e\u0923", - "Workstation": "\u0935\u0930\u094d\u0915\u0938\u094d\u091f\u0947\u0936\u0928" + "Workstation": "\u0935\u0930\u094d\u0915\u0938\u094d\u091f\u0947\u0936\u0928", + "test": "\u092a\u0930\u0940\u0915\u094d\u0937\u0923" } \ No newline at end of file diff --git a/public/js/locale/hr-js.json b/public/js/locale/hr-js.json index 39fe924e6cd..2cbca024917 100644 --- a/public/js/locale/hr-js.json +++ b/public/js/locale/hr-js.json @@ -120,6 +120,7 @@ "Item Group": "Stavka Grupa", "Item Price": "Stavka Cijena", "Item Quality Inspection Parameter": "Stavka Provera kvaliteta parametara", + "Item Reorder": "Stavka redoslijeda", "Item Supplier": "Stavka Dobavlja\u010d", "Item Tax": "Stavka poreza", "Item Website Specification": "Stavka Web Specifikacija", @@ -135,6 +136,9 @@ "Lead": "Dovesti", "Leave Allocation": "Ostavite Raspodjela", "Leave Application": "Ostavite aplikaciju", + "Leave Block List": "Ostavite Block List", + "Leave Block List Allow": "Ostavite Blok Popis Dopustite", + "Leave Block List Date": "Ostavite Date Popis Block", "Leave Control Panel": "Ostavite Upravlja\u010dka plo\u010da", "Leave Type": "Ostavite Vid", "Letter Head": "Pismo Head", @@ -147,6 +151,8 @@ "Maintenance Visit Purpose": "Odr\u017eavanje Posjetite Namjena", "Manufacturing": "Proizvodnja", "Market Segment": "Tr\u017ei\u0161ni segment", + "Material Request": "Materijal zahtjev", + "Material Request Item": "Materijal Zahtjev artikla", "Messages": "Poruke", "Mode of Payment": "Na\u010din pla\u0107anja", "Module Def": "Modul Def", @@ -310,5 +316,6 @@ "Workflow Rule Detail": "Workflow Pravilo Detalj", "Workflow State": "Workflow dr\u017eava", "Workflow Transition": "Tijek tranzicije", - "Workstation": "Workstation" + "Workstation": "Workstation", + "test": "test" } \ No newline at end of file diff --git a/public/js/locale/nl-js.json b/public/js/locale/nl-js.json index 814440d03dd..26bfcce8a21 100644 --- a/public/js/locale/nl-js.json +++ b/public/js/locale/nl-js.json @@ -120,6 +120,7 @@ "Item Group": "Item Group", "Item Price": "Item Prijs", "Item Quality Inspection Parameter": "Item Kwaliteitscontrole Parameter", + "Item Reorder": "Item opnieuw ordenen", "Item Supplier": "Item Leverancier", "Item Tax": "Item Belasting", "Item Website Specification": "Item Website Specificatie", @@ -135,6 +136,9 @@ "Lead": "Leiden", "Leave Allocation": "Laat Toewijzing", "Leave Application": "Verlofaanvraag", + "Leave Block List": "Laat Block List", + "Leave Block List Allow": "Laat Block List Laat", + "Leave Block List Date": "Laat Block List Datum", "Leave Control Panel": "Laat het Configuratiescherm", "Leave Type": "Laat Type", "Letter Head": "Brief Hoofd", @@ -147,6 +151,8 @@ "Maintenance Visit Purpose": "Onderhoud Bezoek Doel", "Manufacturing": "Productie", "Market Segment": "Marktsegment", + "Material Request": "Materiaal aanvragen", + "Material Request Item": "Materiaal aanvragen Item", "Messages": "Berichten", "Mode of Payment": "Wijze van betaling", "Module Def": "Module Def", @@ -311,5 +317,6 @@ "Workflow Rule Detail": "Workflow Regel Detail", "Workflow State": "Workflow State", "Workflow Transition": "Workflow Transition", - "Workstation": "Workstation" + "Workstation": "Workstation", + "test": "test" } \ No newline at end of file diff --git a/public/js/locale/pt-js.json b/public/js/locale/pt-js.json index 120cbb02f4f..b9c7eab0d63 100644 --- a/public/js/locale/pt-js.json +++ b/public/js/locale/pt-js.json @@ -120,6 +120,7 @@ "Item Group": "Grupo Item", "Item Price": "Item Pre\u00e7o", "Item Quality Inspection Parameter": "Item Par\u00e2metro de Inspe\u00e7\u00e3o de Qualidade", + "Item Reorder": "Item Reordenar", "Item Supplier": "Fornecedor item", "Item Tax": "Imposto item", "Item Website Specification": "Especifica\u00e7\u00e3o Site item", @@ -135,6 +136,9 @@ "Lead": "Conduzir", "Leave Allocation": "Deixe Aloca\u00e7\u00e3o", "Leave Application": "Deixe Aplica\u00e7\u00e3o", + "Leave Block List": "Deixe Lista de Bloqueios", + "Leave Block List Allow": "Deixe Lista de Bloqueios Permitir", + "Leave Block List Date": "Deixe Data Lista de Bloqueios", "Leave Control Panel": "Deixe Painel de Controle", "Leave Type": "Deixar Tipo", "Letter Head": "Cabe\u00e7a letra", @@ -147,6 +151,8 @@ "Maintenance Visit Purpose": "Finalidade visita de manuten\u00e7\u00e3o", "Manufacturing": "Fabrico", "Market Segment": "Segmento de mercado", + "Material Request": "Pedido de material", + "Material Request Item": "Item de solicita\u00e7\u00e3o de material", "Messages": "Mensagens", "Mode of Payment": "Modo de Pagamento", "Module Def": "M\u00f3dulo Def", @@ -311,5 +317,6 @@ "Workflow Rule Detail": "Detalhe regra de fluxo de trabalho", "Workflow State": "Estado de fluxo de trabalho", "Workflow Transition": "Transi\u00e7\u00e3o de fluxo de trabalho", - "Workstation": "Esta\u00e7\u00e3o de trabalho" + "Workstation": "Esta\u00e7\u00e3o de trabalho", + "test": "teste" } \ No newline at end of file diff --git a/selling/Print Format/Quotation Classic/Quotation Classic.txt b/selling/Print Format/Quotation Classic/Quotation Classic.txt index 885570ecf27..ca950a21ad6 100644 --- a/selling/Print Format/Quotation Classic/Quotation Classic.txt +++ b/selling/Print Format/Quotation Classic/Quotation Classic.txt @@ -2,14 +2,14 @@ { "creation": "2012-04-17 11:29:12", "docstatus": 0, - "modified": "2013-01-25 17:11:54", + "modified": "2013-02-19 15:44:56", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Quotation", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n

\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", "module": "Selling", "name": "__common__", "standard": "Yes" diff --git a/selling/Print Format/Quotation Modern/Quotation Modern.txt b/selling/Print Format/Quotation Modern/Quotation Modern.txt index 707d5ead931..a323fbf8292 100644 --- a/selling/Print Format/Quotation Modern/Quotation Modern.txt +++ b/selling/Print Format/Quotation Modern/Quotation Modern.txt @@ -2,14 +2,14 @@ { "creation": "2012-04-17 11:29:12", "docstatus": 0, - "modified": "2013-01-25 17:15:42", + "modified": "2013-02-19 15:44:22", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Quotation", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation No.
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation No.
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", "module": "Selling", "name": "__common__", "standard": "Yes" diff --git a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt b/selling/Print Format/Quotation Spartan/Quotation Spartan.txt index f49e4c99208..d2e04dda8d6 100644 --- a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt +++ b/selling/Print Format/Quotation Spartan/Quotation Spartan.txt @@ -2,14 +2,14 @@ { "creation": "2012-04-17 11:29:12", "docstatus": 0, - "modified": "2013-01-25 17:09:04", + "modified": "2013-02-19 15:45:22", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Quotation", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", "module": "Selling", "name": "__common__", "standard": "Yes" diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index 0b49b77883f..f2d49b33fb4 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -17,9 +17,10 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cstr, get_defaults +from webnotes.utils import cstr from webnotes.model.doc import Document, make_autoname from webnotes import msgprint, _ +import webnotes.defaults sql = webnotes.conn.sql @@ -34,7 +35,7 @@ class DocType(TransactionBase): self.add_communication_list() def autoname(self): - cust_master_name = get_defaults().get('cust_master_name') + cust_master_name = webnotes.defaults.get_global_default('cust_master_name') if cust_master_name == 'Customer Name': if webnotes.conn.exists("Supplier", self.doc.customer_name): msgprint(_("A Supplier exists with same name"), raise_exception=1) @@ -54,7 +55,7 @@ class DocType(TransactionBase): return g def validate_values(self): - if get_defaults().get('cust_master_name') == 'Naming Series' and not self.doc.naming_series: + if webnotes.defaults.get_global_default('cust_master_name') == 'Naming Series' and not self.doc.naming_series: msgprint("Series is Mandatory.") raise Exception @@ -217,7 +218,7 @@ class DocType(TransactionBase): def on_rename(self, new, old): #update customer_name if not naming series - if get_defaults().get('cust_master_name') == 'Customer Name': + if webnotes.defaults.get_global_default('cust_master_name') == 'Customer Name': update_fields = [ ('Customer', 'name'), ('Address', 'customer'), diff --git a/selling/doctype/installation_note/installation_note.py b/selling/doctype/installation_note/installation_note.py index 00d365afc7f..b0e1d966d9a 100644 --- a/selling/doctype/installation_note/installation_note.py +++ b/selling/doctype/installation_note/installation_note.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr, getdate from webnotes.model import db_exists from webnotes.model.doc import make_autoname -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint from stock.utils import get_valid_serial_nos diff --git a/selling/doctype/lead/get_leads.py b/selling/doctype/lead/get_leads.py index cda74129ddb..5b127e74e5f 100644 --- a/selling/doctype/lead/get_leads.py +++ b/selling/doctype/lead/get_leads.py @@ -23,7 +23,7 @@ from core.doctype.communication.communication import make def add_sales_communication(subject, content, sender, real_name, mail=None, status="Open", date=None): def set_status(doctype, name): - w = webnotes.model_wrapper(doctype, name) + w = webnotes.bean(doctype, name) w.ignore_permissions = True w.doc.status = is_system_user and "Replied" or status w.doc.save() @@ -36,7 +36,7 @@ def add_sales_communication(subject, content, sender, real_name, mail=None, if not (lead_name or contact_name): # none, create a new Lead - lead = webnotes.model_wrapper({ + lead = webnotes.bean({ "doctype":"Lead", "lead_name": real_name or sender, "email_id": sender, diff --git a/selling/doctype/opportunity/opportunity.py b/selling/doctype/opportunity/opportunity.py index 369fab72a1a..9da5e6adad6 100644 --- a/selling/doctype/opportunity/opportunity.py +++ b/selling/doctype/opportunity/opportunity.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import add_days, cstr, getdate from webnotes.model import db_exists from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/selling/doctype/plot_control/__init__.py b/selling/doctype/plot_control/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/selling/doctype/plot_control/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/selling/doctype/plot_control/locale/_messages_doc.json b/selling/doctype/plot_control/locale/_messages_doc.json deleted file mode 100644 index 8ab90b5bd8e..00000000000 --- a/selling/doctype/plot_control/locale/_messages_doc.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "Selling", - "Plot Control" -] \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/ar-doc.json b/selling/doctype/plot_control/locale/ar-doc.json deleted file mode 100644 index f413b5f1991..00000000000 --- a/selling/doctype/plot_control/locale/ar-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "\u0645\u0624\u0627\u0645\u0631\u0629 \u0627\u0644\u062a\u062d\u0643\u0645", - "Selling": "\u0628\u064a\u0639" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/es-doc.json b/selling/doctype/plot_control/locale/es-doc.json deleted file mode 100644 index d22c343dbfe..00000000000 --- a/selling/doctype/plot_control/locale/es-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "Parcela de control", - "Selling": "De venta" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/fr-doc.json b/selling/doctype/plot_control/locale/fr-doc.json deleted file mode 100644 index 5bda02898df..00000000000 --- a/selling/doctype/plot_control/locale/fr-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "Contr\u00f4le Terrain", - "Selling": "Vente" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/hi-doc.json b/selling/doctype/plot_control/locale/hi-doc.json deleted file mode 100644 index b53aa6baf03..00000000000 --- a/selling/doctype/plot_control/locale/hi-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "\u092a\u094d\u0932\u0949\u091f \u0928\u093f\u092f\u0902\u0924\u094d\u0930\u0923", - "Selling": "\u0935\u093f\u0915\u094d\u0930\u092f" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/hr-doc.json b/selling/doctype/plot_control/locale/hr-doc.json deleted file mode 100644 index 944889634bf..00000000000 --- a/selling/doctype/plot_control/locale/hr-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "Zemlji\u0161te kontrola", - "Selling": "Prodaja" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/nl-doc.json b/selling/doctype/plot_control/locale/nl-doc.json deleted file mode 100644 index e25b4951d3b..00000000000 --- a/selling/doctype/plot_control/locale/nl-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "Plot Controle", - "Selling": "Selling" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/pt-doc.json b/selling/doctype/plot_control/locale/pt-doc.json deleted file mode 100644 index 28d4b6edf4f..00000000000 --- a/selling/doctype/plot_control/locale/pt-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "Controle trama", - "Selling": "Vendendo" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/sr-doc.json b/selling/doctype/plot_control/locale/sr-doc.json deleted file mode 100644 index 471450b718b..00000000000 --- a/selling/doctype/plot_control/locale/sr-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "\u041f\u043b\u0430\u0446 \u041a\u043e\u043d\u0442\u0440\u043e\u043b\u0430", - "Selling": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/locale/ta-doc.json b/selling/doctype/plot_control/locale/ta-doc.json deleted file mode 100644 index 6a7550c62d2..00000000000 --- a/selling/doctype/plot_control/locale/ta-doc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Plot Control": "\u0b9a\u0ba4\u0bbf \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0bbe\u0b9f\u0bc1", - "Selling": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8" -} \ No newline at end of file diff --git a/selling/doctype/plot_control/plot_control.py b/selling/doctype/plot_control/plot_control.py deleted file mode 100644 index 7823b7346de..00000000000 --- a/selling/doctype/plot_control/plot_control.py +++ /dev/null @@ -1,237 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -from __future__ import unicode_literals -import webnotes - -from webnotes.utils import cint, cstr, get_defaults, now -from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist - -sql = webnotes.conn.sql - - - -class DocType: - def __init__(self,doc,doclist = []): - self.doc ,self.doclist = doc, doclist - - #============================get monthly sales==================================================== - def get_monthwise_amount(self,lst): - lst = lst.split(',') - if not lst[1]: - ret = webnotes.conn.convert_to_lists(sql("SELECT SUM(grand_total) AMOUNT,CASE MONTH(due_date) WHEN 1 THEN 'JAN' WHEN 2 THEN 'FEB' WHEN 3 THEN 'MAR' WHEN 4 THEN 'APR' WHEN 5 THEN 'MAY' WHEN 6 THEN 'JUN' WHEN 7 THEN 'JUL' WHEN 8 THEN 'AUG' WHEN 9 THEN 'SEP' WHEN 10 THEN 'OCT' WHEN 11 THEN 'NOV' WHEN 12 THEN 'DEC' END MONTHNAME FROM `tabSales Invoice` WHERE docstatus = 1 AND fiscal_year = '%s' GROUP BY MONTH(due_date) ORDER BY MONTH(due_date)"%lst[0])) - else: - ret = webnotes.conn.convert_to_lists(sql("select sum(t2.amount) AMOUNT ,CASE MONTH(t1.due_date) WHEN 1 THEN 'JAN' WHEN 2 THEN 'FEB' WHEN 3 THEN 'MAR' WHEN 4 THEN 'APR' WHEN 5 THEN 'MAY' WHEN 6 THEN 'JUN' WHEN 7 THEN 'JUL' WHEN 8 THEN 'AUG' WHEN 9 THEN 'SEP' WHEN 10 THEN 'OCT' WHEN 11 THEN 'NOV' WHEN 12 THEN 'DEC' END MONTHNAME from `tabSales Invoice` t1,`tabSales Invoice Item` t2 WHERE t1.name = t2.parent and t1.docstatus = 1 and t2.item_group = '%s' AND t1.fiscal_year = '%s' GROUP BY MONTH(t1.due_date) ORDER BY MONTH(t1.due_date)"%(lst[1],lst[0]))) - - m =cint(sql("select month('%s')"%(get_defaults()['year_start_date']))[0][0]) - - lst1 = [[1,'JAN'],[2 ,'FEB'], [3,'MAR'],[4,'APR'],[5,'MAY'],[6,'JUN'],[7,'JUL'],[8,'AUG'],[9,'SEP'],[10,'OCT'],[11,'NOV'],[12,'DEC']] - lst2=[] - k=1 - - for i in range(1,13): - for j in lst1: - if j[0]==m: - lst2.append([k,j[1]]) - m +=1 - if m==13: m=1 - k +=1 - return {'msg_data':ret,'x_axis':lst2} - - #===============================get weekly sales================================================= - def get_weekwise_amount(self,lst): - - lst = lst.split(',') - - cases = self.get_week_cases(lst[0],lst[1]) - - if not lst[2]: - query = "SELECT SUM(grand_total) AMOUNT,CASE WEEK(due_date)"+ cases +"END Weekly FROM `tabSales Invoice` WHERE MONTH(due_date) = %d AND docstatus = 1 AND fiscal_year = '%s' GROUP BY Weekly ORDER BY Weekly" - - ret = webnotes.conn.convert_to_lists(sql(query%(cint(lst[0]),lst[1]))) - - else: - - query = "SELECT SUM(t2.amount) AMOUNT,CASE WEEK(t1.due_date)" + cases + "END Weekly FROM `tabSales Invoice` t1, `tabSales Invoice Item` t2 WHERE MONTH(t1.due_date) = %d AND t1.docstatus = 1 AND t1.fiscal_year = '%s' AND t1.name = t2.parent AND t2.item_group ='%s' GROUP BY Weekly ORDER BY Weekly" - - ret =webnotes.conn.convert_to_lists(sql(query%(cint(lst[0]),lst[1],lst[2]))) - - return ret and ret or '' - #================================================================================ - def get_week_cases(self,m1,fy): - d1 = self.make_date("%s,%s"%(cstr(m1),fy)) - - w = sql("select week('%s'),week(last_day('%s'))"%(d1,d1)) - w1 = cint(w[0][0]) - w2 = cint(w[0][1]) - - w3 = [] - str1 = " " - for i in range(1,7): - if(w1 <= w2): - w3.append(w1) - str1 += "WHEN "+ cstr(w1) +" THEN 'Week"+cstr(i) +"' " - w1 += 1 - - return str1 - - #===============================get yearly weekwise sales================================================= - def get_year_weekwise_amount(self,lst): - - lst = lst.split(',') - yr_st = get_defaults()['year_start_date'] - - fy = lst[0] - m1 = cint(yr_st.split('-')[1]) - - cases = ' ' - for i in range(1,13): - cases += self.get_week_cases(m1,fy) - m1 +=1 - if(m1 == 13): m1 = 1 - - if not lst[1]: - query = "SELECT SUM(grand_total) AMOUNT,CASE WEEK(due_date)"+cases+"END Weekly, month(due_date) month FROM `tabSales Invoice` WHERE docstatus = 1 AND fiscal_year = '%s' GROUP BY `month`,weekly ORDER BY `month`,weekly" - ret = webnotes.conn.convert_to_lists(sql(query%lst[0])) - - else: - - query = "SELECT SUM(t2.amount) AMOUNT,CASE WEEK(t1.due_date)" + cases + "END Weekly, month(due_date) month FROM `tabSales Invoice` t1, `tabSales Invoice Item` t2 WHERE t1.docstatus = 1 AND t1.fiscal_year = '%s' AND t1.name = t2.parent AND t2.item_group ='%s' GROUP BY Weekly ORDER BY Weekly" - ret = webnotes.conn.convert_to_lists(sql(query%(lst[0],lst[1]))) - - - return ret and ret or '' - - - #====================================make yearly weekwise dates================================================ - def yr_wk_dates(self,fy): - - from datetime import date - yr_st = get_defaults()['year_start_date'] - yr_en = get_defaults()['year_end_date'] - - fy = fy.split('-') - y1 = yr_st.split('-') - date1 = date(cint(fy[0]),cint(y1[1]),cint(y1[2])) - - y2 = yr_en.split('-') - date2 = date(cint(fy[1]),cint(y2[1]),cint(y2[2])) - - - - date_lst = [[1,self.get_months(cint(y1[1]))]] - m1=cint(y1[1])+1 - x_axis_lst = [[1,'Week1',cint(y1[1])]] - - from datetime import date, timedelta - d =dt= date1 - - week=k=1 - for i in range(0,53): - - if dt <= date2: - - if(d.weekday()>3): - d = d+timedelta(7-d.weekday()) - else: - d = d - timedelta(d.weekday()) - dlt = timedelta(days = (week-1)*7) - dt = d + dlt + timedelta(days=6) - - m2 = cint(sql("Select month('%s')"%dt)[0][0]) - - if(m1 == m2): - date_lst.append([i+2,self.get_months(m2)]) - x_axis_lst.append([i+2,'Week1',m2]) - k=1 - m1 += 1 - if(m1==13): m1 =1 - else: - date_lst.append([i+2,' ']) - x_axis_lst.append([i+2,'Week%d'%k,m2]) - week += 1 - k +=1 - - - return [date_lst,x_axis_lst] - #=================================================================================== - - def get_months(self,m): - m_lst = {1:'JAN',2:'FEB',3:'MAR',4:'APR',5:'MAY',6:'JUN',7:'JUL',8:'AUG',9:'SEP',10:'OCT',11:'NOV',12:'DEC'} - return m_lst[m] - - - - def get_weekdates(self,lst): - from datetime import date, timedelta - - d = dt = self.make_date(lst) - date_lst = [[1,cstr(d.strftime("%d/%m/%y"))]] - week=flag =1 - j=1 - last_day = sql("select last_day('%s')"%d)[0][0] - lst_m = cint(lst.split(',')[0]) - for i in range(2,8): - f=0 - if(dt < last_day): - #if(d.weekday()>4): - #d = d+timedelta(7-d.weekday()) - #else: - d = d - timedelta(d.weekday()-1) - dlt = timedelta(days = (week-1)*7) - dt = d + dlt + timedelta(days=6) - - if(cint(sql("select month('%s')"%dt)[0][0]) == lst_m and dt!=last_day): - for k in date_lst: - if(cstr(dt.strftime("%d/%m/%y")) == k[1]): - f = 1 - if f == 0: - date_lst.append([i,cstr(dt.strftime("%d/%m/%y"))]) - - elif(dt==last_day and flag ==1): - date_lst.append([i,cstr(last_day.strftime("%d/%m/%y"))]) - flag = 0 - - elif(flag == 1): - date_lst.append([i,cstr(last_day.strftime("%d/%m/%y"))]) - week += 1 - - return date_lst and date_lst or '' - - - def make_date(self,lst): - - from datetime import date, timedelta - lst = lst.split(',') - year = lst[1].split('-') - if(len(lst[0])==1): month = '0'+lst[0] - else: month = lst[0] - if(1<=cint(month)<=3): year = year[1] - elif(4<=cint(month)<=12): year = year[0] - - d = date(cint(year),cint(month),1) - - return d - - def get_item_groups(self): - ret = webnotes.conn.convert_to_lists(sql("select name from `tabItem Group` where docstatus != 2 and is_group = 'No'")) - #ret = webnotes.conn.convert_to_lists(sql("select item_group from `tabItem` where is_sales_item='Yes' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now()) and item_group !=''")) - return ret and ret or '' - - def get_fiscal_year(self): - ret = webnotes.conn.convert_to_lists(sql("select name from `tabFiscal Year` where docstatus =0")) - return ret and ret or '' \ No newline at end of file diff --git a/selling/doctype/plot_control/plot_control.txt b/selling/doctype/plot_control/plot_control.txt deleted file mode 100644 index 675c4de12a0..00000000000 --- a/selling/doctype/plot_control/plot_control.txt +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "owner": "harshada@webnotestech.com", - "docstatus": 0, - "creation": "2012-03-27 14:36:12", - "modified_by": "Administrator", - "modified": "2012-03-27 14:36:12" - }, - { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Selling", - "doctype": "DocType", - "version": 215, - "server_code_error": " ", - "issingle": 1 - }, - { - "name": "Plot Control", - "doctype": "DocType" - } -] \ No newline at end of file diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js index a4d8ee6b0e3..cf7b515d08a 100644 --- a/selling/doctype/quotation/quotation.js +++ b/selling/doctype/quotation/quotation.js @@ -28,6 +28,7 @@ wn.require('app/utilities/doctype/sms_control/sms_control.js'); // ONLOAD // =================================================================================== cur_frm.cscript.onload = function(doc, cdt, cdn) { + cur_frm.cscript.manage_rounded_total(); if(!doc.quotation_to) hide_field(['customer','customer_address','contact_person','customer_name','lead', 'lead_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']); if(!doc.price_list_name) set_multiple(cdt,cdn,{price_list_name:sys_defaults.price_list_name}); if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'}); diff --git a/selling/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py index 6c1300b28d7..c154a6a3b0c 100644 --- a/selling/doctype/quotation/quotation.py +++ b/selling/doctype/quotation/quotation.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, getdate -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js index 6a618c9a1ad..867a711fe47 100644 --- a/selling/doctype/sales_common/sales_common.js +++ b/selling/doctype/sales_common/sales_common.js @@ -182,27 +182,37 @@ cur_frm.cscript.hide_price_list_currency = function(doc, cdt, cdn, callback1) { if (doc.plc_conversion_rate != 1) set_multiple(cdt, cdn, {plc_conversion_rate:1}) hide_field(['price_list_currency', 'plc_conversion_rate']); - } + } } if (r.message[1] == doc.currency) { if (doc.conversion_rate != 1) set_multiple(cdt, cdn, {conversion_rate:1}); hide_field(['conversion_rate', 'grand_total_export', 'in_words_export', 'rounded_total_export']); - } else unhide_field(['conversion_rate', 'grand_total_export', 'in_words_export', 'rounded_total_export']); - + } else { + unhide_field(['conversion_rate', 'grand_total_export', 'in_words_export']); + if(!cint(sys_defaults.disable_rounded_total)) + unhide_field("rounded_total_export"); + } if (r.message[1] == doc.price_list_currency) { if (doc.plc_conversion_rate != 1) set_multiple(cdt, cdn, {plc_conversion_rate:1}); hide_field('plc_conversion_rate'); } else unhide_field('plc_conversion_rate'); - cur_frm.cscript.dynamic_label(doc, cdt, cdn, r.message[1], callback1); } }) } } +cur_frm.cscript.manage_rounded_total = function() { + if(cint(sys_defaults.disable_rounded_total)) { + cur_frm.set_df_property("rounded_total", "print_hide", 1); + cur_frm.set_df_property("rounded_total_export", "print_hide", 1); + hide_field(["rounded_total", "rounded_total_export"]); + } +} + // TRIGGERS FOR CALCULATIONS // ===================================================================================================== diff --git a/selling/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py index 49dc9991e3c..797462a8534 100644 --- a/selling/doctype/sales_common/sales_common.py +++ b/selling/doctype/sales_common/sales_common.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cint, cstr, flt, getdate, nowdate, formatdate from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint, _ from setup.utils import get_company_currency diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js index 55854b5b92a..b7927543847 100644 --- a/selling/doctype/sales_order/sales_order.js +++ b/selling/doctype/sales_order/sales_order.js @@ -28,6 +28,8 @@ wn.require('app/utilities/doctype/sms_control/sms_control.js'); cur_frm.cscript.onload = function(doc, cdt, cdn) { + cur_frm.cscript.manage_rounded_total(); + if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'}); if(!doc.transaction_date) set_multiple(cdt,cdn,{transaction_date:get_today()}); if(!doc.price_list_currency) set_multiple(cdt, cdn, {price_list_currency: doc.currency, plc_conversion_rate: 1}); @@ -76,7 +78,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // indent if(!doc.order_type || (doc.order_type == 'Sales')) - cur_frm.add_custom_button('Make ' + wn._('Purchase Request'), cur_frm.cscript['Make Purchase Request']); + cur_frm.add_custom_button('Make ' + wn._('Material Request'), cur_frm.cscript['Make Material Request']); // sales invoice if(flt(doc.per_billed, 2) < 100) @@ -244,19 +246,19 @@ cur_frm.cscript.make_maintenance_visit = function() { } } -cur_frm.cscript['Make Purchase Request'] = function() { +cur_frm.cscript['Make Material Request'] = function() { var doc = cur_frm.doc; if (doc.docstatus == 1) { - n = wn.model.make_new_doc_and_get_name("Purchase Request"); + n = wn.model.make_new_doc_and_get_name("Material Request"); $c('dt_map', args={ - 'docs':wn.model.compress([locals["Purchase Request"][n]]), + 'docs':wn.model.compress([locals["Material Request"][n]]), 'from_doctype':'Sales Order', - 'to_doctype':'Purchase Request', + 'to_doctype':'Material Request', 'from_docname':doc.name, - 'from_to_list':"[['Sales Order', 'Purchase Request'], ['Sales Order Item', 'Purchase Request Item']]" + 'from_to_list':"[['Sales Order', 'Material Request'], ['Sales Order Item', 'Material Request Item']]" } , function(r,rt) { - loaddoc("Purchase Request", n); + loaddoc("Material Request", n); } ); } diff --git a/selling/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py index 868608123e3..b79a6d64f32 100644 --- a/selling/doctype/sales_order/sales_order.py +++ b/selling/doctype/sales_order/sales_order.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt, getdate -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/selling/doctype/sms_center/sms_center.py b/selling/doctype/sms_center/sms_center.py index 416b1ec4fa3..c5db7383f72 100644 --- a/selling/doctype/sms_center/sms_center.py +++ b/selling/doctype/sms_center/sms_center.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cstr from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/selling/page/sales_browser/sales_browser.py b/selling/page/sales_browser/sales_browser.py index 5b5e4b85d5f..b12c0f4d751 100644 --- a/selling/page/sales_browser/sales_browser.py +++ b/selling/page/sales_browser/sales_browser.py @@ -30,4 +30,4 @@ def add_node(): parent_field: webnotes.form_dict['parent'], "is_group": webnotes.form_dict['is_group'] }] - webnotes.model_wrapper(doclist).save() \ No newline at end of file + webnotes.bean(doclist).save() \ No newline at end of file diff --git a/selling/report/sales_orders_pending_to_be_delivered/sales_orders_pending_to_be_delivered.txt b/selling/report/sales_orders_pending_to_be_delivered/sales_orders_pending_to_be_delivered.txt index c62a5b4515e..288b5c5f442 100644 --- a/selling/report/sales_orders_pending_to_be_delivered/sales_orders_pending_to_be_delivered.txt +++ b/selling/report/sales_orders_pending_to_be_delivered/sales_orders_pending_to_be_delivered.txt @@ -1,20 +1,20 @@ [ { - "owner": "Administrator", + "creation": "2012-12-07 14:44:19", "docstatus": 0, - "creation": "2012-12-07 10:14:13", + "modified": "2013-02-21 11:43:20", "modified_by": "Administrator", - "modified": "2012-12-07 10:14:31" + "owner": "Administrator" }, { - "name": "__common__", - "ref_doctype": "Sales Order", "doctype": "Report", "is_standard": "Yes", - "query": "select \n `tabSales Order`.`name` as \"S.O. No.:Link/Sales Order:120\",\n `tabSales Order`.`transaction_date` as \"S.O. Date\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\",\n `tabSales Order`.`po_no` as \"P.O. No.\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc" + "name": "__common__", + "query": "select \n `tabSales Order`.`name` as \"S.O. No.:Link/Sales Order:120\",\n `tabSales Order`.`transaction_date` as \"S.O. Date\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\",\n `tabSales Order`.`po_no` as \"P.O. No.\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", + "ref_doctype": "Sales Order" }, { - "name": "Sales Orders Pending To Be Delivered", - "doctype": "Report" + "doctype": "Report", + "name": "Sales Orders Pending To Be Delivered" } ] \ No newline at end of file diff --git a/setup/doctype/authorization_control/authorization_control.py b/setup/doctype/authorization_control/authorization_control.py index 8e02bdf6172..33687c7fbe5 100644 --- a/setup/doctype/authorization_control/authorization_control.py +++ b/setup/doctype/authorization_control/authorization_control.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt, has_common, make_esc -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import session, msgprint from setup.utils import get_company_currency diff --git a/setup/doctype/authorization_rule/authorization_rule.py b/setup/doctype/authorization_rule/authorization_rule.py index be6c0aee33a..9f19701b8d5 100644 --- a/setup/doctype/authorization_rule/authorization_rule.py +++ b/setup/doctype/authorization_rule/authorization_rule.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cint, cstr, flt, has_common from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index a9d11c6cf44..94c8f1c929c 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -17,9 +17,10 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cstr, get_defaults, set_default +from webnotes.utils import cstr, set_default from webnotes.model.doc import Document from webnotes.model.code import get_obj +import webnotes.defaults sql = webnotes.conn.sql @@ -241,8 +242,7 @@ class DocType: #delete cost center sql("delete from `tabCost Center` WHERE company_name = %s order by lft desc, rgt desc", self.doc.name) - #update value as blank for tabDefaultValue defkey=company - sql("update `tabDefaultValue` set defvalue = '' where defkey='company' and defvalue = %s", self.doc.name) + webnotes.defaults.clear_default("company", value=self.doc.name) #update value as blank for tabSingles Global Defaults sql("update `tabSingles` set value = '' where doctype='Global Defaults' and field = 'default_company' and value = %s", self.doc.name) @@ -250,8 +250,8 @@ class DocType: # on rename # --------- - def on_rename(self,newdn,olddn): + def on_rename(self,newdn,olddn): sql("update `tabCompany` set company_name = '%s' where name = '%s'" %(newdn,olddn)) sql("update `tabSingles` set value = %s where doctype='Global Defaults' and field = 'default_company' and value = %s", (newdn, olddn)) - if get_defaults('company') == olddn: - set_default('company', newdn) \ No newline at end of file + if webnotes.defaults.get_global_default('company') == olddn: + webnotes.defaults.set_global_default('company', newdn) \ No newline at end of file diff --git a/setup/doctype/contact_control/contact_control.py b/setup/doctype/contact_control/contact_control.py index ed90b9985bf..3c37ecfac4d 100644 --- a/setup/doctype/contact_control/contact_control.py +++ b/setup/doctype/contact_control/contact_control.py @@ -5,7 +5,7 @@ import webnotes from webnotes.utils import set_default from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/setup/doctype/email_digest/email_digest.py b/setup/doctype/email_digest/email_digest.py index 01026aa6b63..9f28f132860 100644 --- a/setup/doctype/email_digest/email_digest.py +++ b/setup/doctype/email_digest/email_digest.py @@ -261,7 +261,7 @@ class DocType: return self.get_new_sum("Delivery Note", "New Delivery Notes", "grand_total") def get_new_purchase_requests(self): - return self.get_new_count("Purchase Request", "New Purchase Requests") + return self.get_new_count("Material Request", "New Material Requests") def get_new_supplier_quotations(self): return self.get_new_sum("Supplier Quotation", "New Supplier Quotations", diff --git a/setup/doctype/email_digest/email_digest.txt b/setup/doctype/email_digest/email_digest.txt index 316a840a5dd..0b40fb4b0c1 100644 --- a/setup/doctype/email_digest/email_digest.txt +++ b/setup/doctype/email_digest/email_digest.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-25 11:35:08", + "creation": "2013-02-18 13:36:19", "docstatus": 0, - "modified": "2013-02-16 14:43:52", + "modified": "2013-02-18 13:43:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -169,7 +169,7 @@ "doctype": "DocField", "fieldname": "new_purchase_requests", "fieldtype": "Check", - "label": "New Purchase Requests" + "label": "New Material Requests" }, { "doctype": "DocField", diff --git a/setup/doctype/email_digest/locale/_messages_doc.json b/setup/doctype/email_digest/locale/_messages_doc.json index 6083c27eeb5..9c41c66efd4 100644 --- a/setup/doctype/email_digest/locale/_messages_doc.json +++ b/setup/doctype/email_digest/locale/_messages_doc.json @@ -2,30 +2,36 @@ "New Leads", "Add/Remove Recipients", "Monthly", - "New Purchase Requests", + "Support", + "New Material Requests", "Send regular summary reports via Email.", "Select Digest Content", "Collections", "Expenses Booked", "Income", - "New Stock Entries", - "New Delivery Notes", + "Stock", + "To Do List", + "Selling", "Recipients", "Email Digest Settings", "Check all the items below that you want to send in this digest.", "New Quotations", "New Support Tickets", + "Buying", "New Communications", "New Projects", + "New Stock Entries", "Setup", "Enabled", "Daily", + "New Delivery Notes", "Payments", "Bank Balance", "How frequently?", "Payables", "New Enquiries", "New Sales Orders", + "Calendar Events", "New Purchase Receipts", "New Purchase Orders", "Receivables", @@ -34,7 +40,10 @@ "Next email will be sent on:", "New Supplier Quotations", "Income Year to Date", + "General", "Open Tickets", + "Accounts", + "Projects", "Email Digest", "Weekly" ] \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/_messages_js.json b/setup/doctype/email_digest/locale/_messages_js.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/setup/doctype/email_digest/locale/_messages_js.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/_messages_py.json b/setup/doctype/email_digest/locale/_messages_py.json new file mode 100644 index 00000000000..7915fc92bef --- /dev/null +++ b/setup/doctype/email_digest/locale/_messages_py.json @@ -0,0 +1,3 @@ +[ + "All Day" +] \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/ar-doc.json b/setup/doctype/email_digest/locale/ar-doc.json index dfbfb1ff970..17bea89dd28 100644 --- a/setup/doctype/email_digest/locale/ar-doc.json +++ b/setup/doctype/email_digest/locale/ar-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "\u062d\u0633\u0627\u0628\u0627\u062a", "Add/Remove Recipients": "\u0625\u0636\u0627\u0641\u0629 / \u0625\u0632\u0627\u0644\u0629 \u0627\u0644\u0645\u0633\u062a\u0644\u0645\u064a\u0646", "Bank Balance": "\u0627\u0644\u0628\u0646\u0643 \u0627\u0644\u0631\u0635\u064a\u062f", + "Buying": "\u0634\u0631\u0627\u0621", + "Calendar Events": "\u0627\u0644\u0623\u062d\u062f\u0627\u062b", "Check all the items below that you want to send in this digest.": "\u062a\u062d\u0642\u0642 \u0645\u0646 \u0643\u0644 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u062a\u064a \u062a\u0631\u064a\u062f \u0623\u062f\u0646\u0627\u0647 \u0644\u0625\u0631\u0633\u0627\u0644 \u0645\u0644\u062e\u0635 \u0641\u064a \u0647\u0630\u0627.", "Collections": "\u0645\u062c\u0645\u0648\u0639\u0627\u062a", "Daily": "\u064a\u0648\u0645\u064a\u0627", @@ -9,6 +12,7 @@ "Enabled": "\u062a\u0645\u0643\u064a\u0646", "Expenses Booked": "\u062d\u062c\u0632 \u0627\u0644\u0646\u0641\u0642\u0627\u062a", "For Company": "\u0644\u0634\u0631\u0643\u0629", + "General": "\u0639\u0627\u0645", "How frequently?": "\u0643\u064a\u0641 \u0643\u062b\u064a\u0631 \u0645\u0646 \u0627\u0644\u0623\u062d\u064a\u0627\u0646\u061f", "Income": "\u062f\u062e\u0644", "Income Year to Date": "\u0633\u0646\u0629 \u062f\u062e\u0644 \u0625\u0644\u0649 \u062a\u0627\u0631\u064a\u062e", @@ -17,6 +21,7 @@ "New Delivery Notes": "\u0645\u0644\u0627\u062d\u0638\u0627\u062a \u0627\u0644\u062a\u0633\u0644\u064a\u0645 \u062c\u062f\u064a\u062f\u0629", "New Enquiries": "\u0627\u0633\u062a\u0641\u0633\u0627\u0631\u0627\u062a \u062c\u062f\u064a\u062f\u0629", "New Leads": "\u062c\u062f\u064a\u062f \u0627\u0644\u0639\u0631\u0648\u0636", + "New Material Requests": "\u062a\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0627\u0644\u062c\u062f\u064a\u062f\u0629", "New Projects": "\u0645\u0634\u0627\u0631\u064a\u0639 \u062c\u062f\u064a\u062f\u0629", "New Purchase Orders": "\u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621 \u0627\u0644\u062c\u062f\u064a\u062f\u0629", "New Purchase Receipts": "\u0625\u064a\u0635\u0627\u0644\u0627\u062a \u0634\u0631\u0627\u0621 \u062c\u062f\u064a\u062f\u0629", @@ -31,10 +36,15 @@ "Open Tickets": "\u062a\u0630\u0627\u0643\u0631 \u0645\u0641\u062a\u0648\u062d\u0629", "Payables": "\u0627\u0644\u0630\u0645\u0645 \u0627\u0644\u062f\u0627\u0626\u0646\u0629", "Payments": "\u0627\u0644\u0645\u062f\u0641\u0648\u0639\u0627\u062a", + "Projects": "\u0645\u0634\u0627\u0631\u064a\u0639", "Receivables": "\u0627\u0644\u0645\u0633\u062a\u062d\u0642\u0627\u062a", "Recipients": "\u0627\u0644\u0645\u0633\u062a\u0644\u0645\u064a\u0646", "Select Digest Content": "\u062d\u062f\u062f \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u062f\u0627\u064a\u062c\u0633\u062a", + "Selling": "\u0628\u064a\u0639", "Send regular summary reports via Email.": "\u0625\u0631\u0633\u0627\u0644 \u062a\u0642\u0627\u0631\u064a\u0631 \u0645\u0648\u062c\u0632\u0629 \u0645\u0646\u062a\u0638\u0645\u0629 \u0639\u0646 \u0637\u0631\u064a\u0642 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a.", "Setup": "\u0627\u0644\u0625\u0639\u062f\u0627\u062f", + "Stock": "\u0627\u0644\u0623\u0648\u0631\u0627\u0642 \u0627\u0644\u0645\u0627\u0644\u064a\u0629", + "Support": "\u062f\u0639\u0645", + "To Do List": "\u0648\u0627\u0644\u0642\u064a\u0627\u0645 \u0642\u0627\u0626\u0645\u0629", "Weekly": "\u0627\u0644\u0623\u0633\u0628\u0648\u0639\u064a\u0629" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/ar-py.json b/setup/doctype/email_digest/locale/ar-py.json new file mode 100644 index 00000000000..d5fb10db0a1 --- /dev/null +++ b/setup/doctype/email_digest/locale/ar-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "\u0643\u0644 \u064a\u0648\u0645" +} \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/es-doc.json b/setup/doctype/email_digest/locale/es-doc.json index 8ae33a3a78c..a73a601fccb 100644 --- a/setup/doctype/email_digest/locale/es-doc.json +++ b/setup/doctype/email_digest/locale/es-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "Cuentas", "Add/Remove Recipients": "Agregar / Quitar destinatarios", "Bank Balance": "Saldo bancario", + "Buying": "Comprar", + "Calendar Events": "Calendario de Eventos", "Check all the items below that you want to send in this digest.": "Compruebe todos los puntos a continuaci\u00f3n que desea enviar en este compendio.", "Collections": "Colecciones", "Daily": "Diario", @@ -9,6 +12,7 @@ "Enabled": "Habilitado", "Expenses Booked": "Gastos Reservados", "For Company": "Para la empresa", + "General": "General", "How frequently?": "\u00bfCon qu\u00e9 frecuencia?", "Income": "Ingresos", "Income Year to Date": "Los ingresos a\u00f1o a la fecha", @@ -17,6 +21,7 @@ "New Delivery Notes": "Nuevos T\u00edtulos de entrega", "New Enquiries": "Nueva Consultas", "New Leads": "New Leads", + "New Material Requests": "Pide Nuevo Material", "New Projects": "Nuevos Proyectos", "New Purchase Orders": "Nuevas \u00f3rdenes de compra", "New Purchase Receipts": "Nuevos recibos de compra", @@ -31,10 +36,15 @@ "Open Tickets": "Entradas Abierto", "Payables": "Cuentas por pagar", "Payments": "Pagos", + "Projects": "Proyectos", "Receivables": "Cuentas por cobrar", "Recipients": "Destinatarios", "Select Digest Content": "Seleccione Contenido Resumen", + "Selling": "De venta", "Send regular summary reports via Email.": "Enviar informes resumidos peri\u00f3dicos por correo electr\u00f3nico.", "Setup": "Disposici\u00f3n", + "Stock": "Valores", + "Support": "Apoyar", + "To Do List": "Para hacer la lista", "Weekly": "Semanal" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/es-py.json b/setup/doctype/email_digest/locale/es-py.json new file mode 100644 index 00000000000..169da1e9d1b --- /dev/null +++ b/setup/doctype/email_digest/locale/es-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "Todo el d\u00eda" +} \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/fr-doc.json b/setup/doctype/email_digest/locale/fr-doc.json index f6b8ae2e6eb..69a18329eca 100644 --- a/setup/doctype/email_digest/locale/fr-doc.json +++ b/setup/doctype/email_digest/locale/fr-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "Comptes", "Add/Remove Recipients": "Ajouter / supprimer des destinataires", "Bank Balance": "Solde bancaire", + "Buying": "Achat", + "Calendar Events": "Calendrier des \u00e9v\u00e9nements", "Check all the items below that you want to send in this digest.": "V\u00e9rifiez tous les points ci-dessous que vous souhaitez envoyer dans ce recueil.", "Collections": "Collections", "Daily": "Quotidien", @@ -9,6 +12,7 @@ "Enabled": "Activ\u00e9", "Expenses Booked": "D\u00e9penses R\u00e9serv\u00e9", "For Company": "Pour l'entreprise", + "General": "G\u00e9n\u00e9ral", "How frequently?": "Quelle est la fr\u00e9quence?", "Income": "Revenu", "Income Year to Date": "Ann\u00e9e revenu \u00e0 ce jour", @@ -17,6 +21,7 @@ "New Delivery Notes": "Nouveaux bons de livraison", "New Enquiries": "New Renseignements", "New Leads": "New Leads", + "New Material Requests": "Demandes des mat\u00e9riaux nouveaux", "New Projects": "Nouveaux projets", "New Purchase Orders": "De nouvelles commandes", "New Purchase Receipts": "Re\u00e7us d'achat de nouveaux", @@ -31,10 +36,15 @@ "Open Tickets": "Open Billets", "Payables": "Dettes", "Payments": "Paiements", + "Projects": "Projets", "Receivables": "Cr\u00e9ances", "Recipients": "R\u00e9cipiendaires", "Select Digest Content": "S\u00e9lectionner le contenu Digest", + "Selling": "Vente", "Send regular summary reports via Email.": "Envoyer des rapports de synth\u00e8se r\u00e9guliers par e-mail.", "Setup": "Installation", + "Stock": "Stock", + "Support": "Soutenir", + "To Do List": "To Do List", "Weekly": "Hebdomadaire" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/fr-py.json b/setup/doctype/email_digest/locale/fr-py.json new file mode 100644 index 00000000000..bcb19e382b5 --- /dev/null +++ b/setup/doctype/email_digest/locale/fr-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "Toute la journ\u00e9e" +} \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/hi-doc.json b/setup/doctype/email_digest/locale/hi-doc.json index bf95d86f560..7373775776d 100644 --- a/setup/doctype/email_digest/locale/hi-doc.json +++ b/setup/doctype/email_digest/locale/hi-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "\u0932\u0947\u0916\u093e", "Add/Remove Recipients": "\u092a\u094d\u0930\u093e\u092a\u094d\u0924\u0915\u0930\u094d\u0924\u093e \u091c\u094b\u0921\u093c\u0947\u0902 / \u0928\u093f\u0915\u093e\u0932\u0947\u0902", "Bank Balance": "\u092c\u0948\u0902\u0915 \u0936\u0947\u0937", + "Buying": "\u0915\u094d\u0930\u092f", + "Calendar Events": "\u0915\u0948\u0932\u0947\u0902\u0921\u0930 \u0918\u091f\u0928\u093e\u0913\u0902", "Check all the items below that you want to send in this digest.": "\u0938\u092d\u0940 \u0906\u0907\u091f\u092e \u0928\u0940\u091a\u0947 \u0939\u0948 \u0915\u093f \u0906\u092a \u0907\u0938 \u0921\u093e\u0907\u091c\u0947\u0938\u094d\u091f \u092e\u0947\u0902 \u092d\u0947\u091c\u0928\u093e \u091a\u093e\u0939\u0924\u0947 \u0939\u0948\u0902 \u0915\u0940 \u091c\u093e\u0901\u091a \u0915\u0930\u0947\u0902.", "Collections": "\u0938\u0902\u0917\u094d\u0930\u0939", "Daily": "\u0926\u0948\u0928\u093f\u0915", @@ -9,6 +12,7 @@ "Enabled": "Enabled", "Expenses Booked": "\u0935\u094d\u092f\u092f \u092c\u0941\u0915", "For Company": "\u0915\u0902\u092a\u0928\u0940 \u0915\u0947 \u0932\u093f\u090f", + "General": "\u0938\u093e\u092e\u093e\u0928\u094d\u092f", "How frequently?": "\u0915\u093f\u0924\u0928\u0940 \u092c\u093e\u0930?", "Income": "\u0906\u092f", "Income Year to Date": "\u0906\u092f \u0924\u093f\u0925\u093f \u0935\u0930\u094d\u0937", @@ -17,6 +21,7 @@ "New Delivery Notes": "\u0928\u0908 \u0935\u093f\u0924\u0930\u0923 \u0928\u094b\u091f", "New Enquiries": "\u0928\u0908 \u092a\u0942\u091b\u0924\u093e\u091b", "New Leads": "\u0928\u090f \u0938\u0941\u0930\u093e\u0917", + "New Material Requests": "\u0928\u0908 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927", "New Projects": "\u0928\u0908 \u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e\u090f\u0902", "New Purchase Orders": "\u0928\u0908 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936", "New Purchase Receipts": "\u0928\u0908 \u0916\u0930\u0940\u0926 \u0930\u0938\u0940\u0926", @@ -31,10 +36,15 @@ "Open Tickets": "\u0913\u092a\u0928 \u091f\u093f\u0915\u091f", "Payables": "\u0926\u0947\u092f", "Payments": "\u092d\u0941\u0917\u0924\u093e\u0928", + "Projects": "\u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e\u0913\u0902", "Receivables": "\u092a\u094d\u0930\u093e\u092a\u094d\u092f", "Recipients": "\u092a\u094d\u0930\u093e\u092a\u094d\u0924\u0915\u0930\u094d\u0924\u093e", "Select Digest Content": "\u0921\u093e\u0907\u091c\u0947\u0938\u094d\u091f \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", + "Selling": "\u0935\u093f\u0915\u094d\u0930\u092f", "Send regular summary reports via Email.": "\u0908\u092e\u0947\u0932 \u0915\u0947 \u092e\u093e\u0927\u094d\u092f\u092e \u0938\u0947 \u0928\u093f\u092f\u092e\u093f\u0924 \u0930\u0942\u092a \u0938\u0947 \u0938\u093e\u0930\u093e\u0902\u0936 \u0930\u093f\u092a\u094b\u0930\u094d\u091f \u092d\u0947\u091c\u0947\u0902.", "Setup": "\u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e", + "Stock": "\u0938\u094d\u091f\u0949\u0915", + "Support": "\u0938\u092e\u0930\u094d\u0925\u0928", + "To Do List": "\u0938\u0942\u091a\u0940", "Weekly": "\u0938\u093e\u092a\u094d\u0924\u093e\u0939\u093f\u0915" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/hi-py.json b/setup/doctype/email_digest/locale/hi-py.json new file mode 100644 index 00000000000..68bbeb24570 --- /dev/null +++ b/setup/doctype/email_digest/locale/hi-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "\u0938\u092d\u0940 \u0926\u093f\u0928" +} \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/hr-doc.json b/setup/doctype/email_digest/locale/hr-doc.json index 88e1606f78a..cfe92b2d06a 100644 --- a/setup/doctype/email_digest/locale/hr-doc.json +++ b/setup/doctype/email_digest/locale/hr-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "Ra\u010duni", "Add/Remove Recipients": "Dodaj / Ukloni primatelja", "Bank Balance": "Banka bilanca", + "Buying": "Kupovina", + "Calendar Events": "Kalendar doga\u0111anja", "Check all the items below that you want to send in this digest.": "Provjerite sve stavke u nastavku koje \u017eelite poslati u ovom svariti.", "Collections": "Zbirke", "Daily": "Svakodnevno", @@ -9,6 +12,7 @@ "Enabled": "Omogu\u0107eno", "Expenses Booked": "Rashodi Rezervirani", "For Company": "Za tvrtke", + "General": "Op\u0107i", "How frequently?": "Kako \u010desto?", "Income": "Dohodak", "Income Year to Date": "Prihodi godine do danas", @@ -17,6 +21,7 @@ "New Delivery Notes": "Novi otpremnice", "New Enquiries": "Novi Upiti", "New Leads": "Nova vodi", + "New Material Requests": "Novi materijal Zahtjevi", "New Projects": "Novi projekti", "New Purchase Orders": "Novi narud\u017ebenice", "New Purchase Receipts": "Novi Kupnja Primici", @@ -31,10 +36,15 @@ "Open Tickets": "Otvoreni Ulaznice", "Payables": "Obveze", "Payments": "Pla\u0107anja", + "Projects": "Projekti", "Receivables": "Potra\u017eivanja", "Recipients": "Primatelji", "Select Digest Content": "Odaberite Digest sadr\u017eaj", + "Selling": "Prodaja", "Send regular summary reports via Email.": "Po\u0161alji redovite sa\u017eetak izvje\u0161\u0107a putem e-po\u0161te.", "Setup": "Postavljanje", + "Stock": "Zaliha", + "Support": "Podr\u017eati", + "To Do List": "Da li popis", "Weekly": "Tjedni" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/hr-py.json b/setup/doctype/email_digest/locale/hr-py.json new file mode 100644 index 00000000000..383bc7eb101 --- /dev/null +++ b/setup/doctype/email_digest/locale/hr-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "All Day" +} \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/nl-doc.json b/setup/doctype/email_digest/locale/nl-doc.json index da3d85dfab4..1fd67696119 100644 --- a/setup/doctype/email_digest/locale/nl-doc.json +++ b/setup/doctype/email_digest/locale/nl-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "Accounts", "Add/Remove Recipients": "Toevoegen / verwijderen Ontvangers", "Bank Balance": "Bank Balance", + "Buying": "Het kopen", + "Calendar Events": "Kalender Evenementen", "Check all the items below that you want to send in this digest.": "Controleer alle onderstaande items die u wilt verzenden in deze verteren.", "Collections": "Collecties", "Daily": "Dagelijks", @@ -9,6 +12,7 @@ "Enabled": "Ingeschakeld", "Expenses Booked": "Kosten geboekt", "For Company": "Voor Bedrijf", + "General": "Algemeen", "How frequently?": "Hoe vaak?", "Income": "Inkomen", "Income Year to Date": "Inkomsten Jaar tot datum", @@ -17,6 +21,7 @@ "New Delivery Notes": "Nieuwe Delivery Notes", "New Enquiries": "Nieuwe Inlichtingen", "New Leads": "Nieuwe leads", + "New Material Requests": "Nieuw Materiaal Verzoeken", "New Projects": "Nieuwe projecten", "New Purchase Orders": "Nieuwe bestellingen", "New Purchase Receipts": "Nieuwe aankoopbonnen", @@ -31,10 +36,15 @@ "Open Tickets": "Open Kaarten", "Payables": "Schulden", "Payments": "Betalingen", + "Projects": "Projecten", "Receivables": "Vorderingen", "Recipients": "Ontvangers", "Select Digest Content": "Selecteer Digest Inhoud", + "Selling": "Selling", "Send regular summary reports via Email.": "Stuur regelmatig beknopte verslagen via e-mail.", "Setup": "Setup", + "Stock": "Voorraad", + "Support": "Ondersteunen", + "To Do List": "To Do List", "Weekly": "Wekelijks" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/nl-py.json b/setup/doctype/email_digest/locale/nl-py.json new file mode 100644 index 00000000000..383bc7eb101 --- /dev/null +++ b/setup/doctype/email_digest/locale/nl-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "All Day" +} \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/pt-doc.json b/setup/doctype/email_digest/locale/pt-doc.json index bc618b6997d..413bec16455 100644 --- a/setup/doctype/email_digest/locale/pt-doc.json +++ b/setup/doctype/email_digest/locale/pt-doc.json @@ -1,6 +1,9 @@ { + "Accounts": "Contas", "Add/Remove Recipients": "Adicionar / Remover Destinat\u00e1rios", "Bank Balance": "Saldo Banco", + "Buying": "Comprar", + "Calendar Events": "Calend\u00e1rio de Eventos", "Check all the items below that you want to send in this digest.": "Verifique todos os itens abaixo que voc\u00ea deseja enviar esta digerir.", "Collections": "Cole\u00e7\u00f5es", "Daily": "Di\u00e1rio", @@ -9,6 +12,7 @@ "Enabled": "Habilitado", "Expenses Booked": "Despesas Reservado", "For Company": "Para a Empresa", + "General": "Geral", "How frequently?": "Com que freq\u00fc\u00eancia?", "Income": "Renda", "Income Year to Date": "Ano renda para Data", @@ -17,6 +21,7 @@ "New Delivery Notes": "Novas notas de entrega", "New Enquiries": "Consultas novo", "New Leads": "Nova leva", + "New Material Requests": "Novos Pedidos Materiais", "New Projects": "Novos Projetos", "New Purchase Orders": "Novas ordens de compra", "New Purchase Receipts": "Novos recibos de compra", @@ -31,10 +36,15 @@ "Open Tickets": "Bilhetes abertas", "Payables": "Contas a pagar", "Payments": "Pagamentos", + "Projects": "Projetos", "Receivables": "Receb\u00edveis", "Recipients": "Destinat\u00e1rios", "Select Digest Content": "Selecione o conte\u00fado Digest", + "Selling": "Vendendo", "Send regular summary reports via Email.": "Enviar relat\u00f3rios resumidos regulares via e-mail.", "Setup": "Instala\u00e7\u00e3o", + "Stock": "Estoque", + "Support": "Apoiar", + "To Do List": "Para fazer a lista", "Weekly": "Semanal" } \ No newline at end of file diff --git a/setup/doctype/email_digest/locale/pt-py.json b/setup/doctype/email_digest/locale/pt-py.json new file mode 100644 index 00000000000..60c9c66a1af --- /dev/null +++ b/setup/doctype/email_digest/locale/pt-py.json @@ -0,0 +1,3 @@ +{ + "All Day": "Dia de Todos os" +} \ No newline at end of file diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt index 1359508c264..18a01dc913a 100644 --- a/setup/doctype/features_setup/features_setup.txt +++ b/setup/doctype/features_setup/features_setup.txt @@ -1,53 +1,42 @@ [ { - "owner": "Administrator", + "creation": "2012-12-20 12:50:49", "docstatus": 0, - "creation": "2012-04-13 11:56:31", + "modified": "2013-02-18 13:44:28", "modified_by": "Administrator", - "modified": "2012-12-10 18:30:00" + "owner": "Administrator" }, { - "section_style": "Simple", - "module": "Setup", "doctype": "DocType", "issingle": 1, + "module": "Setup", "name": "__common__", - "colour": "White:FFF", - "_last_update": "1323840127", - "show_in_menu": 1, - "name_case": "Title Case", - "version": 1 + "name_case": "Title Case" }, { - "name": "__common__", - "parent": "Features Setup", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Features Setup", - "read": 1, + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Features Setup", + "parentfield": "permissions", "parenttype": "DocType", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 0, + "submit": 0, + "write": 1 }, { - "name": "Features Setup", - "doctype": "DocType" - }, - { - "role": "System Manager", - "doctype": "DocPerm" - }, - { - "role": "Administrator", - "doctype": "DocPerm" + "doctype": "DocType", + "name": "Features Setup" }, { "doctype": "DocField", @@ -57,63 +46,57 @@ }, { "description": "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Item Serial Nos", "fieldname": "fs_item_serial_nos", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Item Serial Nos" }, { "description": "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc", - "colour": "White:FFF", "doctype": "DocField", - "label": "Item Batch Nos", "fieldname": "fs_item_batch_nos", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Item Batch Nos" }, { - "description": "To track brand name in the following documents
\nDelivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", - "colour": "White:FFF", + "description": "To track brand name in the following documents
\nDelivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", "doctype": "DocField", - "label": "Brands", "fieldname": "fs_brands", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Brands" }, { "description": "To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.", "doctype": "DocField", - "label": "Item Barcode", "fieldname": "fs_item_barcode", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Item Barcode" }, { + "doctype": "DocField", "fieldname": "column_break0", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "1. To maintain the customer wise item code and to make them searchable based on their code use this option", - "colour": "White:FFF", "doctype": "DocField", - "label": "Item Advanced", "fieldname": "fs_item_advanced", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Item Advanced" }, { "description": "If Sale BOM is defined, the actual BOM of the Pack is displayed as table.\nAvailable in Delivery Note and Sales Order", - "colour": "White:FFF", "doctype": "DocField", - "label": "Packing Detials", "fieldname": "fs_packing_details", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Packing Detials" }, { "description": "To get Item Group in details table", - "colour": "White:FFF", "doctype": "DocField", - "label": "Item Groups in Details", "fieldname": "fs_item_group_in_details", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Item Groups in Details" }, { "doctype": "DocField", @@ -123,63 +106,57 @@ }, { "description": "All export related fields like currency, conversion rate, export total, export grand total etc are available in
\nDelivery Note, POS, Quotation, Sales Invoice, Sales Order etc.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Exports", "fieldname": "fs_exports", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Exports" }, { "description": "All import related fields like currency, conversion rate, import total, import grand total etc are available in
\nPurchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Imports", "fieldname": "fs_imports", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Imports" }, { + "doctype": "DocField", "fieldname": "column_break1", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "Field available in Delivery Note, Quotation, Sales Invoice, Sales Order", - "colour": "White:FFF", "doctype": "DocField", - "label": "Sales Discounts", "fieldname": "fs_discounts", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Sales Discounts" }, { "description": "Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice", - "colour": "White:FFF", "doctype": "DocField", - "label": "Purchase Discounts", "fieldname": "fs_purchase_discounts", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Purchase Discounts" }, { "description": "To track any installation or commissioning related work after sales", - "colour": "White:FFF", "doctype": "DocField", - "label": "After Sale Installations", "fieldname": "fs_after_sales_installations", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "After Sale Installations" }, { "description": "Available in \nBOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet", "doctype": "DocField", - "label": "Projects", "fieldname": "fs_projects", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Projects" }, { "description": "If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity", - "colour": "White:FFF", "doctype": "DocField", - "label": "Sales Extras", "fieldname": "fs_sales_extras", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Sales Extras" }, { "doctype": "DocField", @@ -189,24 +166,22 @@ }, { "description": "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Recurring Invoice", "fieldname": "fs_recurring_invoice", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Recurring Invoice" }, { + "doctype": "DocField", "fieldname": "column_break2", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "To enable Point of Sale features", - "colour": "White:FFF", "doctype": "DocField", - "label": "Point of Sale", "fieldname": "fs_pos", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Point of Sale" }, { "doctype": "DocField", @@ -216,24 +191,22 @@ }, { "description": "If you involve in manufacturing activity
\nEnables item Is Manufactured", - "colour": "White:FFF", "doctype": "DocField", - "label": "Manufacturing", "fieldname": "fs_manufacturing", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Manufacturing" }, { + "doctype": "DocField", "fieldname": "column_break3", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "If you follow Quality Inspection
\nEnables item QA Required and QA No in Purchase Receipt", - "colour": "White:FFF", "doctype": "DocField", - "label": "Quality", "fieldname": "fs_quality", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Quality" }, { "doctype": "DocField", @@ -243,23 +216,29 @@ }, { "description": "If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page", - "colour": "White:FFF", "doctype": "DocField", - "label": "Page Break", "fieldname": "fs_page_break", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Page Break" }, { + "doctype": "DocField", "fieldname": "column_break4", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "Enables More Info. in all documents", - "colour": "White:FFF", "doctype": "DocField", - "label": "More Info", "fieldname": "fs_more_info", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "More Info" + }, + { + "doctype": "DocPerm", + "role": "System Manager" + }, + { + "doctype": "DocPerm", + "role": "Administrator" } ] \ No newline at end of file diff --git a/setup/doctype/features_setup/locale/_messages_doc.json b/setup/doctype/features_setup/locale/_messages_doc.json index eea82bb0006..369d0ed8d50 100644 --- a/setup/doctype/features_setup/locale/_messages_doc.json +++ b/setup/doctype/features_setup/locale/_messages_doc.json @@ -2,7 +2,6 @@ "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.", "Purchase Discounts", "To enable Point of Sale features", - "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", "To get Item Group in details table", "If you involve in manufacturing activity
Enables item Is Manufactured", "Features Setup", @@ -38,6 +37,7 @@ "Imports", "If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity", "To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc", "After Sale Installations", "Projects", diff --git a/setup/doctype/features_setup/locale/ar-doc.json b/setup/doctype/features_setup/locale/ar-doc.json index 7befc8b6dc8..66f5dcac288 100644 --- a/setup/doctype/features_setup/locale/ar-doc.json +++ b/setup/doctype/features_setup/locale/ar-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "\u0644\u062a\u0645\u0643\u064a\u0646 \u0646\u0642\u0637\u0629 \u0645\u0646 \u0627\u0644\u0645\u064a\u0632\u0627\u062a \u0628\u064a\u0639", "To get Item Group in details table": "\u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629 \u0641\u064a \u0627\u0644\u062c\u062f\u0648\u0644 \u062a\u0641\u0627\u0635\u064a\u0644", "To track any installation or commissioning related work after sales": "\u0644\u062a\u062a\u0628\u0639 \u0623\u064a \u062a\u0631\u0643\u064a\u0628 \u0623\u0648 \u0627\u0644\u0623\u0639\u0645\u0627\u0644 \u0630\u0627\u062a \u0627\u0644\u0635\u0644\u0629 \u0627\u0644\u062a\u0643\u0644\u064a\u0641 \u0628\u0639\u062f \u0627\u0644\u0628\u064a\u0639", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "\u0644\u062a\u0639\u0642\u0628 \u0627\u0633\u0645 \u0627\u0644\u0639\u0644\u0627\u0645\u0629 \u0627\u0644\u062a\u062c\u0627\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0648\u062b\u0627\u0626\u0642 \u0627\u0644\u062a\u0627\u0644\u064a\u0629
\u0645\u0644\u0627\u062d\u0638\u0629 \u0627\u0644\u062a\u0633\u0644\u064a\u0645\u060c Enuiry\u060c \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f\u060c \u0627\u0644\u0645\u062f\u064a\u0646\u0629\u060c \u0623\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621\u060c \u0642\u0633\u064a\u0645\u0629 \u0634\u0631\u0627\u0621 \u0648\u0627\u0633\u062a\u0644\u0627\u0645 \u0627\u0644\u0645\u0634\u062a\u0631\u064a\u060c \u0627\u0642\u062a\u0628\u0627\u0633\u060c \u0641\u0627\u062a\u0648\u0631\u0629 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a\u060c BOM \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a\u060c \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a\u060c \u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0644\u0633\u0644", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "\u0644\u062a\u0639\u0642\u0628 \u0627\u0633\u0645 \u0627\u0644\u0639\u0644\u0627\u0645\u0629 \u0627\u0644\u062a\u062c\u0627\u0631\u064a\u0629 \u0641\u064a \u0627\u0644\u0648\u062b\u0627\u0626\u0642 \u0627\u0644\u062a\u0627\u0644\u064a\u0629
\u0645\u0644\u0627\u062d\u0638\u0629 \u0627\u0644\u062a\u0633\u0644\u064a\u0645\u060c Enuiry\u060c \u0637\u0644\u0628 \u0634\u0631\u0627\u0621\u060c \u0627\u0644\u0645\u062f\u064a\u0646\u0629\u060c \u0623\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621\u060c \u0642\u0633\u064a\u0645\u0629 \u0634\u0631\u0627\u0621 \u0648\u0627\u0633\u062a\u0644\u0627\u0645 \u0627\u0644\u0645\u0634\u062a\u0631\u064a\u060c \u0627\u0642\u062a\u0628\u0627\u0633\u060c \u0641\u0627\u062a\u0648\u0631\u0629 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a\u060c BOM \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a\u060c \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a\u060c \u0631\u0642\u0645 \u0627\u0644\u0645\u0633\u0644\u0633\u0644", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "\u0644\u062a\u062a\u0628\u0639 \u0627\u0644\u0628\u0646\u062f \u0641\u064a \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0648\u062b\u0627\u0626\u0642 \u0627\u0644\u0634\u0631\u0627\u0621 \u0639\u0644\u0649 \u0623\u0633\u0627\u0633 \u063a \u0645\u0646 \u0627\u0644\u0645\u0633\u0644\u0633\u0644. \u0648\u064a\u0645\u0643\u0646 \u0623\u064a\u0636\u0627 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0647\u0630\u0647 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0644\u062a\u0639\u0642\u0628 \u0627\u0644\u0636\u0645\u0627\u0646 \u0644\u0644\u0645\u0646\u062a\u062c.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "\u0644\u062a\u0639\u0642\u0628 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0641\u064a \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0648\u062b\u0627\u0626\u0642 \u0627\u0644\u0634\u0631\u0627\u0621 \u0645\u0639 NOS \u062f\u0641\u0639\u0629
\u0627\u0644\u0635\u0646\u0627\u0639\u0629 \u0627\u0644\u0645\u0641\u0636\u0644: \u0627\u0644\u0643\u064a\u0645\u064a\u0627\u0621 \u0627\u0644\u062e", diff --git a/setup/doctype/features_setup/locale/es-doc.json b/setup/doctype/features_setup/locale/es-doc.json index 74c99121a74..f77869efdd1 100644 --- a/setup/doctype/features_setup/locale/es-doc.json +++ b/setup/doctype/features_setup/locale/es-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "Para habilitar Punto de Venta caracter\u00edsticas", "To get Item Group in details table": "Para obtener Grupo de art\u00edculos en tabla de Datos", "To track any installation or commissioning related work after sales": "Para el seguimiento de cualquier instalaci\u00f3n o puesta en servicio despu\u00e9s de la venta relacionados", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Para realizar el seguimiento de marca en los siguientes documentos
Nota de Entrega, Enuiry, solicitud de materiales, art\u00edculos, orden de compra, comprobantes de compra, el recibo de compra, cotizaci\u00f3n, factura de venta, lista de materiales de ventas, pedidos de venta, Serial No", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Para realizar el seguimiento de marca en los siguientes documentos
Nota de Entrega, Enuiry, solicitud de compra del art\u00edculo, orden de compra, comprobantes de compra, el recibo de compra, cotizaci\u00f3n, factura de venta, lista de materiales de ventas, pedidos de venta, Serial No", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "Para realizar el seguimiento elemento en documentos de ventas y compras en base a sus n\u00fameros de serie. Esto tambi\u00e9n se puede utilizar para rastrear detalles de la garant\u00eda del producto.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "Para el seguimiento de los elementos de documentos de ventas y compras con los n\u00fameros de lote
Industria de Preferencia: Productos qu\u00edmicos, etc", diff --git a/setup/doctype/features_setup/locale/fr-doc.json b/setup/doctype/features_setup/locale/fr-doc.json index 5113da2d5a3..04a06042493 100644 --- a/setup/doctype/features_setup/locale/fr-doc.json +++ b/setup/doctype/features_setup/locale/fr-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "Pour permettre Point de Vente fonctionnalit\u00e9s", "To get Item Group in details table": "Pour obtenir Groupe d'\u00e9l\u00e9ments dans le tableau de d\u00e9tails", "To track any installation or commissioning related work after sales": "Pour suivre toute installation ou mise en service apr\u00e8s-vente des travaux connexes", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Pour suivre la marque dans les documents suivants
Remarque livraison, Enuiry, Demande de Mat\u00e9riel, article, bon de commande, bon d'achat, facture de l'acheteur, devis, facture de vente, BOM des ventes, des commandes clients, N \u00b0 de s\u00e9rie", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Pour suivre la marque dans les documents suivants
Remarque livraison, Enuiry, demande d'achat, article, bon de commande, bon d'achat, facture de l'acheteur, devis, facture de vente, BOM des ventes, des commandes clients, N \u00b0 de s\u00e9rie", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "Pour suivre pi\u00e8ce documents de vente et d'achat en fonction de leurs num\u00e9ros de s\u00e9rie. Ce n'est peut \u00e9galement \u00eatre utilis\u00e9 pour suivre les d\u00e9tails de la garantie du produit.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "Pour suivre les articles de chiffre d'affaires et des documents d'achat avec nos lots
Industrie pr\u00e9f\u00e9r\u00e9: produits chimiques, etc", diff --git a/setup/doctype/features_setup/locale/hi-doc.json b/setup/doctype/features_setup/locale/hi-doc.json index b17ae71602e..5499461a606 100644 --- a/setup/doctype/features_setup/locale/hi-doc.json +++ b/setup/doctype/features_setup/locale/hi-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0938\u0941\u0935\u093f\u0927\u093e\u0913\u0902 \u0915\u0947 \u092a\u094d\u0935\u093e\u0907\u0902\u091f \u0915\u094b \u0938\u0915\u094d\u0937\u092e", "To get Item Group in details table": "\u0935\u093f\u0935\u0930\u0923 \u0924\u093e\u0932\u093f\u0915\u093e \u092e\u0947\u0902 \u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939", "To track any installation or commissioning related work after sales": "\u0915\u093f\u0938\u0940 \u092d\u0940 \u0938\u094d\u0925\u093e\u092a\u0928\u093e \u092f\u093e \u092c\u093f\u0915\u094d\u0930\u0940 \u0915\u0947 \u092c\u093e\u0926 \u0915\u092e\u0940\u0936\u0928 \u0938\u0947 \u0938\u0902\u092c\u0902\u0927\u093f\u0924 \u0915\u093e\u092e \u0915\u094b \u091f\u094d\u0930\u0948\u0915", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "\u0928\u093f\u092e\u094d\u0928\u0932\u093f\u0916\u093f\u0924 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u094b\u0902 \u092e\u0947\u0902 \u092c\u094d\u0930\u093e\u0902\u0921 \u0928\u093e\u092e \u091f\u094d\u0930\u0948\u0915
\u0921\u093f\u0932\u093f\u0935\u0930\u0940 \u0928\u094b\u091f, enuiry, \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927, \u0906\u0907\u091f\u092e, \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936, \u0916\u0930\u0940\u0926 \u0935\u093e\u0909\u091a\u0930, \u0915\u094d\u0930\u0947\u0924\u093e \u0930\u0938\u0940\u0926, \u0915\u094b\u091f\u0947\u0936\u0928, \u092c\u093f\u0915\u094d\u0930\u0940 \u091a\u093e\u0932\u093e\u0928, \u092c\u093f\u0915\u094d\u0930\u0940 BOM, \u0935\u093f\u0915\u094d\u0930\u092f \u0906\u0926\u0947\u0936, \u0928\u0939\u0940\u0902 \u0938\u0940\u0930\u093f\u092f\u0932", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "\u0928\u093f\u092e\u094d\u0928\u0932\u093f\u0916\u093f\u0924 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u094b\u0902 \u092e\u0947\u0902 \u092c\u094d\u0930\u093e\u0902\u0921 \u0928\u093e\u092e \u091f\u094d\u0930\u0948\u0915
\u0921\u093f\u0932\u093f\u0935\u0930\u0940 \u0928\u094b\u091f, enuiry, \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927, \u092e\u0926, \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936, \u0916\u0930\u0940\u0926 \u0935\u093e\u0909\u091a\u0930, \u0915\u094d\u0930\u0947\u0924\u093e \u0930\u0938\u0940\u0926, \u0915\u094b\u091f\u0947\u0936\u0928, \u092c\u093f\u0915\u094d\u0930\u0940 \u091a\u093e\u0932\u093e\u0928, \u092c\u093f\u0915\u094d\u0930\u0940 BOM, \u0935\u093f\u0915\u094d\u0930\u092f \u0906\u0926\u0947\u0936, \u0928\u0939\u0940\u0902 \u0938\u0940\u0930\u093f\u092f\u0932", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0914\u0930 \u0916\u0930\u0940\u0926 \u0915\u0947 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u094b\u0902 \u0915\u0947 \u0906\u0927\u093e\u0930 \u092a\u0930 \u0909\u0928\u0915\u0947 \u0927\u093e\u0930\u093e\u0935\u093e\u0939\u093f\u0915 \u0928\u0917 \u092e\u0947\u0902 \u0906\u0907\u091f\u092e \u092a\u0930 \u0928\u091c\u093c\u0930 \u0930\u0916\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f. \u092f\u0939 \u092d\u0940 \u0909\u0924\u094d\u092a\u093e\u0926 \u0915\u0940 \u0935\u093e\u0930\u0902\u091f\u0940 \u0915\u0947 \u0935\u093f\u0935\u0930\u0923 \u0915\u094b \u091f\u094d\u0930\u0948\u0915 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u092a\u094d\u0930\u092f\u094b\u0917 \u0915\u093f\u092f\u093e \u091c\u093e\u0924\u093e \u0939\u0948.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "\u092c\u0948\u091a \u0913\u092a\u0928 \u0938\u094d\u0915\u0942\u0932 \u0915\u0947 \u0938\u093e\u0925 \u092c\u093f\u0915\u094d\u0930\u0940 \u0914\u0930 \u0916\u0930\u0940\u0926 \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u094b\u0902 \u092e\u0947\u0902 \u0906\u0907\u091f\u092e\u094d\u0938 \u091f\u094d\u0930\u0948\u0915
\u092a\u0938\u0902\u0926\u0940\u0926\u093e \u0909\u0926\u094d\u092f\u094b\u0917: \u0906\u0926\u093f \u0930\u0938\u093e\u092f\u0928", diff --git a/setup/doctype/features_setup/locale/hr-doc.json b/setup/doctype/features_setup/locale/hr-doc.json index 0b7b3872ce0..08afeaf7b7e 100644 --- a/setup/doctype/features_setup/locale/hr-doc.json +++ b/setup/doctype/features_setup/locale/hr-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "Da biste omogu\u0107ili Point of Sale zna\u010dajke", "To get Item Group in details table": "Da biste dobili predmeta Group u tablici pojedinosti", "To track any installation or commissioning related work after sales": "Za pra\u0107enje bilo koju instalaciju ili pu\u0161tanje vezane raditi nakon prodaje", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Za pra\u0107enje branda u sljede\u0107im dokumentima
Otpremnica, Enuiry, Materijal zahtjev, to\u010dka, Narud\u017ebenica, Otkup bon, Kupac Potvrda, citat, prodaja Ra\u010dun, prodaja BOM, prodajnog naloga, Serijski br", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Za pra\u0107enje branda u sljede\u0107im dokumentima
Otpremnica, Enuiry, zahtjev za kupnju, to\u010dka, Narud\u017ebenica, Otkup bon, Kupac Potvrda, citat, prodaja Ra\u010dun, prodaja BOM, prodajnog naloga, Serijski br", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "Za pra\u0107enje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je tako\u0111er mo\u017ee koristiti za pra\u0107enje jamstvene podatke o proizvodu.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "Za pra\u0107enje stavke u prodaji i kupnji dokumenata s batch br
Pro\u0161le Industrija: Kemikalije itd", diff --git a/setup/doctype/features_setup/locale/nl-doc.json b/setup/doctype/features_setup/locale/nl-doc.json index d690c6f6687..953ed5c5c41 100644 --- a/setup/doctype/features_setup/locale/nl-doc.json +++ b/setup/doctype/features_setup/locale/nl-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "Om Point of Sale functies in te schakelen", "To get Item Group in details table": "Om Item Group te krijgen in details tabel", "To track any installation or commissioning related work after sales": "Om een \u200b\u200binstallatie of inbedrijfstelling gerelateerde werk na verkoop bij te houden", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Om merknaam te volgen in de volgende documenten
Levering Let op, Enuiry, Materiaal Request, punt, Inkooporder, Aankoopbon, Koper Ontvangst, Offerte, Sales Invoice, Sales BOM, Sales Order, Serienummer", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Om merknaam te volgen in de volgende documenten
Levering Let op, Enuiry, Purchase Request, punt, Inkooporder, Aankoopbon, Koper Ontvangst, Offerte, Sales Invoice, Sales BOM, Sales Order, Serienummer", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "Om object in verkoop-en inkoopdocumenten op basis van hun seri\u00eble nos. Dit wordt ook gebruikt om informatie over de garantie van het product volgen.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "Als u items in verkoop-en inkoopdocumenten volgen met batch nos
Voorkeur Industrie: Chemische stoffen, enz.", diff --git a/setup/doctype/features_setup/locale/pt-doc.json b/setup/doctype/features_setup/locale/pt-doc.json index 6f79a7e6048..1958db57705 100644 --- a/setup/doctype/features_setup/locale/pt-doc.json +++ b/setup/doctype/features_setup/locale/pt-doc.json @@ -41,6 +41,7 @@ "To enable Point of Sale features": "Para habilitar o Ponto de Venda caracter\u00edsticas", "To get Item Group in details table": "Para obter Grupo item na tabela de detalhes", "To track any installation or commissioning related work after sales": "Para rastrear qualquer instala\u00e7\u00e3o ou comissionamento trabalho relacionado ap\u00f3s vendas", + "To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Para acompanhar marca nos seguintes documentos
Nota de Entrega, Enuiry, solicitar material, Item, Ordem de Compra, comprovante de compra, recebimento Comprador, cota\u00e7\u00e3o, nota fiscal de venda, BOM Vendas, Ordem de Vendas, N \u00ba de S\u00e9rie", "To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No": "Para acompanhar marca nos seguintes documentos
Nota de Entrega, Enuiry, Pedido de Compra, Item, Ordem de Compra, comprovante de compra, recebimento Comprador, cota\u00e7\u00e3o, nota fiscal de venda, BOM Vendas, Ordem de Vendas, N \u00ba de S\u00e9rie", "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.": "Para acompanhar o item em documentos de vendas e de compras com base em seus n\u00fameros de ordem. Este \u00e9 tamb\u00e9m pode ser usada para rastrear detalhes sobre a garantia do produto.", "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc": "Para controlar os itens de vendas e documentos de compra com lotes n \u00ba s
Ind\u00fastria preferido: etc Chemicals", diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py index 1b93e7e2683..6f3ab4a71d2 100644 --- a/setup/doctype/global_defaults/global_defaults.py +++ b/setup/doctype/global_defaults/global_defaults.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals """Global Defaults""" import webnotes +import webnotes.defaults from webnotes.utils import cint keydict = { @@ -40,7 +41,8 @@ keydict = { 'account_url':'account_url', 'allow_negative_stock' : 'allow_negative_stock', 'maintain_same_rate' : 'maintain_same_rate', - 'session_expiry': 'session_expiry' + 'session_expiry': 'session_expiry', + 'disable_rounded_total': 'disable_rounded_total', } class DocType: @@ -82,4 +84,4 @@ class DocType: def get_defaults(self): - return webnotes.conn.get_defaults() + return webnotes.defaults.get_defaults() diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt index 3344a87f46c..960da7e231a 100644 --- a/setup/doctype/global_defaults/global_defaults.txt +++ b/setup/doctype/global_defaults/global_defaults.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-29 19:25:56", + "creation": "2013-02-19 12:28:27", "docstatus": 0, - "modified": "2013-02-13 09:56:28", + "modified": "2013-02-20 14:09:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -27,6 +27,8 @@ "permlevel": 0 }, { + "amend": 0, + "cancel": 0, "create": 1, "doctype": "DocPerm", "name": "__common__", @@ -183,7 +185,7 @@ "doctype": "DocField", "fieldname": "auto_indent", "fieldtype": "Check", - "label": "Raise Purchase Request when stock reaches re-order level" + "label": "Raise Material Request when stock reaches re-order level" }, { "default": "1", @@ -332,6 +334,13 @@ "label": "Delivery Note Required", "options": "No\nYes" }, + { + "description": "If disable, 'Rounded Total' field will not be visible in any transaction", + "doctype": "DocField", + "fieldname": "disable_rounded_total", + "fieldtype": "Check", + "label": "Disable Rounded Total" + }, { "doctype": "DocField", "fieldname": "buying", @@ -408,11 +417,6 @@ "fieldtype": "Data", "label": "SMS Sender Name" }, - { - "amend": 0, - "cancel": 0, - "doctype": "DocPerm" - }, { "doctype": "DocPerm" } diff --git a/setup/doctype/global_defaults/locale/_messages_doc.json b/setup/doctype/global_defaults/locale/_messages_doc.json index dc12886b814..ce466a64b4e 100644 --- a/setup/doctype/global_defaults/locale/_messages_doc.json +++ b/setup/doctype/global_defaults/locale/_messages_doc.json @@ -29,6 +29,7 @@ "Default Company", "Applicable only if valuation method is moving average", "Company", + "Raise Material Request when stock reaches re-order level", "Date Format", "Employee record is created using selected field. ", "HR", @@ -62,7 +63,6 @@ "# ###.##", "#.###", "Do not show any symbol like $ etc next to currencies.", - "Selling", "Percentage you are allowed to receive or deliver more against the quantity ordered.

For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units

", "Session Expiry", "Default Customer Group", @@ -78,7 +78,7 @@ "#,###", "Accounts", "Authorized Role (Frozen Entry)", - "Raise Purchase Request when stock reaches re-order level", + "Selling", "Default Territory", "Yes", "mm/dd/yyyy" diff --git a/setup/doctype/global_defaults/locale/ar-doc.json b/setup/doctype/global_defaults/locale/ar-doc.json index 83977499b9c..97794b4fca6 100644 --- a/setup/doctype/global_defaults/locale/ar-doc.json +++ b/setup/doctype/global_defaults/locale/ar-doc.json @@ -65,6 +65,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "\u0627\u0644\u062f\u0642\u0629 \u0644\u0644\u062d\u0642\u0648\u0644 \u062a\u0639\u0648\u064a\u0645 (\u0643\u0645\u064a\u0627\u062a\u060c \u0648\u0627\u0644\u062e\u0635\u0648\u0645\u0627\u062a \u0627\u0644\u062e \u0627\u0644\u0646\u0633\u0628 \u0627\u0644\u0645\u0626\u0648\u064a\u0629\u060c) \u0641\u0642\u0637 \u0644\u0644\u0639\u0631\u0636. \u0633\u0648\u0641 \u0644\u0627 \u064a\u0632\u0627\u0644 \u064a\u0637\u0641\u0648 \u0623\u0646 \u062a\u062d\u0633\u0628 \u0645\u0627 \u064a\u0635\u0644 \u0625\u0644\u0649 6 \u0639\u0634\u0631\u064a\u0629.", "Purchase Order Required": "\u0623\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621 \u0627\u0644\u0645\u0637\u0644\u0648\u0628\u0629", "Purchase Receipt Required": "\u0645\u0637\u0644\u0648\u0628 \u0625\u064a\u0635\u0627\u0644 \u0627\u0644\u0634\u0631\u0627\u0621", + "Raise Material Request when stock reaches re-order level": "\u0631\u0641\u0639 \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0639\u0646\u062f \u0627\u0644\u0623\u0633\u0647\u0645 \u062a\u0635\u0644 \u0625\u0644\u0649 \u0645\u0633\u062a\u0648\u0649 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0637\u0644\u0628", "Raise Purchase Request when stock reaches re-order level": "\u0631\u0641\u0639 \u0637\u0644\u0628 \u0634\u0631\u0627\u0621 \u0627\u0644\u0623\u0633\u0647\u0645 \u0639\u0646\u062f\u0645\u0627 \u064a\u0635\u0644 \u0645\u0633\u062a\u0648\u0649 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0637\u0644\u0628", "SMS Sender Name": "SMS \u0627\u0644\u0645\u0631\u0633\u0644 \u0627\u0633\u0645", "Sales Order Required": "\u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0627\u0644\u0645\u0637\u0644\u0648\u0628\u0629", diff --git a/setup/doctype/global_defaults/locale/es-doc.json b/setup/doctype/global_defaults/locale/es-doc.json index dddf6783acd..3c2fbc79620 100644 --- a/setup/doctype/global_defaults/locale/es-doc.json +++ b/setup/doctype/global_defaults/locale/es-doc.json @@ -65,6 +65,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "Precisi\u00f3n de los campos de flotador (cantidades, descuentos, etc porcentajes) s\u00f3lo para su visualizaci\u00f3n. Siempre queda a\u00fan se calcular\u00e1n hasta 6 decimales.", "Purchase Order Required": "Orden de Compra Requerido", "Purchase Receipt Required": "Se requiere recibo de compra", + "Raise Material Request when stock reaches re-order level": "Levante solicitar material cuando el stock llega a re-ordenar nivel", "Raise Purchase Request when stock reaches re-order level": "Levante Solicitud de compra cuando el stock llega a re-ordenar nivel", "SMS Sender Name": "SMS Sender Name", "Sales Order Required": "Se requiere de \u00f3rdenes de venta", diff --git a/setup/doctype/global_defaults/locale/fr-doc.json b/setup/doctype/global_defaults/locale/fr-doc.json index 7428ec32307..1fffbf62536 100644 --- a/setup/doctype/global_defaults/locale/fr-doc.json +++ b/setup/doctype/global_defaults/locale/fr-doc.json @@ -65,6 +65,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "Pr\u00e9cision pour les champs flotteur (quantit\u00e9s, escomptes, etc pourcentages) uniquement pour l'affichage. Flotteurs seront toujours calcul\u00e9s jusqu'\u00e0 6 d\u00e9cimales.", "Purchase Order Required": "Bon de commande requis", "Purchase Receipt Required": "R\u00e9ception achat requis", + "Raise Material Request when stock reaches re-order level": "Soulever demande de mat\u00e9riel lorsque le stock atteint le niveau de r\u00e9approvisionnement", "Raise Purchase Request when stock reaches re-order level": "Soulever Demande d'achat lorsque le stock atteint le niveau de r\u00e9approvisionnement", "SMS Sender Name": "SMS Sender Nom", "Sales Order Required": "Commande obligatoire", diff --git a/setup/doctype/global_defaults/locale/hi-doc.json b/setup/doctype/global_defaults/locale/hi-doc.json index 0ffaf4e3559..589127b151f 100644 --- a/setup/doctype/global_defaults/locale/hi-doc.json +++ b/setup/doctype/global_defaults/locale/hi-doc.json @@ -65,6 +65,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "\u092a\u094d\u0930\u0947\u0938\u093f\u091c\u0928 \u0915\u0947\u0935\u0932 \u092a\u094d\u0930\u0926\u0930\u094d\u0936\u0928 \u0915\u0947 \u0932\u093f\u090f \u092b\u094d\u0932\u094b\u091f \u0915\u094d\u0937\u0947\u0924\u094d\u0930 (\u092e\u093e\u0924\u094d\u0930\u093e, \u091b\u0942\u091f, \u092a\u094d\u0930\u0924\u093f\u0936\u0924 \u0906\u0926\u093f) \u0915\u0947 \u0932\u093f\u090f. \u0924\u0948\u0930\u0924\u093e \u0905\u092d\u0940 \u092d\u0940 6 \u0926\u0936\u092e\u0932\u0935 \u0915\u0940 \u0917\u0923\u0928\u093e \u0915\u0940 \u091c\u093e.", "Purchase Order Required": "\u0916\u0930\u0940\u0926\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0906\u0935\u0936\u094d\u092f\u0915 \u0906\u0926\u0947\u0936", "Purchase Receipt Required": "\u0916\u0930\u0940\u0926 \u0930\u0938\u0940\u0926 \u0906\u0935\u0936\u094d\u092f\u0915", + "Raise Material Request when stock reaches re-order level": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0909\u0920\u093e\u090f\u0901 \u091c\u092c \u0936\u0947\u092f\u0930 \u092a\u0941\u0928\u0903 \u0906\u0926\u0947\u0936 \u0915\u0947 \u0938\u094d\u0924\u0930 \u0924\u0915 \u092a\u0939\u0941\u0901\u091a", "Raise Purchase Request when stock reaches re-order level": "\u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u091c\u092c \u0936\u0947\u092f\u0930 \u092a\u0941\u0928\u0903 \u0906\u0926\u0947\u0936 \u0915\u0947 \u0938\u094d\u0924\u0930 \u0924\u0915 \u092a\u0939\u0941\u0901\u091a \u0909\u0920\u093e\u090f\u0901", "SMS Sender Name": "\u090f\u0938\u090f\u092e\u090f\u0938 \u092a\u094d\u0930\u0947\u0937\u0915 \u0915\u093e \u0928\u093e\u092e", "Sales Order Required": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0906\u0935\u0936\u094d\u092f\u0915", diff --git a/setup/doctype/global_defaults/locale/hr-doc.json b/setup/doctype/global_defaults/locale/hr-doc.json index b46dda83f29..219cb805be4 100644 --- a/setup/doctype/global_defaults/locale/hr-doc.json +++ b/setup/doctype/global_defaults/locale/hr-doc.json @@ -60,6 +60,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "Precizna za Float polja (koli\u010dina, popusti, postoci itd.) samo za prikaz. Pluta i dalje \u0107e biti izra\u010dunata do \u0161est decimala.", "Purchase Order Required": "Narud\u017ebenica Obvezno", "Purchase Receipt Required": "Kupnja Potvrda Obvezno", + "Raise Material Request when stock reaches re-order level": "Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu", "Raise Purchase Request when stock reaches re-order level": "Podignite zahtjev za kupnju dionica kada dosegne ponovno poredak razinu", "SMS Sender Name": "SMS Sender Ime", "Sales Order Required": "Prodajnog naloga Obvezno", diff --git a/setup/doctype/global_defaults/locale/nl-doc.json b/setup/doctype/global_defaults/locale/nl-doc.json index f234b2f4bb9..06cfeaa9cc5 100644 --- a/setup/doctype/global_defaults/locale/nl-doc.json +++ b/setup/doctype/global_defaults/locale/nl-doc.json @@ -65,6 +65,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "Precisie voor Float velden (aantallen, kortingen, percentages, enz.) alleen voor weergave. Praalwagens worden nog steeds berekend tot 6 decimalen.", "Purchase Order Required": "Vereiste Purchase Order", "Purchase Receipt Required": "Aankoopbewijs Verplicht", + "Raise Material Request when stock reaches re-order level": "Raise Materiaal aanvragen bij voorraad strekt re-order niveau", "Raise Purchase Request when stock reaches re-order level": "Raise aankoop verzoek bij voorraad strekt re-order niveau", "SMS Sender Name": "SMS Sender Name", "Sales Order Required": "Verkooporder Vereiste", diff --git a/setup/doctype/global_defaults/locale/pt-doc.json b/setup/doctype/global_defaults/locale/pt-doc.json index 2669b6207ee..45938217a3c 100644 --- a/setup/doctype/global_defaults/locale/pt-doc.json +++ b/setup/doctype/global_defaults/locale/pt-doc.json @@ -65,6 +65,7 @@ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.": "Precis\u00e3o para campos float (quantidade, descontos, etc percentuais) apenas para exibi\u00e7\u00e3o. Flutua ainda ser\u00e1 calculado at\u00e9 6 casas decimais.", "Purchase Order Required": "Ordem de Compra Obrigat\u00f3rio", "Purchase Receipt Required": "Recibo de compra Obrigat\u00f3rio", + "Raise Material Request when stock reaches re-order level": "Levante solicitar material quando o estoque atinge novo pedido de n\u00edvel", "Raise Purchase Request when stock reaches re-order level": "Levante Compra Pedido quando o estoque atinge novo pedido de n\u00edvel", "SMS Sender Name": "Nome do remetente SMS", "Sales Order Required": "Ordem vendas Obrigat\u00f3rio", diff --git a/setup/doctype/item_group/item_group.py b/setup/doctype/item_group/item_group.py index 66565d6e78b..13112fe7589 100644 --- a/setup/doctype/item_group/item_group.py +++ b/setup/doctype/item_group/item_group.py @@ -64,6 +64,7 @@ class DocType(DocTypeNestedSet): self.doc.items = get_product_list_for_group(product_group = self.doc.name, limit=20) self.parent_groups = get_parent_item_groups(self.doc.name) + self.doc.title = self.doc.name if self.doc.slideshow: from website.helpers.slideshow import get_slideshow diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py index dbbc298c4c8..599118152d5 100644 --- a/setup/doctype/naming_series/naming_series.py +++ b/setup/doctype/naming_series/naming_series.py @@ -101,15 +101,19 @@ class DocType: from core.doctype.doctype.doctype import DocType dt = DocType() - parent = sql("select parent from `tabDocField` where fieldname='naming_series' and parent != %s", self.doc.select_doc_for_series) - sr = ([webnotes.model.doctype.get_property(p[0], 'options', 'naming_series'), p[0]] for p in parent) + parent = sql("""select dt.name from `tabDocField` df, `tabDocType` dt + where dt.name = df.parent and df.fieldname='naming_series' and dt.name != %s""", + self.doc.select_doc_for_series) + sr = ([webnotes.model.doctype.get_property(p[0], 'options', 'naming_series'), p[0]] + for p in parent) options = self.scrub_options_list(self.doc.set_options.split("\n")) for series in options: dt.validate_series(series, self.doc.select_doc_for_series) for i in sr: if i[0]: if series in i[0].split("\n"): - msgprint("Oops! Series name %s is already in use in %s. Please select a new one" % (series, i[1]), raise_exception=1) + msgprint("Oops! Series name %s is already in use in %s. \ + Please select a new one" % (series, i[1]), raise_exception=1) def validate_series_name(self, n): import re diff --git a/setup/doctype/print_heading/print_heading.py b/setup/doctype/print_heading/print_heading.py index 87d21d7ffd3..d856eb43bc1 100644 --- a/setup/doctype/print_heading/print_heading.py +++ b/setup/doctype/print_heading/print_heading.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/setup/doctype/sales_browser_control/sales_browser_control.py b/setup/doctype/sales_browser_control/sales_browser_control.py index 331fe780a8b..ae9338fd42b 100644 --- a/setup/doctype/sales_browser_control/sales_browser_control.py +++ b/setup/doctype/sales_browser_control/sales_browser_control.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/setup/doctype/sales_partner/sales_partner.py b/setup/doctype/sales_partner/sales_partner.py index f99833e16b4..f629bff2253 100644 --- a/setup/doctype/sales_partner/sales_partner.py +++ b/setup/doctype/sales_partner/sales_partner.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/setup/doctype/sales_person/sales_person.py b/setup/doctype/sales_person/sales_person.py index 65e7ac14abc..ea21cd06ce6 100644 --- a/setup/doctype/sales_person/sales_person.py +++ b/setup/doctype/sales_person/sales_person.py @@ -17,7 +17,7 @@ from __future__ import unicode_literals import webnotes -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.utils import flt from webnotes.utils.nestedset import DocTypeNestedSet diff --git a/setup/doctype/territory/territory.py b/setup/doctype/territory/territory.py index d97a9cada51..896d5c77b31 100644 --- a/setup/doctype/territory/territory.py +++ b/setup/doctype/territory/territory.py @@ -17,7 +17,7 @@ from __future__ import unicode_literals import webnotes -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.utils import flt from webnotes.utils.nestedset import DocTypeNestedSet diff --git a/setup/doctype/workflow_engine/workflow_engine.py b/setup/doctype/workflow_engine/workflow_engine.py index f9e2cefbeff..693027a68cb 100644 --- a/setup/doctype/workflow_engine/workflow_engine.py +++ b/setup/doctype/workflow_engine/workflow_engine.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes.model.code import get_obj from webnotes import form, msgprint diff --git a/setup/doctype/workflow_rule/workflow_rule.py b/setup/doctype/workflow_rule/workflow_rule.py index 24b2add6766..1c2514d691b 100644 --- a/setup/doctype/workflow_rule/workflow_rule.py +++ b/setup/doctype/workflow_rule/workflow_rule.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cstr from webnotes.model import db_exists -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes import form, msgprint sql = webnotes.conn.sql diff --git a/startup/event_handlers.py b/startup/event_handlers.py index 76c842d3843..0b64ddf03db 100644 --- a/startup/event_handlers.py +++ b/startup/event_handlers.py @@ -106,23 +106,3 @@ def check_if_expired(): webnotes.response['message'] = 'Account Expired' raise webnotes.AuthenticationError - -#### website - -def get_web_script(): - """returns web startup script""" - return webnotes.conn.get_value('Website Script', None, 'javascript') or '' - -def get_web_style(): - """returns web css""" - return webnotes.conn.get_value('Style Settings', None, 'custom_css') or '' - -def get_web_header(page_name): - """get website header""" - from website.utils import get_header - return get_header(page_name) - -def get_web_footer(page_name): - """get website footer""" - from website.utils import get_footer - return get_footer(page_name) diff --git a/startup/observers.py b/startup/observers.py index 46683f8d9b2..0e17c9d7d6f 100644 --- a/startup/observers.py +++ b/startup/observers.py @@ -17,5 +17,7 @@ observer_map = { "*:on_update": "home.update_feed", "*:on_submit": "home.update_feed", + "Stock Entry:on_submit": "stock.doctype.material_request.material_request.update_completed_qty", + "Stock Entry:on_cancel": "stock.doctype.material_request.material_request.update_completed_qty", # "*:on_update": "webnotes.widgets.moduleview.update_count" } \ No newline at end of file diff --git a/startup/open_count.py b/startup/open_count.py index a273151c9a3..7d8dcf87282 100644 --- a/startup/open_count.py +++ b/startup/open_count.py @@ -22,7 +22,7 @@ queries = { "Purchase Receipt": {"docstatus":0}, "Delivery Note": {"docstatus":0}, "Stock Entry": {"docstatus":0}, - "Purchase Request": {"docstatus":0}, + "Material Request": {"docstatus":0}, "Purchase Order": {"docstatus":0}, "Production Order": {"docstatus":0}, "BOM": {"docstatus":0}, diff --git a/startup/report_data_map.py b/startup/report_data_map.py index 83e4b30dcad..c2e4023e9d0 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -112,12 +112,13 @@ data_map = { "warehouse": ["Warehouse", "name"] }, }, - "Purchase Request Item": { + "Material Request Item": { "columns": ["item.name as name", "item_code", "warehouse", "(ifnull(qty, 0) - ifnull(ordered_qty, 0)) as qty"], - "from": "`tabPurchase Request Item` item, `tabPurchase Request` main", - "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", - "ifnull(warehouse, '')!=''", "ifnull(qty, 0) > ifnull(ordered_qty, 0)"], + "from": "`tabMaterial Request Item` item, `tabMaterial Request` main", + "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", + "material_request_type = 'Purchase'", "ifnull(warehouse, '')!=''", + "ifnull(qty, 0) > ifnull(ordered_qty, 0)"], "links": { "item_code": ["Item", "name"], "warehouse": ["Warehouse", "name"] diff --git a/stock/doctype/bin/bin.py b/stock/doctype/bin/bin.py index 19ce8f9e51f..05fdf56e59f 100644 --- a/stock/doctype/bin/bin.py +++ b/stock/doctype/bin/bin.py @@ -16,15 +16,19 @@ from __future__ import unicode_literals import webnotes +from webnotes import _ -from webnotes.utils import add_days, cint, cstr, flt, get_defaults, now, nowdate +from webnotes.utils import add_days, cint, cstr, flt, now, nowdate, \ + get_url_to_form, formatdate from webnotes.model import db_exists from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint sql = webnotes.conn.sql +import webnotes.defaults + class DocType: def __init__(self, doc, doclist=[]): @@ -79,7 +83,7 @@ class DocType: flt(self.doc.indented_qty) + flt(self.doc.planned_qty) - flt(self.doc.reserved_qty) self.doc.save() - + if (flt(args.get("actual_qty")) < 0 or flt(args.get("reserved_qty")) > 0) \ and args.get("is_cancelled") == 'No' and args.get("is_amended")=='No': self.reorder_item(args.get("voucher_type"), args.get("voucher_no")) @@ -97,60 +101,66 @@ class DocType: def reorder_item(self,doc_type,doc_name): """ Reorder item if stock reaches reorder level""" + if not hasattr(webnotes, "auto_indent"): + webnotes.auto_indent = webnotes.conn.get_value('Global Defaults', None, 'auto_indent') - if webnotes.conn.get_value('Global Defaults', None, 'auto_indent'): + if webnotes.auto_indent: #check if re-order is required - ret = sql("""select re_order_level, item_name, description, brand, item_group, - lead_time_days, min_order_qty, email_notify, re_order_qty - from tabItem where name = %s""", (self.doc.item_code), as_dict=1) + item_reorder = webnotes.conn.get("Item Reorder", + {"parent": self.doc.item_code, "warehouse": self.doc.warehouse}) - current_qty = sql(""" - select sum(t1.actual_qty) + sum(t1.indented_qty) + sum(t1.ordered_qty) -sum(t1.reserved_qty) - from tabBin t1, tabWarehouse t2 - where t1.item_code = %s - and t1.warehouse = t2.name - and t2.warehouse_type in ('Stores', 'Reserved', 'Default Warehouse Type') - and t1.docstatus != 2 - """, self.doc.item_code) + if item_reorder: + reorder_level = item_reorder.warehouse_reorder_level + reorder_qty = item_reorder.warehouse_reorder_qty + material_request_type = item_reorder.material_request_type + else: + reorder_level, reorder_qty = webnotes.conn.get_value("Item", self.doc.item_code, + ["re_order_level", "re_order_qty"]) + material_request_type = "Purchase" + + if flt(reorder_qty) and flt(self.doc.projected_qty) < flt(reorder_level): + self.create_material_request(doc_type, doc_name, reorder_level, reorder_qty, + material_request_type) - if ret[0]["re_order_level"] and current_qty and \ - (flt(ret[0]['re_order_level']) > flt(current_qty[0][0])): - self.create_auto_indent(ret[0], doc_type, doc_name, current_qty[0][0]) - - def create_auto_indent(self, i , doc_type, doc_name, cur_qty): + def create_material_request(self, doc_type, doc_name, reorder_level, reorder_qty, material_request_type): """ Create indent on reaching reorder level """ - indent = Document('Purchase Request') - indent.transaction_date = nowdate() - indent.naming_series = 'IDT' - indent.company = get_defaults()['company'] - indent.fiscal_year = get_defaults()['fiscal_year'] - indent.remark = """This is an auto generated Purchase Request. - It was raised because the (actual + ordered + indented - reserved) quantity - reaches re-order level when %s %s was created""" % (doc_type,doc_name) - indent.save(1) - indent_obj = get_obj('Purchase Request',indent.name,with_children=1) - indent_details_child = addchild(indent_obj.doc,'indent_details','Purchase Request Item') - indent_details_child.item_code = self.doc.item_code - indent_details_child.uom = self.doc.stock_uom - indent_details_child.warehouse = self.doc.warehouse - indent_details_child.schedule_date= add_days(nowdate(),cint(i['lead_time_days'])) - indent_details_child.item_name = i['item_name'] - indent_details_child.description = i['description'] - indent_details_child.item_group = i['item_group'] - indent_details_child.qty = i['re_order_qty'] or (flt(i['re_order_level']) - flt(cur_qty)) - indent_details_child.brand = i['brand'] - indent_details_child.save() - indent_obj = get_obj('Purchase Request',indent.name,with_children=1) - indent_obj.validate() - webnotes.conn.set(indent_obj.doc,'docstatus',1) - indent_obj.on_submit() - msgprint("""Item: %s is to be re-ordered. Purchase Request %s raised. + defaults = webnotes.defaults.get_defaults() + item = webnotes.doc("Item", self.doc.item_code) + + mr = webnotes.bean([{ + "doctype": "Material Request", + "company": defaults.company, + "fiscal_year": defaults.fiscal_year, + "transaction_date": nowdate(), + "material_request_type": material_request_type, + "remark": _("This is an auto generated Material Request.") + \ + _("It was raised because the (actual + ordered + indented - reserved) quantity reaches re-order level when the following record was created") + \ + ": " + _(doc_type) + " " + doc_name + }, { + "doctype": "Material Request Item", + "parenttype": "Material Request", + "parentfield": "indent_details", + "item_code": self.doc.item_code, + "schedule_date": add_days(nowdate(),cint(item.lead_time_days)), + "uom": self.doc.stock_uom, + "warehouse": self.doc.warehouse, + "item_name": item.item_name, + "description": item.description, + "item_group": item.item_group, + "qty": reorder_qty, + "brand": item.brand, + }]) + + mr.insert() + + msgprint("""Item: %s is to be re-ordered. Material Request %s raised. It was generated from %s: %s""" % - (self.doc.item_code, indent.name, doc_type, doc_name )) - if(i['email_notify']): - self.send_email_notification(doc_type, doc_name) + (self.doc.item_code, mr.doc.name, doc_type, doc_name)) + + if(item.email_notify): + self.send_email_notification(doc_type, doc_name, mr) - def send_email_notification(self, doc_type, doc_name): + def send_email_notification(self, doc_type, doc_name, bean): """ Notify user about auto creation of indent""" from webnotes.utils.email_lib import sendmail @@ -158,6 +168,10 @@ class DocType: where p.name = r.parent and p.enabled = 1 and p.docstatus < 2 and r.role in ('Purchase Manager','Material Manager') and p.name not in ('Administrator', 'All', 'Guest')""")] - msg="""A Purchase Request has been raised - for item %s: %s on %s """ % (doc_type, doc_name, nowdate()) - sendmail(email_list, subject='Auto Purchase Request Generation Notification', msg = msg) + + msg="""A new Material Request has been raised for Item: %s and Warehouse: %s \ + on %s due to %s: %s. See %s: %s """ % (self.doc.item_code, self.doc.warehouse, + formatdate(), doc_type, doc_name, bean.doc.doctype, + get_url_to_form(bean.doc.doctype, bean.doc.name)) + + sendmail(email_list, subject='Auto Material Request Generation Notification', msg = msg) diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index 09a7de20219..a8af1073fe7 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -27,6 +27,7 @@ wn.require('app/utilities/doctype/sms_control/sms_control.js'); // ONLOAD // ================================================================================================ cur_frm.cscript.onload = function(doc, dt, dn) { + cur_frm.cscript.manage_rounded_total(); if(!doc.status) set_multiple(dt,dn,{status:'Draft'}); if(!doc.transaction_date) set_multiple(dt,dn,{transaction_date:get_today()}); if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()}); diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py index 4c5aeee4efa..b8d20fbe854 100644 --- a/stock/doctype/delivery_note/delivery_note.py +++ b/stock/doctype/delivery_note/delivery_note.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt, getdate -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint @@ -312,9 +312,9 @@ class DocType(SellingController): """, self.doc.name) if res and res[0][1]>0: - from webnotes.model.wrapper import ModelWrapper + from webnotes.model.bean import Bean for r in res: - ps = ModelWrapper(dt='Packing Slip', dn=r[0]) + ps = Bean(dt='Packing Slip', dn=r[0]) ps.cancel() webnotes.msgprint("%s Packing Slip(s) Cancelled" % res[0][1]) diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index c6ace19b482..4c78347c940 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cstr, flt from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes import msgprint sql = webnotes.conn.sql @@ -217,6 +217,8 @@ class DocType: from website.helpers.product import get_parent_item_groups, url_for_website self.parent_groups = get_parent_item_groups(self.doc.item_group) + [{"name":self.doc.name}] self.doc.website_image = url_for_website(self.doc.website_image) + self.doc.title = self.doc.item_name == self.doc.name and self.doc.item_name or \ + (self.doc.item_name + " [" + self.doc.name + "]") if self.doc.slideshow: from website.helpers.slideshow import get_slideshow diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index fd963f78ced..6b1a60f5806 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-21 18:19:22", + "creation": "2013-02-20 13:26:14", "docstatus": 0, - "modified": "2013-01-29 13:32:21", + "modified": "2013-02-20 18:14:06", "modified_by": "Administrator", "owner": "Administrator" }, @@ -28,14 +28,13 @@ "permlevel": 0 }, { + "amend": 0, "doctype": "DocPerm", "name": "__common__", "parent": "Item", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, "read": 1, - "report": 1, "submit": 0 }, { @@ -200,32 +199,6 @@ "oldfieldname": "tolerance", "oldfieldtype": "Currency" }, - { - "depends_on": "eval:doc.is_stock_item==\"Yes\"", - "description": "The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type \"Stores\" or \"Reserved Warehouse\".", - "doctype": "DocField", - "fieldname": "re_order_level", - "fieldtype": "Float", - "label": "Re-Order Level", - "oldfieldname": "re_order_level", - "oldfieldtype": "Currency" - }, - { - "depends_on": "eval:doc.is_stock_item==\"Yes\"", - "description": "The quantity for the Purchase Request when the stock goes below re-order level.", - "doctype": "DocField", - "fieldname": "re_order_qty", - "fieldtype": "Float", - "label": "Re-Order Qty" - }, - { - "depends_on": "eval:doc.is_stock_item==\"Yes\"", - "description": "Send an email to users of role \"Material Manager\" and \"Purchase Manager\" when re-order level is crossed.", - "doctype": "DocField", - "fieldname": "email_notify", - "fieldtype": "Check", - "label": "Notify by Email on Re-order" - }, { "depends_on": "eval:doc.is_stock_item==\"Yes\"", "doctype": "DocField", @@ -327,6 +300,55 @@ "label": "Weight UOM", "options": "UOM" }, + { + "description": "Auto-raise Material Request if quantity goes below re-order level in a warehouse", + "doctype": "DocField", + "fieldname": "reorder_section", + "fieldtype": "Section Break", + "label": "Re-order" + }, + { + "depends_on": "eval:doc.is_stock_item==\"Yes\"", + "doctype": "DocField", + "fieldname": "re_order_level", + "fieldtype": "Float", + "label": "Re-Order Level", + "oldfieldname": "re_order_level", + "oldfieldtype": "Currency" + }, + { + "depends_on": "eval:doc.is_stock_item==\"Yes\"", + "doctype": "DocField", + "fieldname": "re_order_qty", + "fieldtype": "Float", + "label": "Re-Order Qty" + }, + { + "doctype": "DocField", + "fieldname": "column_break_31", + "fieldtype": "Column Break" + }, + { + "depends_on": "eval:doc.is_stock_item==\"Yes\"", + "description": "Send an email to users of role \"Material Manager\" and \"Purchase Manager\" when re-order level is crossed.", + "doctype": "DocField", + "fieldname": "email_notify", + "fieldtype": "Check", + "label": "Notify by Email on Re-order" + }, + { + "doctype": "DocField", + "fieldname": "section_break_31", + "fieldtype": "Section Break", + "options": "Simple" + }, + { + "doctype": "DocField", + "fieldname": "item_reorder", + "fieldtype": "Table", + "label": "Warehouse-wise Item Reorder", + "options": "Item Reorder" + }, { "doctype": "DocField", "fieldname": "purchase_details", @@ -348,7 +370,7 @@ }, { "depends_on": "eval:doc.is_purchase_item==\"Yes\"", - "description": "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.", + "description": "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.", "doctype": "DocField", "fieldname": "lead_time_days", "fieldtype": "Int", @@ -791,18 +813,38 @@ "label": "Website Description" }, { - "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", + "permlevel": 1, + "report": 0, "role": "Material Manager", "write": 0 }, { - "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Material Manager", + "write": 0 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "Material User", + "write": 0 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Material User", "write": 0 }, @@ -810,7 +852,36 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "permlevel": 0, + "report": 1, "role": "Material Master Manager", "write": 1 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "Material Master Manager", + "write": 0 + }, + { + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "System Manager", + "write": 1 + }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "System Manager", + "write": 0 } ] \ No newline at end of file diff --git a/stock/doctype/item/locale/_messages_doc.json b/stock/doctype/item/locale/_messages_doc.json index 92d393a55e3..005f8c2e176 100644 --- a/stock/doctype/item/locale/_messages_doc.json +++ b/stock/doctype/item/locale/_messages_doc.json @@ -24,10 +24,12 @@ "Last Purchase Rate", "Website Item Groups", "Default Expense Account", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.", "Manufacturing", "Net Weight", "Mandatory if Stock Item is \"Yes\"", "Show in Website", + "Re-order", "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", "UOM Conversion Details", "FIFO", @@ -49,14 +51,12 @@ "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.", "Website", "Website Price List", - "The quantity for the Purchase Request when the stock goes below re-order level.", "Has Batch No", "Item Code", "Buying Cost", "website page link", "Max Discount (%)", "Image", - "The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type \"Stores\" or \"Reserved Warehouse\".", "Is Asset Item", "Sales Details", "Standard Rate", @@ -98,6 +98,7 @@ "Item Quality Inspection Parameter", "Description", "End of Life", + "Warehouse-wise Item Reorder", "Barcode", "Website Description", "You can enter the minimum quantity of this item to be ordered.", @@ -108,7 +109,6 @@ "Weightage", "Is Purchase Item", "Item", - "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.", "Yes", "Is Sub Contracted Item", "Item Prices", diff --git a/stock/doctype/item/locale/ar-doc.json b/stock/doctype/item/locale/ar-doc.json index 995c2f303a5..193d353b1c3 100644 --- a/stock/doctype/item/locale/ar-doc.json +++ b/stock/doctype/item/locale/ar-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "\u0633\u064a\u062a\u0645 \u062d\u0641\u0638 \u0627\u0644\u0639\u0646\u0635\u0631 \u0628\u0647\u0630\u0627 \u0627\u0644\u0627\u0633\u0645 \u0641\u064a \u0642\u0627\u0639\u062f\u0629 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a.", "Last Purchase Rate": "\u0645\u0634\u0627\u0631\u0643\u0629 \u0627\u0644\u0634\u0631\u0627\u0621 \u0642\u064a\u0645", "Lead Time Days": "\u064a\u0624\u062f\u064a \u064a\u0648\u0645\u0627 \u0645\u0631\u0629", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "\u064a\u0624\u062f\u064a \u0627\u0644\u0648\u0642\u062a \u0647\u0648 \u0623\u064a\u0627\u0645 \u0639\u062f\u062f \u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u062a\u064a \u0645\u0646 \u0627\u0644\u0645\u062a\u0648\u0642\u0639 \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f \u0641\u064a \u0627\u0644\u0645\u0633\u062a\u0648\u062f\u0639 \u0627\u0644\u062e\u0627\u0635 \u0628\u0643. \u064a\u062a\u0645 \u0625\u062d\u0636\u0627\u0631 \u0647\u0630\u0647 \u0627\u0644\u0623\u064a\u0627\u0645 \u0641\u064a \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0639\u0646\u062f \u0627\u062e\u062a\u064a\u0627\u0631 \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "\u064a\u0624\u062f\u064a \u0627\u0644\u0648\u0642\u062a \u0647\u0648 \u0623\u064a\u0627\u0645 \u0639\u062f\u062f \u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u062a\u064a \u0645\u0646 \u0627\u0644\u0645\u062a\u0648\u0642\u0639 \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f \u0641\u064a \u0627\u0644\u0645\u0633\u062a\u0648\u062f\u0639 \u0627\u0644\u062e\u0627\u0635 \u0628\u0643. \u064a\u062a\u0645 \u0625\u062d\u0636\u0627\u0631 \u0647\u0630\u0647 \u0627\u0644\u0623\u064a\u0627\u0645 \u0641\u064a \u0637\u0644\u0628 \u0634\u0631\u0627\u0621 \u0639\u0646\u062f \u0627\u062e\u062a\u064a\u0627\u0631 \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f.", "List this Item in multiple groups on the website.": "\u0642\u0627\u0626\u0645\u0629 \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f \u0641\u064a \u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0645\u062a\u0639\u062f\u062f\u0629 \u0639\u0644\u0649 \u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0646\u062a\u0631\u0646\u062a.", "Mandatory if Stock Item is \"Yes\"": "\u0625\u0644\u0632\u0627\u0645\u064a\u0629 \u0627\u0644\u0625\u063a\u0644\u0627\u0642 \u0627\u0644\u0623\u0633\u0647\u0645 \u0625\u0630\u0627 \u0647\u0648 "\u0646\u0639\u0645"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "\u0645\u0639\u0627\u064a\u064a\u0631 \u0627\u0644\u062c\u0648\u062f\u0629 \u0627\u0644\u062a\u0641\u062a\u064a\u0634", "Re-Order Level": "\u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0645\u0633\u062a\u0648\u0649", "Re-Order Qty": "\u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0643\u0645\u064a\u0629", + "Re-order": "\u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628", "Sales Details": "\u0645\u0628\u064a\u0639\u0627\u062a \u062a\u0641\u0627\u0635\u064a\u0644", "Sales Rate": "\u0645\u0628\u064a\u0639\u0627\u062a \u0642\u064a\u0645", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": "\u062d\u062f\u062f "\u0646\u0639\u0645" \u0625\u0630\u0627 \u0643\u0627\u0646\u062a \u0647\u0630\u0647 \u0627\u0644\u0633\u0644\u0639\u0629 \u063a\u064a\u0631 \u0645\u062a\u0648\u0641\u0631\u0629 \u0644\u064a\u062a\u0645 \u0625\u0631\u0633\u0627\u0644\u0647\u0627 \u0625\u0644\u0649 \u0627\u0644\u0639\u0645\u0644\u0627\u0621 \u0623\u0648 \u0627\u0644\u0648\u0627\u0631\u062f\u0629 \u0645\u0646 \u0627\u0644\u0645\u0648\u0631\u062f \u0643\u0639\u064a\u0646\u0629. \u0633\u0648\u0641 \u062a\u0644\u0627\u062d\u0638 \u0627\u0644\u062a\u0633\u0644\u064a\u0645 \u0648\u0625\u064a\u0635\u0627\u0644\u0627\u062a \u0634\u0631\u0627\u0621 \u062a\u062d\u062f\u064a\u062b \u0645\u0633\u062a\u0648\u064a\u0627\u062a \u0627\u0644\u0645\u062e\u0632\u0648\u0646 \u0648\u0644\u0643\u0646 \u0644\u0646 \u064a\u0643\u0648\u0646 \u0647\u0646\u0627\u0643 \u0641\u0627\u062a\u0648\u0631\u0629 \u0636\u062f \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f.", @@ -102,6 +104,7 @@ "UOM Conversion Details": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u062a\u062d\u0648\u064a\u0644 UOM", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "\u0648\u062d\u062f\u0629 \u0627\u0644\u0642\u064a\u0627\u0633 \u0641\u064a \u0647\u0630\u0627 \u0627\u0644\u0628\u0646\u062f (\u0645\u062b\u0644 \u0643\u062c\u0645\u060c \u0648\u062d\u062f\u0629\u060c \u0644\u0627\u060c \u0627\u0644\u0632\u0648\u062c).", "Valuation Method": "\u062a\u0642\u064a\u064a\u0645 \u0627\u0644\u0637\u0631\u064a\u0642\u0629", + "Warehouse-wise Item Reorder": "\u0645\u0633\u062a\u0648\u062f\u0639 \u0627\u0644\u0645\u062f\u064a\u0646\u0629 \u0645\u0646 \u0627\u0644\u062d\u0643\u0645\u0629 \u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628", "Warranty Period (in days)": "\u0641\u062a\u0631\u0629 \u0627\u0644\u0636\u0645\u0627\u0646 (\u0628\u0627\u0644\u0623\u064a\u0627\u0645)", "Website": "\u0627\u0644\u0645\u0648\u0642\u0639", "Website Description": "\u0627\u0644\u0645\u0648\u0642\u0639 \u0648\u0635\u0641", diff --git a/stock/doctype/item/locale/es-doc.json b/stock/doctype/item/locale/es-doc.json index df44d6f193f..9140e257683 100644 --- a/stock/doctype/item/locale/es-doc.json +++ b/stock/doctype/item/locale/es-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "El art\u00edculo ser\u00e1 salvado por este nombre en la base de datos.", "Last Purchase Rate": "Tarifa de \u00daltimo", "Lead Time Days": "Plomo d\u00edas Tiempo", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "Lead Time d\u00eda es el n\u00famero de d\u00edas en que se espera para este art\u00edculo en su almac\u00e9n. Estos d\u00edas se recupera en la solicitud de material cuando se selecciona este elemento.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "Lead Time d\u00eda es el n\u00famero de d\u00edas en que se espera para este art\u00edculo en su almac\u00e9n. Estos d\u00edas se recupera en solicitud de compra al seleccionar este elemento.", "List this Item in multiple groups on the website.": "Enumero este art\u00edculo en varios grupos en la web.", "Mandatory if Stock Item is \"Yes\"": "Punto Obligatorio de si es "S\u00ed"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "Par\u00e1metros de Calidad Inspecci\u00f3n", "Re-Order Level": "Re-Order Nivel", "Re-Order Qty": "Re-Order Cantidad", + "Re-order": "Reordenar", "Sales Details": "Ventas Details", "Sales Rate": "Ventas Precio", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": "Seleccione "S\u00ed" si este art\u00edculo se va a enviar a un cliente o recibido de un proveedor como muestra. Albaranes y facturas de compra se actualizar\u00e1n los niveles de existencias, pero no habr\u00e1 ninguna factura en contra de este art\u00edculo.", @@ -102,6 +104,7 @@ "UOM Conversion Details": "UOM detalles de la conversi\u00f3n", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "Unidad de medida de este art\u00edculo (Kg por ejemplo, Unidad, No, par).", "Valuation Method": "M\u00e9todo de valoraci\u00f3n", + "Warehouse-wise Item Reorder": "Warehouse-sabio art\u00edculo reorden", "Warranty Period (in days)": "Per\u00edodo de garant\u00eda (en d\u00edas)", "Website": "Sitio web", "Website Description": "Descripci\u00f3n del sitio", diff --git a/stock/doctype/item/locale/fr-doc.json b/stock/doctype/item/locale/fr-doc.json index 281f8bf214e..a509cbeca23 100644 --- a/stock/doctype/item/locale/fr-doc.json +++ b/stock/doctype/item/locale/fr-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "L'article sera sauv\u00e9 par ce nom dans la base de donn\u00e9es.", "Last Purchase Rate": "Purchase Rate Derni\u00e8re", "Lead Time Days": "Diriger jours Temps", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "Diriger jours Temps est le nombre de jours dont cet article est pr\u00e9vu dans votre entrep\u00f4t. Ces jours sont r\u00e9cup\u00e9r\u00e9es dans la Demande de Mat\u00e9riel quand vous s\u00e9lectionnez cette option.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "Diriger jours Temps est le nombre de jours dont cet article est pr\u00e9vu dans votre entrep\u00f4t. Ces jours sont r\u00e9cup\u00e9r\u00e9es dans la demande d'achat lorsque vous s\u00e9lectionnez cette option.", "List this Item in multiple groups on the website.": "Liste cet article dans plusieurs groupes sur le site.", "Mandatory if Stock Item is \"Yes\"": "Produit en stock obligatoire si "Oui"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "Param\u00e8tres inspection de la qualit\u00e9", "Re-Order Level": "Re-Order niveau", "Re-Order Qty": "Re-Cdt", + "Re-order": "Re-order", "Sales Details": "D\u00e9tails ventes", "Sales Rate": "Taux de vente", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": "S\u00e9lectionnez \u00abOui\u00bb si cet article doit \u00eatre envoy\u00e9 \u00e0 un client ou re\u00e7u d'un fournisseur comme un \u00e9chantillon. Les bons de livraison et factures d'achat va mettre \u00e0 jour les niveaux de stocks, mais il n'y aura pas de facture contre cet article.", @@ -102,6 +104,7 @@ "UOM Conversion Details": "D\u00e9tails conversion UOM", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "Unit\u00e9 de mesure de cet article (Kg par exemple, unit\u00e9, Non, Pair).", "Valuation Method": "M\u00e9thode d'\u00e9valuation", + "Warehouse-wise Item Reorder": "Warehouse-sage R\u00e9organiser article", "Warranty Period (in days)": "P\u00e9riode de garantie (en jours)", "Website": "Site Web", "Website Description": "Description du site Web", diff --git a/stock/doctype/item/locale/hi-doc.json b/stock/doctype/item/locale/hi-doc.json index 5d3ca8717be..336250a1ea4 100644 --- a/stock/doctype/item/locale/hi-doc.json +++ b/stock/doctype/item/locale/hi-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "\u0906\u0907\u091f\u092e \u0921\u093e\u091f\u093e \u092c\u0947\u0938 \u092e\u0947\u0902 \u0907\u0938 \u0928\u093e\u092e \u0938\u0947 \u092c\u091a\u093e\u092f\u093e \u091c\u093e\u090f\u0917\u093e.", "Last Purchase Rate": "\u092a\u093f\u091b\u0932\u0947 \u0916\u0930\u0940\u0926 \u0926\u0930", "Lead Time Days": "\u0932\u0940\u0921 \u0938\u092e\u092f \u0926\u093f\u0928", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "\u0932\u0940\u0921 \u0938\u092e\u092f \u0926\u093f\u0928\u094b\u0902 \u0926\u093f\u0928 \u091c\u093f\u0938\u0915\u0947 \u0926\u094d\u0935\u093e\u0930\u093e \u0907\u0938 \u0906\u0907\u091f\u092e \u0905\u092a\u0928\u0947 \u0917\u094b\u0926\u093e\u092e \u092e\u0947\u0902 \u0909\u092e\u094d\u092e\u0940\u0926 \u0939\u0948 \u0915\u0940 \u0938\u0902\u0916\u094d\u092f\u093e \u0939\u0948. \u0907\u0938 \u0926\u093f\u0928 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u092e\u0947\u0902 \u0926\u093f\u0932\u0935\u093e\u092f\u093e \u0939\u0948 \u091c\u092c \u0906\u092a \u0907\u0938 \u092e\u0926 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "\u0932\u0940\u0921 \u0938\u092e\u092f \u0926\u093f\u0928\u094b\u0902 \u0926\u093f\u0928 \u091c\u093f\u0938\u0915\u0947 \u0926\u094d\u0935\u093e\u0930\u093e \u0907\u0938 \u0906\u0907\u091f\u092e \u0905\u092a\u0928\u0947 \u0917\u094b\u0926\u093e\u092e \u092e\u0947\u0902 \u0909\u092e\u094d\u092e\u0940\u0926 \u0939\u0948 \u0915\u0940 \u0938\u0902\u0916\u094d\u092f\u093e \u0939\u0948. \u0907\u0938 \u0926\u093f\u0928 \u0916\u0930\u0940\u0926 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u092e\u0947\u0902 \u0926\u093f\u0932\u0935\u093e\u092f\u093e \u0939\u0948 \u091c\u092c \u0906\u092a \u0907\u0938 \u092e\u0926 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902.", "List this Item in multiple groups on the website.": "\u0915\u0908 \u0938\u092e\u0942\u0939\u094b\u0902 \u092e\u0947\u0902 \u0935\u0947\u092c\u0938\u093e\u0907\u091f \u092a\u0930 \u0907\u0938 \u092e\u0926 \u0915\u0940 \u0938\u0942\u091a\u0940.", "Mandatory if Stock Item is \"Yes\"": "\u0905\u0928\u093f\u0935\u093e\u0930\u094d\u092f \u0905\u0917\u0930 \u0938\u094d\u091f\u0949\u0915 \u0906\u0907\u091f\u092e \u0939\u0948 "\u0939\u093e\u0901"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "\u0917\u0941\u0923\u0935\u0924\u094d\u0924\u093e \u0928\u093f\u0930\u0940\u0915\u094d\u0937\u0923 \u092a\u0948\u0930\u093e\u092e\u0940\u091f\u0930", "Re-Order Level": "\u092a\u0941\u0928 \u0906\u0926\u0947\u0936 \u0938\u094d\u0924\u0930", "Re-Order Qty": "\u092a\u0941\u0928 \u0906\u0926\u0947\u0936 \u092e\u093e\u0924\u094d\u0930\u093e", + "Re-order": "\u092a\u0941\u0928\u0903 \u0906\u0926\u0947\u0936", "Sales Details": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0935\u093f\u0935\u0930\u0923", "Sales Rate": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0926\u0930", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": ""\u0939\u093e\u0901" \u091a\u0941\u0928\u0947\u0902 \u092f\u0926\u093f \u0907\u0938 \u092e\u0926 \u0915\u0947 \u0932\u093f\u090f \u090f\u0915 \u0917\u094d\u0930\u093e\u0939\u0915 \u0915\u0947 \u0932\u093f\u090f \u092d\u0947\u091c\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948 \u092f\u093e \u090f\u0915 \u0928\u092e\u0942\u0928\u093e \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u090f\u0915 \u0938\u092a\u094d\u0932\u093e\u092f\u0930 \u0938\u0947 \u092a\u094d\u0930\u093e\u092a\u094d\u0924 \u0939\u0948. \u0921\u093f\u0932\u093f\u0935\u0930\u0940 \u0928\u094b\u091f\u094d\u0938 \u0914\u0930 \u0916\u0930\u0940\u0926 \u0930\u0938\u0940\u0926 \u0938\u094d\u091f\u0949\u0915 \u0915\u0947 \u0938\u094d\u0924\u0930 \u0915\u094b \u0905\u092a\u0921\u0947\u091f \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902, \u0932\u0947\u0915\u093f\u0928 \u0935\u0939\u093e\u0901 \u0907\u0938 \u0906\u0907\u091f\u092e \u0915\u0947 \u0916\u093f\u0932\u093e\u092b \u0915\u094b\u0908 \u091a\u093e\u0932\u093e\u0928 \u0939\u094b \u091c\u093e\u090f\u0917\u093e.", @@ -103,6 +105,7 @@ "UOM Conversion Details": "UOM \u0930\u0942\u092a\u093e\u0902\u0924\u0930\u0923 \u0935\u093f\u0935\u0930\u0923", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "\u0907\u0938 \u092e\u0926 \u0915\u0947 \u092e\u093e\u092a \u0915\u0940 \u0907\u0915\u093e\u0908 (\u091c\u0948\u0938\u0947 \u0915\u093f\u0932\u094b\u0917\u094d\u0930\u093e\u092e, \u092f\u0942\u0928\u093f\u091f, \u0928\u0939\u0940\u0902, \u091c\u094b\u0921\u093c\u0940).", "Valuation Method": "\u092e\u0942\u0932\u094d\u092f\u0928 \u0935\u093f\u0927\u093f", + "Warehouse-wise Item Reorder": "\u0917\u094b\u0926\u093e\u092e \u0935\u093e\u0930 \u0906\u0907\u091f\u092e \u092a\u0941\u0928\u0903 \u0915\u094d\u0930\u092e\u093f\u0924 \u0915\u0930\u0947\u0902", "Warranty Period (in days)": "\u0935\u093e\u0930\u0902\u091f\u0940 \u0905\u0935\u0927\u093f (\u0926\u093f\u0928\u094b\u0902 \u092e\u0947\u0902)", "Website": "\u0935\u0947\u092c\u0938\u093e\u0907\u091f", "Website Description": "\u0935\u0947\u092c\u0938\u093e\u0907\u091f \u0935\u093f\u0935\u0930\u0923", diff --git a/stock/doctype/item/locale/hr-doc.json b/stock/doctype/item/locale/hr-doc.json index 77b2065be8c..74cae46bb40 100644 --- a/stock/doctype/item/locale/hr-doc.json +++ b/stock/doctype/item/locale/hr-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "Stavka \u0107e biti spremljena pod ovim imenom u bazi podataka.", "Last Purchase Rate": "Zadnja Kupnja Ocijenite", "Lead Time Days": "Olovo vrijeme Dane", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "Olovo vrijeme dana je broj dana koji ovaj predmet se o\u010dekuje u skladi\u0161tu. Ovih dana je preuzeta u Materijal Zahtjev kada odaberete ovu stavku.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "Olovo vrijeme dana je broj dana koji ovaj predmet se o\u010dekuje u skladi\u0161tu. Ovih dana je preuzeta u zahtjev za kupnju kada odaberete ovu stavku.", "List this Item in multiple groups on the website.": "Popis ovaj predmet u vi\u0161e grupa na web stranici.", "Mandatory if Stock Item is \"Yes\"": "Obvezni ako katalo\u0161ki Stavka je "Da"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "Inspekcija kvalitete Parametri", "Re-Order Level": "Re-Order Razina", "Re-Order Qty": "Re-Order Kol", + "Re-order": "Ponovno bi", "Sales Details": "Prodaja Detalji", "Sales Rate": "Prodaja Stopa", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": "Odaberite "Da" ako je ova stavka \u0107e biti poslan na kupca ili dobio od dobavlja\u010da kao uzorak. Otpremnice i kupnju primitke \u0107e a\u017eurirati burzovne razinama, ali ne\u0107e biti faktura protiv ove stavke.", @@ -102,6 +104,7 @@ "UOM Conversion Details": "UOM pretvorbe Detalji", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "Jedinica za mjerenje ove to\u010dke (npr. kg, Jedinica Ne, Par).", "Valuation Method": "Vrednovanje metoda", + "Warehouse-wise Item Reorder": "Warehouse-mudar Stavka redoslijeda", "Warranty Period (in days)": "Jamstveno razdoblje (u danima)", "Website": "Website", "Website Description": "Web stranica Opis", diff --git a/stock/doctype/item/locale/nl-doc.json b/stock/doctype/item/locale/nl-doc.json index ccc4b2e616a..3e4113a65da 100644 --- a/stock/doctype/item/locale/nl-doc.json +++ b/stock/doctype/item/locale/nl-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "Het punt zal worden opgeslagen met deze naam in de databank.", "Last Purchase Rate": "Laatste Purchase Rate", "Lead Time Days": "Lead Time Dagen", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "Levertijd dagen is het aantal dagen waarmee dit artikel wordt verwacht in uw magazijn. Deze dag wordt opgehaald in Laden en aanvragen als u dit item.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "Levertijd dagen is het aantal dagen waarmee dit artikel wordt verwacht in uw magazijn. Deze dag wordt opgehaald in Purchase Request als u dit item.", "List this Item in multiple groups on the website.": "Lijst deze post in meerdere groepen op de website.", "Mandatory if Stock Item is \"Yes\"": "Verplicht als Stock Item "ja"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "Quality Inspection Parameters", "Re-Order Level": "Re-Order Level", "Re-Order Qty": "Re-Order Aantal", + "Re-order": "Re-order", "Sales Details": "Verkoop Details", "Sales Rate": "Sales Rate", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": "Selecteer "Ja" als dit voorwerp dient te worden verzonden naar een klant of ontvangen van een leverancier als een monster. Pakbonnen en aankoopbewijzen zal update voorraadniveaus, maar er zal geen factuur tegen deze item.", @@ -102,6 +104,7 @@ "UOM Conversion Details": "Verpakking Conversie Details", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "Meeteenheid van dit artikel (bijvoorbeeld kg, eenheid, Nee, Pair).", "Valuation Method": "Waardering Methode", + "Warehouse-wise Item Reorder": "Warehouse-wise Item opnieuw ordenen", "Warranty Period (in days)": "Garantieperiode (in dagen)", "Website": "Website", "Website Description": "Website Beschrijving", diff --git a/stock/doctype/item/locale/pt-doc.json b/stock/doctype/item/locale/pt-doc.json index edc8c47c70d..48867bc29c7 100644 --- a/stock/doctype/item/locale/pt-doc.json +++ b/stock/doctype/item/locale/pt-doc.json @@ -56,6 +56,7 @@ "Item will be saved by this name in the data base.": "O artigo ser\u00e1 salva por este nome na base de dados.", "Last Purchase Rate": "Compra de \u00faltima", "Lead Time Days": "Levar dias Tempo", + "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.": "Levar dias Tempo \u00e9 o n\u00famero de dias em que este item \u00e9 esperado no seu armaz\u00e9m. Este dia \u00e9 buscada em solicitar material ao selecionar este item.", "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.": "Levar dias Tempo \u00e9 o n\u00famero de dias em que este item \u00e9 esperado no seu armaz\u00e9m. Este dia \u00e9 buscada em Pedido de Compra quando voc\u00ea selecionar este item.", "List this Item in multiple groups on the website.": "Lista este item em v\u00e1rios grupos no site.", "Mandatory if Stock Item is \"Yes\"": "Item de estoque \u00e9 obrigat\u00f3ria se "Sim"", @@ -77,6 +78,7 @@ "Quality Inspection Parameters": "Inspe\u00e7\u00e3o par\u00e2metros de qualidade", "Re-Order Level": "Re Ordem N\u00edvel", "Re-Order Qty": "Re-Ordem Qtde", + "Re-order": "Re-vista", "Sales Details": "Detalhes de vendas", "Sales Rate": "Taxa de vendas", "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.": "Selecione "Sim" se este item \u00e9 para ser enviado para um cliente ou recebidas de um fornecedor como amostra. Notas de entrega e recibos de compra ir\u00e1 atualizar os n\u00edveis de estoque, mas n\u00e3o haver\u00e1 fatura contra este item.", @@ -102,6 +104,7 @@ "UOM Conversion Details": "Convers\u00e3o Detalhes UOM", "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).": "Unidade de medida do item (por exemplo kg Unidade, n\u00e3o, par).", "Valuation Method": "M\u00e9todo de Avalia\u00e7\u00e3o", + "Warehouse-wise Item Reorder": "Armaz\u00e9m-s\u00e1bio item Reordenar", "Warranty Period (in days)": "Per\u00edodo de Garantia (em dias)", "Website": "Site", "Website Description": "Descri\u00e7\u00e3o do site", diff --git a/stock/doctype/item/test_item.py b/stock/doctype/item/test_item.py index 28da848f236..4238e149bba 100644 --- a/stock/doctype/item/test_item.py +++ b/stock/doctype/item/test_item.py @@ -19,7 +19,7 @@ import unittest import webnotes import copy -from webnotes.model.wrapper import ModelWrapper +from webnotes.model.bean import Bean from webnotes.model.doc import Document from webnotes.utils import flt @@ -34,7 +34,7 @@ class TestItem(unittest.TestCase): webnotes.conn.rollback() def testInsert(self): - d = ModelWrapper() + d = Bean() count_before = flt(sql("select count(*) from tab"+_doctype)[0][0]) if docok: @@ -49,7 +49,7 @@ class TestItem(unittest.TestCase): def testFailAssert(self): if docnotok: with self.assertRaises(Exception) as context: - d = ModelWrapper() + d = Bean() d.doc = docnotok[0] d.children = None d.doc.fields['__islocal']=1 @@ -77,6 +77,31 @@ docnotok = [Document(fielddata=r) for r in tabNotOK] test_records = [ + [{ + "doctype": "Item", + "item_code": "_Test Item", + "item_name": "_Test Item", + "description": "_Test Item", + "item_group": "_Test Item Group", + "is_stock_item": "Yes", + "is_asset_item": "No", + "has_batch_no": "No", + "has_serial_no": "No", + "is_purchase_item": "Yes", + "is_sales_item": "Yes", + "is_service_item": "No", + "is_sample_item": "No", + "inspection_required": "No", + "is_pro_applicable": "No", + "is_sub_contracted_item": "No", + "stock_uom": "_Test UOM" + }, { + "doctype": "Item Reorder", + "parentfield": "item_reorder", + "warehouse": "_Test Warehouse", + "warehouse_reorder_level": 20, + "warehouse_reorder_qty": 20 + }], [{ "doctype": "Item", "item_code": "_Test Item Home Desktop 100", diff --git a/stock/doctype/item_reorder/__init__.py b/stock/doctype/item_reorder/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/stock/doctype/item_reorder/item_reorder.py b/stock/doctype/item_reorder/item_reorder.py new file mode 100644 index 00000000000..928aa9ff9f2 --- /dev/null +++ b/stock/doctype/item_reorder/item_reorder.py @@ -0,0 +1,8 @@ +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes + +class DocType: + def __init__(self, d, dl): + self.doc, self.doclist = d, dl \ No newline at end of file diff --git a/stock/doctype/item_reorder/item_reorder.txt b/stock/doctype/item_reorder/item_reorder.txt new file mode 100644 index 00000000000..ca429aff951 --- /dev/null +++ b/stock/doctype/item_reorder/item_reorder.txt @@ -0,0 +1,56 @@ +[ + { + "creation": "2013-02-18 12:48:07", + "docstatus": 0, + "modified": "2013-02-18 12:54:46", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "autoname": "REORD-.#####", + "doctype": "DocType", + "in_create": 1, + "istable": 1, + "module": "Stock", + "name": "__common__" + }, + { + "doctype": "DocField", + "name": "__common__", + "parent": "Item Reorder", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { + "doctype": "DocType", + "name": "Item Reorder" + }, + { + "doctype": "DocField", + "fieldname": "warehouse", + "fieldtype": "Link", + "label": "Warehouse", + "options": "Warehouse", + "reqd": 1 + }, + { + "doctype": "DocField", + "fieldname": "warehouse_reorder_level", + "fieldtype": "Float", + "label": "Re-order Level" + }, + { + "doctype": "DocField", + "fieldname": "warehouse_reorder_qty", + "fieldtype": "Float", + "label": "Re-order Qty" + }, + { + "doctype": "DocField", + "fieldname": "material_request_type", + "fieldtype": "Select", + "label": "Material Request Type", + "options": "Purchase\nTransfer" + } +] \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/_messages_doc.json b/stock/doctype/item_reorder/locale/_messages_doc.json new file mode 100644 index 00000000000..b20242c72b7 --- /dev/null +++ b/stock/doctype/item_reorder/locale/_messages_doc.json @@ -0,0 +1,10 @@ +[ + "Purchase", + "Re-order Level", + "Material Request Type", + "Item Reorder", + "Transfer", + "Warehouse", + "Re-order Qty", + "Stock" +] \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/ar-doc.json b/stock/doctype/item_reorder/locale/ar-doc.json new file mode 100644 index 00000000000..7661ffab611 --- /dev/null +++ b/stock/doctype/item_reorder/locale/ar-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "\u0627\u0644\u0628\u0646\u062f \u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628", + "Material Request Type": "\u0637\u0644\u0628 \u0646\u0648\u0639 \u0627\u0644\u0645\u0648\u0627\u062f", + "Purchase": "\u0634\u0631\u0627\u0621", + "Re-order Level": "\u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0645\u0633\u062a\u0648\u0649", + "Re-order Qty": "\u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0643\u0645\u064a\u0629", + "Stock": "\u0627\u0644\u0623\u0648\u0631\u0627\u0642 \u0627\u0644\u0645\u0627\u0644\u064a\u0629", + "Transfer": "\u0646\u0642\u0644", + "Warehouse": "\u0645\u0633\u062a\u0648\u062f\u0639" +} \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/es-doc.json b/stock/doctype/item_reorder/locale/es-doc.json new file mode 100644 index 00000000000..2aed9e66559 --- /dev/null +++ b/stock/doctype/item_reorder/locale/es-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "Art\u00edculo reorden", + "Material Request Type": "Tipo de material Solicitud", + "Purchase": "Comprar", + "Re-order Level": "Reordenar Nivel", + "Re-order Qty": "Reordenar Cantidad", + "Stock": "Valores", + "Transfer": "Transferir", + "Warehouse": "Almac\u00e9n" +} \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/fr-doc.json b/stock/doctype/item_reorder/locale/fr-doc.json new file mode 100644 index 00000000000..79ee32b873d --- /dev/null +++ b/stock/doctype/item_reorder/locale/fr-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "R\u00e9organiser article", + "Material Request Type": "Type de demande de mat\u00e9riel", + "Purchase": "Acheter", + "Re-order Level": "Re-order niveau", + "Re-order Qty": "Re-order Quantit\u00e9", + "Stock": "Stock", + "Transfer": "Transf\u00e9rer", + "Warehouse": "Entrep\u00f4t" +} \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/hi-doc.json b/stock/doctype/item_reorder/locale/hi-doc.json new file mode 100644 index 00000000000..3b0031c0044 --- /dev/null +++ b/stock/doctype/item_reorder/locale/hi-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "\u0906\u0907\u091f\u092e \u092a\u0941\u0928\u0903 \u0915\u094d\u0930\u092e\u093f\u0924 \u0915\u0930\u0947\u0902", + "Material Request Type": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u092a\u094d\u0930\u0915\u093e\u0930", + "Purchase": "\u0915\u094d\u0930\u092f", + "Re-order Level": "\u092a\u0941\u0928 \u0906\u0926\u0947\u0936 \u0938\u094d\u0924\u0930", + "Re-order Qty": "\u092a\u0941\u0928\u0903 \u0906\u0926\u0947\u0936 \u092e\u093e\u0924\u094d\u0930\u093e", + "Stock": "\u0938\u094d\u091f\u0949\u0915", + "Transfer": "\u0939\u0938\u094d\u0924\u093e\u0902\u0924\u0930\u0923", + "Warehouse": "\u0917\u094b\u0926\u093e\u092e" +} \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/hr-doc.json b/stock/doctype/item_reorder/locale/hr-doc.json new file mode 100644 index 00000000000..74bb755b8b4 --- /dev/null +++ b/stock/doctype/item_reorder/locale/hr-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "Stavka redoslijeda", + "Material Request Type": "Materijal Zahtjev Tip", + "Purchase": "Kupiti", + "Re-order Level": "Ponovno bi Razina", + "Re-order Qty": "Ponovno bi Kol", + "Stock": "Zaliha", + "Transfer": "Prijenos", + "Warehouse": "Skladi\u0161te" +} \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/nl-doc.json b/stock/doctype/item_reorder/locale/nl-doc.json new file mode 100644 index 00000000000..ea56815f954 --- /dev/null +++ b/stock/doctype/item_reorder/locale/nl-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "Item opnieuw ordenen", + "Material Request Type": "Materiaal Soort aanvraag", + "Purchase": "Kopen", + "Re-order Level": "Re-order Level", + "Re-order Qty": "Re-order Aantal", + "Stock": "Voorraad", + "Transfer": "Overdracht", + "Warehouse": "Magazijn" +} \ No newline at end of file diff --git a/stock/doctype/item_reorder/locale/pt-doc.json b/stock/doctype/item_reorder/locale/pt-doc.json new file mode 100644 index 00000000000..e675d3a0e39 --- /dev/null +++ b/stock/doctype/item_reorder/locale/pt-doc.json @@ -0,0 +1,10 @@ +{ + "Item Reorder": "Item Reordenar", + "Material Request Type": "Tipo de solicita\u00e7\u00e3o de material", + "Purchase": "Comprar", + "Re-order Level": "Re fim-Level", + "Re-order Qty": "Re-vista Qtde", + "Stock": "Estoque", + "Transfer": "Transferir", + "Warehouse": "Armaz\u00e9m" +} \ No newline at end of file diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py index f2bc7992d0e..1fb7b9a0164 100644 --- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py +++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cint, cstr, flt from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/stock/doctype/material_request/__init__.py b/stock/doctype/material_request/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/buying/doctype/purchase_request/locale/_messages_doc.json b/stock/doctype/material_request/locale/_messages_doc.json similarity index 87% rename from buying/doctype/purchase_request/locale/_messages_doc.json rename to stock/doctype/material_request/locale/_messages_doc.json index 16b7f311874..7a9d21692e2 100644 --- a/buying/doctype/purchase_request/locale/_messages_doc.json +++ b/stock/doctype/material_request/locale/_messages_doc.json @@ -1,12 +1,15 @@ [ "% Ordered", "Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template", + "Material Request Items", "IDT", + "Material Request", "Select Terms and Conditions", "Draft", "Name of the entity who has requested for the Purchase Requisition", + "Select Print Heading", + "Stock", "Status", - "Purchase Request", "Cancel Reason", "Terms and Conditions", "Get Terms and Conditions", @@ -17,7 +20,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field", "Remarks", "Sales Order No", - "Buying", "To manage multiple series please go to Setup > Manage Series", "Items", "Pull Sales Order Items", @@ -25,6 +27,7 @@ "Fiscal Year", "Stopped", "Cancelled", + "MREQ", "Filing in Additional Information about the Purchase Requisition will help you analyze your data better.", "Letter Head", "Amendment Date", @@ -33,9 +36,9 @@ "Select the relevant company name if you have multiple companies", "Series", "The date at which current entry is corrected in the system.", - "Purchase Requisition Details", + "% of materials ordered against this Purchase Requisition", "More Info", "One or multiple Sales Order no which generated this Purchase Requisition", "Terms and Conditions Content", - "% of materials ordered against this Purchase Requisition" + "Print Heading" ] \ No newline at end of file diff --git a/buying/doctype/purchase_request/locale/ar-doc.json b/stock/doctype/material_request/locale/ar-doc.json similarity index 91% rename from buying/doctype/purchase_request/locale/ar-doc.json rename to stock/doctype/material_request/locale/ar-doc.json index ac8b4285043..08fbe61b557 100644 --- a/buying/doctype/purchase_request/locale/ar-doc.json +++ b/stock/doctype/material_request/locale/ar-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "\u0628\u0639\u062f \u0625\u0644\u063a\u0627\u0621 \u0637\u0644\u0628 \u0634\u0631\u0627\u0621\u060c \u0633\u0648\u0641 \u0645\u0631\u0628\u0639 \u062d\u0648\u0627\u0631 \u064a\u0637\u0644\u0628 \u0645\u0646\u0643 \u0633\u0628\u0628 \u0627\u0644\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u062a\u064a \u0633\u062a\u0646\u0639\u0643\u0633 \u0641\u064a \u0647\u0630\u0627 \u0627\u0644\u0645\u062c\u0627\u0644", "Amended From": "\u0639\u062f\u0644 \u0645\u0646", "Amendment Date": "\u0627\u0644\u062a\u0639\u062f\u064a\u0644 \u062a\u0627\u0631\u064a\u062e", - "Buying": "\u0634\u0631\u0627\u0621", "Cancel Reason": "\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u0633\u0628\u0628", "Cancelled": "\u0625\u0644\u063a\u0627\u0621", "Company": "\u0634\u0631\u0643\u0629", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "\u0627\u0644\u0628\u0646\u0648\u062f", "Letter Head": "\u0631\u0633\u0627\u0644\u0629 \u0631\u0626\u064a\u0633", + "MREQ": "MREQ", + "Material Request": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f", + "Material Request Items": "\u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0627\u062f\u064a\u0629 \u0637\u0644\u0628", "More Info": "\u0627\u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a", "Name of the entity who has requested for the Purchase Requisition": "\u0627\u0633\u0645 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0630\u064a \u0627\u0644\u0645\u0637\u0644\u0648\u0628\u0629 \u0644\u0637\u0644\u0628 \u0634\u0631\u0627\u0621", "One or multiple Sales Order no which generated this Purchase Requisition": "\u0648\u0627\u062d\u062f \u0623\u0648 \u0645\u062a\u0639\u062f\u062f\u0629 \u0644\u0627 \u0645\u0646 \u0623\u062c\u0644 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0627\u0644\u062a\u064a \u0648\u0644\u062f\u062a \u0647\u0630\u0627 \u0637\u0644\u0628 \u0634\u0631\u0627\u0621", + "Print Heading": "\u0637\u0628\u0627\u0639\u0629 \u0639\u0646\u0648\u0627\u0646", "Pull Sales Order Items": "\u0633\u062d\u0628 \u0639\u0646\u0627\u0635\u0631 \u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a", - "Purchase Request": "\u0637\u0644\u0628 \u0634\u0631\u0627\u0621", - "Purchase Requisition Details": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0627\u0633\u062a\u064a\u0644\u0627\u0621 \u0634\u0631\u0627\u0621", "Remarks": "\u062a\u0635\u0631\u064a\u062d\u0627\u062a", "Requested By": "\u0627\u0644\u062a\u064a \u0637\u0644\u0628\u062a\u0647\u0627", "Sales Order No": "\u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0644\u0627", + "Select Print Heading": "\u062d\u062f\u062f \u0637\u0628\u0627\u0639\u0629 \u0627\u0644\u0639\u0646\u0648\u0627\u0646", "Select Terms and Conditions": "\u062d\u062f\u062f \u0627\u0644\u0634\u0631\u0648\u0637 \u0648\u0627\u0644\u0623\u062d\u0643\u0627\u0645", "Select the relevant company name if you have multiple companies": "\u062d\u062f\u062f \u0627\u0633\u0645 \u0627\u0644\u0634\u0631\u0643\u0629 \u0630\u0627\u062a \u0627\u0644\u0635\u0644\u0629 \u0625\u0630\u0627 \u0643\u0627\u0646 \u0644\u062f\u064a\u0643 \u0627\u0644\u0634\u0631\u0643\u0627\u062a \u0645\u062a\u0639\u062f\u062f\u0629", "Series": "\u0633\u0644\u0633\u0644\u0629", "Status": "\u062d\u0627\u0644\u0629", + "Stock": "\u0627\u0644\u0623\u0648\u0631\u0627\u0642 \u0627\u0644\u0645\u0627\u0644\u064a\u0629", "Stopped": "\u062a\u0648\u0642\u0641", "Submitted": "\u0627\u0644\u0645\u0642\u062f\u0645\u0629", "Terms and Conditions": "\u0627\u0644\u0634\u0631\u0648\u0637 \u0648\u0627\u0644\u0623\u062d\u0643\u0627\u0645", diff --git a/buying/doctype/purchase_request/locale/es-doc.json b/stock/doctype/material_request/locale/es-doc.json similarity index 91% rename from buying/doctype/purchase_request/locale/es-doc.json rename to stock/doctype/material_request/locale/es-doc.json index 32a94bae3d5..56f9d15e3e1 100644 --- a/buying/doctype/purchase_request/locale/es-doc.json +++ b/stock/doctype/material_request/locale/es-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "Despu\u00e9s de cancelar la solicitud de compra, aparecer\u00e1 un cuadro de di\u00e1logo le pedir\u00e1 motivo de la cancelaci\u00f3n, que se refleja en este campo", "Amended From": "De modificada", "Amendment Date": "Enmienda Fecha", - "Buying": "Comprar", "Cancel Reason": "Cancelar Raz\u00f3n", "Cancelled": "Cancelado", "Company": "Empresa", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "Art\u00edculos", "Letter Head": "Carta Head", + "MREQ": "MREQ", + "Material Request": "Material de Solicitud", + "Material Request Items": "Art\u00edculos de materiales Solicitar", "More Info": "M\u00e1s informaci\u00f3n", "Name of the entity who has requested for the Purchase Requisition": "Nombre de la persona que ha solicitado para la solicitud de compra", "One or multiple Sales Order no which generated this Purchase Requisition": "Una o ninguna m\u00faltiples \u00f3rdenes de venta que gener\u00f3 esta solicitud de compra", + "Print Heading": "Imprimir Encabezado", "Pull Sales Order Items": "Tire de art\u00edculos de \u00f3rdenes de venta", - "Purchase Request": "Solicitud de compra", - "Purchase Requisition Details": "Compra Detalles requisiciones", "Remarks": "Observaciones", "Requested By": "Solicitado por", "Sales Order No": "Ventas de orden", + "Select Print Heading": "Seleccione Imprimir Encabezado", "Select Terms and Conditions": "Seleccione T\u00e9rminos y Condiciones", "Select the relevant company name if you have multiple companies": "Seleccione el nombre de la empresa correspondiente, si usted tiene m\u00faltiples empresas", "Series": "Serie", "Status": "Estado", + "Stock": "Valores", "Stopped": "Detenido", "Submitted": "Enviado", "Terms and Conditions": "T\u00e9rminos y Condiciones", diff --git a/buying/doctype/purchase_request/locale/fr-doc.json b/stock/doctype/material_request/locale/fr-doc.json similarity index 92% rename from buying/doctype/purchase_request/locale/fr-doc.json rename to stock/doctype/material_request/locale/fr-doc.json index a1e6c431bfa..8734a51d209 100644 --- a/buying/doctype/purchase_request/locale/fr-doc.json +++ b/stock/doctype/material_request/locale/fr-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "Apr\u00e8s l'annulation de la demande d'achat, une bo\u00eete de dialogue vous demandera raison de l'annulation qui sera refl\u00e9t\u00e9 dans ce domaine", "Amended From": "De modifi\u00e9e", "Amendment Date": "Date de la modification", - "Buying": "Achat", "Cancel Reason": "Annuler Raison", "Cancelled": "Annul\u00e9", "Company": "Entreprise", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "Articles", "Letter Head": "A en-t\u00eate", + "MREQ": "MREQ", + "Material Request": "Demande de mat\u00e9riel", + "Material Request Items": "Articles Demande de mat\u00e9riel", "More Info": "Plus d'infos", "Name of the entity who has requested for the Purchase Requisition": "Nom de l'entit\u00e9 qui a demand\u00e9 pour la demande d'achat", "One or multiple Sales Order no which generated this Purchase Requisition": "Un ou plusieurs pas de commande client qui a g\u00e9n\u00e9r\u00e9 cette demande d'achat", + "Print Heading": "Imprimer Cap", "Pull Sales Order Items": "Tirez Articles Sales Order", - "Purchase Request": "Demande d'achat", - "Purchase Requisition Details": "Achat d\u00e9tails de r\u00e9quisition", "Remarks": "Remarques", "Requested By": "Demand\u00e9 par", "Sales Order No": "Ordonnance n \u00b0 de vente", + "Select Print Heading": "S\u00e9lectionnez Imprimer Cap", "Select Terms and Conditions": "S\u00e9lectionnez Termes et Conditions", "Select the relevant company name if you have multiple companies": "S\u00e9lectionnez le nom de l'entreprise concern\u00e9e si vous avez de multiples entreprises", "Series": "S\u00e9rie", "Status": "Statut", + "Stock": "Stock", "Stopped": "Arr\u00eat\u00e9", "Submitted": "Soumis", "Terms and Conditions": "Termes et Conditions", diff --git a/buying/doctype/purchase_request/locale/hi-doc.json b/stock/doctype/material_request/locale/hi-doc.json similarity index 92% rename from buying/doctype/purchase_request/locale/hi-doc.json rename to stock/doctype/material_request/locale/hi-doc.json index d2dd9516b0d..dcf4abc867a 100644 --- a/buying/doctype/purchase_request/locale/hi-doc.json +++ b/stock/doctype/material_request/locale/hi-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "\u0916\u0930\u0940\u0926 \u0905\u0927\u093f\u0917\u094d\u0930\u0939\u0923 \u0930\u0926\u094d\u0926 \u0915\u0930\u0928\u0947 \u0915\u0947 \u092c\u093e\u0926, \u090f\u0915 \u0938\u0902\u0935\u093e\u0926 \u092c\u0949\u0915\u094d\u0938 \u0906\u092a \u0930\u0926\u094d\u0926 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0915\u093e\u0930\u0923 \u0939\u0948 \u091c\u094b \u0907\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930 \u092e\u0947\u0902 \u092a\u0930\u093f\u0932\u0915\u094d\u0937\u093f\u0924 \u0939\u094b\u0917\u093e \u092a\u0942\u091b\u0928\u093e \u0939\u094b\u0917\u093e", "Amended From": "\u0938\u0947 \u0938\u0902\u0936\u094b\u0927\u093f\u0924", "Amendment Date": "\u0938\u0902\u0936\u094b\u0927\u0928 \u0924\u093f\u0925\u093f", - "Buying": "\u0915\u094d\u0930\u092f", "Cancel Reason": "\u0915\u093e\u0930\u0923 \u0930\u0926\u094d\u0926 \u0915\u0930\u0947\u0902", "Cancelled": "Cancelled", "Company": "\u0915\u0902\u092a\u0928\u0940", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "\u0906\u0907\u091f\u092e", "Letter Head": "\u092a\u0924\u094d\u0930\u0936\u0940\u0930\u094d\u0937", + "MREQ": "MREQ", + "Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927", + "Material Request Items": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0906\u0907\u091f\u092e", "More Info": "\u0905\u0927\u093f\u0915 \u091c\u093e\u0928\u0915\u093e\u0930\u0940", "Name of the entity who has requested for the Purchase Requisition": "\u0907\u0915\u093e\u0908 \u0939\u0948 \u091c\u094b \u0916\u0930\u0940\u0926 \u0905\u0927\u093f\u0917\u094d\u0930\u0939\u0923 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093f\u092f\u093e \u0939\u0948 \u0915\u0947 \u0928\u093e\u092e", "One or multiple Sales Order no which generated this Purchase Requisition": "\u090f\u0915 \u092f\u093e \u0915\u0908 \u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0928\u0939\u0940\u0902 \u091c\u094b \u0907\u0938 \u0916\u0930\u0940\u0926 \u0905\u0927\u093f\u0917\u094d\u0930\u0939\u0923 \u0909\u0924\u094d\u092a\u0928\u094d\u0928", + "Print Heading": "\u0936\u0940\u0930\u094d\u0937\u0915 \u092a\u094d\u0930\u093f\u0902\u091f", "Pull Sales Order Items": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0906\u0907\u091f\u092e \u0916\u0940\u0902\u091a\u094b", - "Purchase Request": "\u0905\u0928\u0941\u0930\u094b\u0927 \u0916\u0930\u0940\u0926", - "Purchase Requisition Details": "\u0916\u0930\u0940\u0926 \u092e\u093e\u0901\u0917 \u0935\u093f\u0935\u0930\u0923", "Remarks": "\u091f\u093f\u092a\u094d\u092a\u0923\u093f\u092f\u093e\u0901", "Requested By": "\u0926\u094d\u0935\u093e\u0930\u093e \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093f\u092f\u093e", "Sales Order No": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0928\u0939\u0940\u0902", + "Select Print Heading": "\u091a\u092f\u0928 \u0936\u0940\u0930\u094d\u0937\u0915 \u092a\u094d\u0930\u093f\u0902\u091f", "Select Terms and Conditions": "\u0928\u093f\u092f\u092e\u094b\u0902 \u0914\u0930 \u0936\u0930\u094d\u0924\u094b\u0902 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", "Select the relevant company name if you have multiple companies": "\u0905\u0917\u0930 \u0906\u092a \u0915\u0908 \u0915\u0902\u092a\u0928\u093f\u092f\u094b\u0902 \u092a\u094d\u0930\u093e\u0938\u0902\u0917\u093f\u0915 \u0915\u0902\u092a\u0928\u0940 \u0915\u0947 \u0928\u093e\u092e \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902", "Series": "\u0915\u0908", "Status": "\u0939\u0948\u0938\u093f\u092f\u0924", + "Stock": "\u0938\u094d\u091f\u0949\u0915", "Stopped": "\u0930\u094b\u0915", "Submitted": "\u092a\u0947\u0936", "Terms and Conditions": "\u0928\u093f\u092f\u092e \u0914\u0930 \u0936\u0930\u094d\u0924\u0947\u0902", diff --git a/buying/doctype/purchase_request/locale/hr-doc.json b/stock/doctype/material_request/locale/hr-doc.json similarity index 91% rename from buying/doctype/purchase_request/locale/hr-doc.json rename to stock/doctype/material_request/locale/hr-doc.json index 54993f9d73c..bfd9acf9934 100644 --- a/buying/doctype/purchase_request/locale/hr-doc.json +++ b/stock/doctype/material_request/locale/hr-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "Nakon poni\u0161tenja Kupnja rekvizicije, dijalo\u0161ki okvir \u0107e vas pitati razlog za otkaz koji \u0107e se odraziti i na tom polju", "Amended From": "Izmijenjena Od", "Amendment Date": "Amandman Datum", - "Buying": "Kupovina", "Cancel Reason": "Odustani razlog", "Cancelled": "Otkazan", "Company": "Dru\u0161tvo", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "Proizvodi", "Letter Head": "Pismo Head", + "MREQ": "MREQ", + "Material Request": "Materijal zahtjev", + "Material Request Items": "Materijalni Zahtjev Proizvodi", "More Info": "Vi\u0161e informacija", "Name of the entity who has requested for the Purchase Requisition": "Naziv subjekta koji je zatra\u017eio za kupnju rekvizicija", "One or multiple Sales Order no which generated this Purchase Requisition": "Jedan ili vi\u0161e prodajnog naloga ne koji generira ovu Kupnja rekvizicije", + "Print Heading": "Ispis Naslov", "Pull Sales Order Items": "Povucite Prodaja Predmeti Naru\u010divanje", - "Purchase Request": "Zahtjev za kupnju", - "Purchase Requisition Details": "Kupnja rekvizicije Detalji", "Remarks": "Primjedbe", "Requested By": "Tra\u017eeni Do", "Sales Order No": "Prodajnog naloga Ne", + "Select Print Heading": "Odaberite Ispis Naslov", "Select Terms and Conditions": "Odaberite Uvjeti i pravila", "Select the relevant company name if you have multiple companies": "Odaberite odgovaraju\u0107i naziv tvrtke ako imate vi\u0161e tvrtki", "Series": "Serija", "Status": "Status", + "Stock": "Zaliha", "Stopped": "Zaustavljen", "Submitted": "Prijavljen", "Terms and Conditions": "Odredbe i uvjeti", diff --git a/buying/doctype/purchase_request/locale/nl-doc.json b/stock/doctype/material_request/locale/nl-doc.json similarity index 91% rename from buying/doctype/purchase_request/locale/nl-doc.json rename to stock/doctype/material_request/locale/nl-doc.json index 2d6d7cfebcc..7ff12561027 100644 --- a/buying/doctype/purchase_request/locale/nl-doc.json +++ b/stock/doctype/material_request/locale/nl-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "Na het opheffen van de inkoopaanvraag, zal een dialoogvenster vraagt \u200b\u200bu reden voor de annulering die zal worden weerspiegeld in dit gebied", "Amended From": "Gewijzigd Van", "Amendment Date": "Wijziging Datum", - "Buying": "Het kopen", "Cancel Reason": "Annuleren Reden", "Cancelled": "Geannuleerd", "Company": "Vennootschap", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "Artikelen", "Letter Head": "Brief Hoofd", + "MREQ": "MREQ", + "Material Request": "Materiaal aanvragen", + "Material Request Items": "Materiaal aanvragen Items", "More Info": "Meer info", "Name of the entity who has requested for the Purchase Requisition": "Naam van de instantie die heeft verzocht om de inkoopaanvraag", "One or multiple Sales Order no which generated this Purchase Requisition": "Een of meerdere Sales Bestelnr die dit inkoopaanvraag gegenereerd", + "Print Heading": "Print rubriek", "Pull Sales Order Items": "Trek Sales Order Items", - "Purchase Request": "Aankoop Request", - "Purchase Requisition Details": "Inkoopaanvraag Details", "Remarks": "Opmerkingen", "Requested By": "Aangevraagd door", "Sales Order No": "Sales Order No", + "Select Print Heading": "Selecteer Print rubriek", "Select Terms and Conditions": "Selecteer Algemene Voorwaarden", "Select the relevant company name if you have multiple companies": "Selecteer de gewenste bedrijfsnaam als u meerdere bedrijven", "Series": "Serie", "Status": "Staat", + "Stock": "Voorraad", "Stopped": "Gestopt", "Submitted": "Ingezonden", "Terms and Conditions": "Algemene Voorwaarden", diff --git a/buying/doctype/purchase_request/locale/pt-doc.json b/stock/doctype/material_request/locale/pt-doc.json similarity index 92% rename from buying/doctype/purchase_request/locale/pt-doc.json rename to stock/doctype/material_request/locale/pt-doc.json index c15b8e8693f..4ccf8db8872 100644 --- a/buying/doctype/purchase_request/locale/pt-doc.json +++ b/stock/doctype/material_request/locale/pt-doc.json @@ -5,7 +5,6 @@ "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "Depois de cancelar a requisi\u00e7\u00e3o de compra, uma caixa de di\u00e1logo ir\u00e1 pedir-lhe raz\u00e3o para cancelamento que ser\u00e1 refletido neste campo", "Amended From": "Alterado De", "Amendment Date": "Data emenda", - "Buying": "Comprar", "Cancel Reason": "Cancelar Raz\u00e3o", "Cancelled": "Cancelado", "Company": "Companhia", @@ -17,19 +16,23 @@ "IDT": "IDT", "Items": "Itens", "Letter Head": "Cabe\u00e7a letra", + "MREQ": "Mreq", + "Material Request": "Pedido de material", + "Material Request Items": "Pedido de itens de material", "More Info": "Mais informa\u00e7\u00f5es", "Name of the entity who has requested for the Purchase Requisition": "Nome da entidade que solicitou para a requisi\u00e7\u00e3o de compra", "One or multiple Sales Order no which generated this Purchase Requisition": "Um ou nenhum Ordem m\u00faltipla de vendas que gerou esta requisi\u00e7\u00e3o de compra", + "Print Heading": "Imprimir t\u00edtulo", "Pull Sales Order Items": "Puxe itens da ordem", - "Purchase Request": "Pedido de Compra", - "Purchase Requisition Details": "Comprar Detalhes Requisi\u00e7\u00e3o", "Remarks": "Observa\u00e7\u00f5es", "Requested By": "Solicitado por", "Sales Order No": "Vendas decreto n \u00ba", + "Select Print Heading": "Selecione Imprimir t\u00edtulo", "Select Terms and Conditions": "Selecione Termos e Condi\u00e7\u00f5es", "Select the relevant company name if you have multiple companies": "Selecione o nome da empresa em quest\u00e3o, se voc\u00ea tem v\u00e1rias empresas", "Series": "S\u00e9rie", "Status": "Estado", + "Stock": "Estoque", "Stopped": "Parado", "Submitted": "Enviado", "Terms and Conditions": "Termos e Condi\u00e7\u00f5es", diff --git a/buying/doctype/purchase_request/purchase_request.js b/stock/doctype/material_request/material_request.js similarity index 52% rename from buying/doctype/purchase_request/purchase_request.js rename to stock/doctype/material_request/material_request.js index fdbb9c09762..21bc141659b 100644 --- a/buying/doctype/purchase_request/purchase_request.js +++ b/stock/doctype/material_request/material_request.js @@ -14,111 +14,97 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -cur_frm.cscript.tname = "Purchase Request Item"; +cur_frm.cscript.tname = "Material Request Item"; cur_frm.cscript.fname = "indent_details"; wn.require('app/buying/doctype/purchase_common/purchase_common.js'); wn.require('app/utilities/doctype/sms_control/sms_control.js'); -erpnext.buying.PurchaseRequestController = erpnext.buying.BuyingController.extend({ +erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.extend({ refresh: function(doc) { this._super(); if(doc.docstatus == 1 && doc.status != 'Stopped'){ - cur_frm.add_custom_button("Make Supplier Quotation", cur_frm.cscript.make_supplier_quotation); + if(doc.material_request_type === "Purchase") + cur_frm.add_custom_button("Make Supplier Quotation", cur_frm.cscript.make_supplier_quotation); + + if(doc.material_request_type === "Transfer" && doc.status === "Submitted") + cur_frm.add_custom_button("Transfer Material", cur_frm.cscript.make_stock_entry); + if(flt(doc.per_ordered, 2) < 100) { - cur_frm.add_custom_button('Make Purchase Order', cur_frm.cscript['Make Purchase Order']); - cur_frm.add_custom_button('Stop Purchase Request', cur_frm.cscript['Stop Purchase Request']); + if(doc.material_request_type === "Purchase") + cur_frm.add_custom_button('Make Purchase Order', cur_frm.cscript['Make Purchase Order']); + + cur_frm.add_custom_button('Stop Material Request', cur_frm.cscript['Stop Material Request']); } cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } if(doc.docstatus == 1 && doc.status == 'Stopped') - cur_frm.add_custom_button('Unstop Purchase Request', cur_frm.cscript['Unstop Purchase Request']) + cur_frm.add_custom_button('Unstop Material Request', cur_frm.cscript['Unstop Material Request']); + + if(doc.material_request_type === "Transfer") { + cur_frm.toggle_display("sales_order_no", false); + cur_frm.fields_dict.indent_details.grid.set_column_disp("sales_order_no", false); + } } }); -var new_cscript = new erpnext.buying.PurchaseRequestController({frm: cur_frm}); +var new_cscript = new erpnext.buying.MaterialRequestController({frm: cur_frm}); // for backward compatibility: combine new and previous states $.extend(cur_frm.cscript, new_cscript); -//========================== On Load ================================================= cur_frm.cscript.onload = function(doc, cdt, cdn) { - if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date()) + if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date()); if (!doc.status) doc.status = 'Draft'; // defined in purchase_common.js //cur_frm.cscript.update_item_details(doc, cdt, cdn); -} +}; cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { // second call if(doc.__islocal){ cur_frm.cscript.get_item_defaults(doc); } -} +}; cur_frm.cscript.get_item_defaults = function(doc) { - var ch = getchildren( 'Purchase Request Item', doc.name, 'indent_details'); + var ch = getchildren( 'Material Request Item', doc.name, 'indent_details'); if (flt(ch.length) > 0){ $c_obj(make_doclist(doc.doctype, doc.name), 'get_item_defaults', '', function(r, rt) {refresh_field('indent_details'); }); } -} +}; -//======================= transaction date ============================= cur_frm.cscript.transaction_date = function(doc,cdt,cdn){ if(doc.__islocal){ cur_frm.cscript.get_default_schedule_date(doc); } -} +}; -//=================== Quantity =================================================================== cur_frm.cscript.qty = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if (flt(d.qty) < flt(d.min_order_qty)) - alert("Warning: Purchase Requested Qty is less than Minimum Order Qty"); -} + alert("Warning: Material Requested Qty is less than Minimum Order Qty"); +}; -// On Button Click Functions -// ------------------------------------------------------------------------------ - -// Make Purchase Order -cur_frm.cscript['Make Purchase Order'] = function() { +cur_frm.cscript['Stop Material Request'] = function() { var doc = cur_frm.doc; - n = wn.model.make_new_doc_and_get_name('Purchase Order'); - $c('dt_map', args={ - 'docs':wn.model.compress([locals['Purchase Order'][n]]), - 'from_doctype':doc.doctype, - 'to_doctype':'Purchase Order', - 'from_docname':doc.name, - 'from_to_list':"[['Purchase Request','Purchase Order'],['Purchase Request Item','Purchase Order Item']]" - }, function(r,rt) { - loaddoc('Purchase Order', n); - } - ); -} - -// Stop INDENT -// ================================================================================================== -cur_frm.cscript['Stop Purchase Request'] = function() { - var doc = cur_frm.doc; - var check = confirm("Do you really want to STOP this Purchase Request?"); + var check = confirm("Do you really want to STOP this Material Request?"); if (check) { $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) { cur_frm.refresh(); }); } -} +}; -// Un Stop INDENT -//==================================================================================================== -cur_frm.cscript['Unstop Purchase Request'] = function(){ - var doc = cur_frm.doc - var check = confirm("Do you really want to UNSTOP this Purchase Request?"); +cur_frm.cscript['Unstop Material Request'] = function(){ + var doc = cur_frm.doc; + var check = confirm("Do you really want to UNSTOP this Material Request?"); if (check) { $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) { @@ -126,16 +112,16 @@ cur_frm.cscript['Unstop Purchase Request'] = function(){ }); } -} +}; + +cur_frm.cscript['Make Purchase Order'] = function() { + cur_frm.map([["Material Request", "Purchase Order"], ["Material Request Item", "Purchase Order Item"]]); +}; cur_frm.cscript.make_supplier_quotation = function() { - var new_sq_name = wn.model.make_new_doc_and_get_name("Supplier Quotation"); - $c("dt_map", { - "docs": wn.model.compress([locals['Supplier Quotation'][new_sq_name]]), - "from_doctype": cur_frm.doc.doctype, - "to_doctype": "Supplier Quotation", - "from_docname": cur_frm.doc.name, - "from_to_list": JSON.stringify([['Purchase Request', 'Supplier Quotation'], - ['Purchase Request Item', 'Supplier Quotation Item']]), - }, function(r, rt) { loaddoc("Supplier Quotation", new_sq_name) }); -} \ No newline at end of file + cur_frm.map([["Material Request", "Supplier Quotation"], ["Material Request Item", "Supplier Quotation Item"]]); +}; + +cur_frm.cscript.make_stock_entry = function() { + cur_frm.map([["Material Request", "Stock Entry"], ["Material Request Item", "Stock Entry Detail"]]); +}; diff --git a/buying/doctype/purchase_request/purchase_request.py b/stock/doctype/material_request/material_request.py similarity index 56% rename from buying/doctype/purchase_request/purchase_request.py rename to stock/doctype/material_request/material_request.py index 324200b2bcd..e476aa47435 100644 --- a/buying/doctype/purchase_request/purchase_request.py +++ b/stock/doctype/material_request/material_request.py @@ -1,37 +1,20 @@ # ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# For license information, please see license.txt from __future__ import unicode_literals import webnotes -from webnotes.utils import cstr, flt, get_defaults -from webnotes.model.wrapper import getlist +from webnotes.utils import cstr, flt +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint -sql = webnotes.conn.sql - - from controllers.buying_controller import BuyingController class DocType(BuyingController): def __init__(self, doc, doclist=[]): self.doc = doc self.doclist = doclist - self.defaults = get_defaults() - self.tname = 'Purchase Request Item' + self.tname = 'Material Request Item' self.fname = 'indent_details' def get_default_schedule_date(self): @@ -46,7 +29,7 @@ class DocType(BuyingController): def pull_so_details(self): self.check_if_already_pulled() if self.doc.sales_order_no: - get_obj('DocType Mapper', 'Sales Order-Purchase Request', with_children=1).dt_map('Sales Order', 'Purchase Request', self.doc.sales_order_no, self.doc, self.doclist, "[['Sales Order', 'Purchase Request'],['Sales Order Item', 'Purchase Request Item']]") + get_obj('DocType Mapper', 'Sales Order-Material Request', with_children=1).dt_map('Sales Order', 'Material Request', self.doc.sales_order_no, self.doc, self.doclist, "[['Sales Order', 'Material Request'],['Sales Order Item', 'Material Request Item']]") self.get_item_defaults() else: msgprint("Please select Sales Order whose details need to pull") @@ -60,7 +43,7 @@ class DocType(BuyingController): def get_item_defaults(self): self.get_default_schedule_date() for d in getlist(self.doclist, 'indent_details'): - det = sql("select min_order_qty from tabItem where name = '%s'" % d.item_code) + det = webnotes.conn.sql("select min_order_qty from tabItem where name = '%s'" % d.item_code) d.min_order_qty = det and flt(det[0][0]) or 0 # Validate so items @@ -79,10 +62,10 @@ class DocType(BuyingController): for so_no in so_items.keys(): for item in so_items[so_no].keys(): - already_indented = sql("select sum(qty) from `tabPurchase Request Item` where item_code = '%s' and sales_order_no = '%s' and docstatus = 1 and parent != '%s'" % (item, so_no, self.doc.name)) + already_indented = webnotes.conn.sql("select sum(qty) from `tabMaterial Request Item` where item_code = '%s' and sales_order_no = '%s' and docstatus = 1 and parent != '%s'" % (item, so_no, self.doc.name)) already_indented = already_indented and flt(already_indented[0][0]) or 0 - actual_so_qty = sql("select sum(qty) from `tabSales Order Item` where parent = '%s' and item_code = '%s' and docstatus = 1 group by parent" % (so_no, item)) + actual_so_qty = webnotes.conn.sql("select sum(qty) from `tabSales Order Item` where parent = '%s' and item_code = '%s' and docstatus = 1 group by parent" % (so_no, item)) actual_so_qty = actual_so_qty and flt(actual_so_qty[0][0]) or 0 if flt(so_items[so_no][item]) + already_indented > actual_so_qty: @@ -92,7 +75,7 @@ class DocType(BuyingController): # Validate fiscal year # ---------------------------- def validate_fiscal_year(self): - get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.transaction_date,'Purchase Request Date') + get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.transaction_date,'Material Request Date') # GET TERMS & CONDITIONS #----------------------------- @@ -105,7 +88,7 @@ class DocType(BuyingController): #:::::::: validate schedule date v/s indent date :::::::::::: for d in getlist(self.doclist, 'indent_details'): if d.schedule_date < self.doc.transaction_date: - msgprint("Expected Schedule Date cannot be before Purchase Request Date") + msgprint("Expected Schedule Date cannot be before Material Request Date") raise Exception # Validate @@ -135,24 +118,24 @@ class DocType(BuyingController): def update_bin(self, is_submit, is_stopped): - """ Update Quantity Requested for Purchase in Bin""" - - for d in getlist(self.doclist, 'indent_details'): - if webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == "Yes": - if not d.warehouse: - msgprint("Please Enter Warehouse for Item %s as it is stock item" - % cstr(d.item_code), raise_exception=1) + """ Update Quantity Requested for Purchase in Bin for Material Request of type 'Purchase'""" + if self.doc.material_request_type == "Purchase": + for d in getlist(self.doclist, 'indent_details'): + if webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == "Yes": + if not d.warehouse: + msgprint("Please Enter Warehouse for Item %s as it is stock item" + % cstr(d.item_code), raise_exception=1) - qty =flt(d.qty) - if is_stopped: - qty = (d.qty > d.ordered_qty) and flt(flt(d.qty) - flt(d.ordered_qty)) or 0 + qty =flt(d.qty) + if is_stopped: + qty = (d.qty > d.ordered_qty) and flt(flt(d.qty) - flt(d.ordered_qty)) or 0 - args = { - "item_code": d.item_code, - "indented_qty": (is_submit and 1 or -1) * flt(qty), - "posting_date": self.doc.transaction_date - } - get_obj('Warehouse', d.warehouse).update_bin(args) + args = { + "item_code": d.item_code, + "indented_qty": (is_submit and 1 or -1) * flt(qty), + "posting_date": self.doc.transaction_date + } + get_obj('Warehouse', d.warehouse).update_bin(args) def on_submit(self): purchase_controller = webnotes.get_obj("Purchase Common") @@ -162,8 +145,8 @@ class DocType(BuyingController): self.update_bin(is_submit = 1, is_stopped = 0) def check_modified_date(self): - mod_db = sql("select modified from `tabPurchase Request` where name = '%s'" % self.doc.name) - date_diff = sql("select TIMEDIFF('%s', '%s')" % ( mod_db[0][0],cstr(self.doc.modified))) + mod_db = webnotes.conn.sql("select modified from `tabMaterial Request` where name = '%s'" % self.doc.name) + date_diff = webnotes.conn.sql("select TIMEDIFF('%s', '%s')" % ( mod_db[0][0],cstr(self.doc.modified))) if date_diff and date_diff[0][0]: msgprint(cstr(self.doc.doctype) +" => "+ cstr(self.doc.name) +" has been modified. Please Refresh. ") @@ -186,12 +169,56 @@ class DocType(BuyingController): pc_obj = get_obj(dt='Purchase Common') # Step 2:=> Check for stopped status - pc_obj.check_for_stopped_status( self.doc.doctype, self.doc.name) + pc_obj.check_for_stopped_status(self.doc.doctype, self.doc.name) - # Step 3:=> Check if Purchase Order has been submitted against current Purchase Request + # Step 3:=> Check if Purchase Order has been submitted against current Material Request pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Order', docname = self.doc.name, detail_doctype = 'Purchase Order Item') # Step 4:=> Update Bin self.update_bin(is_submit = 0, is_stopped = (cstr(self.doc.status) == 'Stopped') and 1 or 0) # Step 5:=> Set Status webnotes.conn.set(self.doc,'status','Cancelled') + + def update_completed_qty(self, mr_items=None): + if self.doc.material_request_type != "Transfer": + return + + item_doclist = self.doclist.get({"parentfield": "indent_details"}) + + if not mr_items: + mr_items = [d.name for d in item_doclist] + + per_ordered = 0.0 + for d in item_doclist: + if d.name in mr_items: + d.ordered_qty = flt(webnotes.conn.sql("""select sum(transfer_qty) + from `tabStock Entry Detail` where material_request = %s + and material_request_item = %s and docstatus = 1""", + (self.doc.name, d.name))[0][0]) + webnotes.conn.set_value(d.doctype, d.name, "ordered_qty", d.ordered_qty) + + # note: if qty is 0, its row is still counted in len(item_doclist) + # hence adding 1 to per_ordered + if (d.ordered_qty > d.qty) or not d.qty: + per_ordered += 1.0 + elif d.qty > 0: + per_ordered += flt(d.ordered_qty / flt(d.qty)) + + if per_ordered: + self.doc.per_ordered = flt((per_ordered / flt(len(item_doclist))) * 100.0, 2) + webnotes.conn.set_value(self.doc.doctype, self.doc.name, "per_ordered", self.doc.per_ordered) + + +def update_completed_qty(controller, caller_method): + if controller.doc.doctype == "Stock Entry": + material_request_map = {} + + for d in controller.doclist.get({"parentfield": "mtn_details"}): + if d.material_request: + if d.material_request not in material_request_map: + material_request_map[d.material_request] = [] + material_request_map[d.material_request].append(d.material_request_item) + + for mr_name, mr_items in material_request_map.items(): + webnotes.get_obj("Material Request", mr_name, with_children=1).update_completed_qty(mr_items) + \ No newline at end of file diff --git a/buying/doctype/purchase_request/purchase_request.txt b/stock/doctype/material_request/material_request.txt similarity index 75% rename from buying/doctype/purchase_request/purchase_request.txt rename to stock/doctype/material_request/material_request.txt index 6aad4ee84b8..0668bdf5f10 100644 --- a/buying/doctype/purchase_request/purchase_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-21 18:19:20", + "creation": "2013-02-20 13:25:31", "docstatus": 0, - "modified": "2013-01-29 18:14:11", + "modified": "2013-02-21 10:59:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,7 +12,7 @@ "autoname": "naming_series:", "doctype": "DocType", "is_submittable": 1, - "module": "Buying", + "module": "Stock", "name": "__common__", "read_only_onload": 1, "search_fields": "status,transaction_date,sales_order_no" @@ -20,29 +20,36 @@ { "doctype": "DocField", "name": "__common__", - "parent": "Purchase Request", + "parent": "Material Request", "parentfield": "fields", "parenttype": "DocType", "permlevel": 0 }, { - "amend": 1, - "cancel": 1, - "create": 1, "doctype": "DocPerm", "name": "__common__", - "parent": "Purchase Request", + "parent": "Material Request", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, - "read": 1, - "report": 1, - "submit": 1, - "write": 1 + "read": 1 }, { "doctype": "DocType", - "name": "Purchase Request" + "name": "Material Request" + }, + { + "doctype": "DocField", + "fieldname": "material_request_type", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Material Request Type", + "options": "Purchase\nTransfer", + "reqd": 1 + }, + { + "doctype": "DocField", + "fieldname": "column_break_2", + "fieldtype": "Column Break" }, { "description": "To manage multiple series please go to Setup > Manage Series", @@ -53,25 +60,10 @@ "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", - "options": "IDT", + "options": "MREQ-\nIDT", "print_hide": 1, "reqd": 1 }, - { - "description": "The date at which current entry is made in system.", - "doctype": "DocField", - "fieldname": "transaction_date", - "fieldtype": "Date", - "in_filter": 1, - "label": "Transaction Date", - "no_copy": 1, - "oldfieldname": "transaction_date", - "oldfieldtype": "Date", - "print_width": "100px", - "reqd": 1, - "search_index": 1, - "width": "100px" - }, { "doctype": "DocField", "fieldname": "items", @@ -84,11 +76,11 @@ "doctype": "DocField", "fieldname": "indent_details", "fieldtype": "Table", - "label": "Purchase Requisition Details", + "label": "Material Request Items", "no_copy": 0, "oldfieldname": "indent_details", "oldfieldtype": "Table", - "options": "Purchase Request Item" + "options": "Material Request Item" }, { "doctype": "DocField", @@ -104,7 +96,7 @@ "width": "50%" }, { - "description": "One or multiple Sales Order no which generated this Purchase Requisition", + "description": "One or multiple Sales Order no which generated this Material Request", "doctype": "DocField", "fieldname": "sales_order_no", "fieldtype": "Link", @@ -132,7 +124,7 @@ }, { "default": "Give additional details about the indent.", - "description": "Filing in Additional Information about the Purchase Requisition will help you analyze your data better.", + "description": "Filing in Additional Information about the Material Request will help you analyze your data better.", "doctype": "DocField", "fieldname": "more_info", "fieldtype": "Section Break", @@ -147,6 +139,21 @@ "print_width": "50%", "width": "50%" }, + { + "description": "The date at which current entry is made in system.", + "doctype": "DocField", + "fieldname": "transaction_date", + "fieldtype": "Date", + "in_filter": 1, + "label": "Transaction Date", + "no_copy": 1, + "oldfieldname": "transaction_date", + "oldfieldtype": "Date", + "print_width": "100px", + "reqd": 1, + "search_index": 1, + "width": "100px" + }, { "description": "Select the relevant company name if you have multiple companies", "doctype": "DocField", @@ -179,7 +186,7 @@ "width": "150px" }, { - "description": "Name of the entity who has requested for the Purchase Requisition", + "description": "Name of the entity who has requested for the Material Request", "doctype": "DocField", "fieldname": "requested_by", "fieldtype": "Data", @@ -191,18 +198,6 @@ "print_width": "100px", "width": "100px" }, - { - "description": "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field", - "doctype": "DocField", - "fieldname": "cancel_reason", - "fieldtype": "Data", - "label": "Cancel Reason", - "no_copy": 1, - "oldfieldname": "cancel_reason", - "oldfieldtype": "Data", - "print_hide": 1, - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "column_break2", @@ -241,12 +236,12 @@ "width": "100px" }, { - "description": "% of materials ordered against this Purchase Requisition", + "description": "% of materials ordered against this Material Request", "doctype": "DocField", "fieldname": "per_ordered", "fieldtype": "Percent", "in_list_view": 1, - "label": "% Ordered", + "label": "% Completed", "no_copy": 1, "oldfieldname": "per_ordered", "oldfieldtype": "Currency", @@ -283,7 +278,7 @@ "doctype": "DocField", "fieldname": "remark", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Remarks", "no_copy": 1, "oldfieldname": "remark", @@ -293,7 +288,7 @@ "width": "150px" }, { - "description": "Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template", + "description": "Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template", "doctype": "DocField", "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -327,6 +322,15 @@ "oldfieldname": "terms", "oldfieldtype": "Text Editor" }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "select_print_heading", + "fieldtype": "Select", + "label": "Select Print Heading", + "options": "Print Heading", + "print_hide": 1 + }, { "doctype": "DocField", "fieldname": "file_list", @@ -337,19 +341,89 @@ "print_hide": 1 }, { + "amend": 0, + "cancel": 0, + "create": 0, "doctype": "DocPerm", - "role": "Purchase User" + "permlevel": 1, + "report": 0, + "role": "Purchase Manager", + "submit": 0, + "write": 0 }, { + "amend": 1, + "cancel": 1, + "create": 1, "doctype": "DocPerm", - "role": "Purchase Manager" + "permlevel": 0, + "report": 1, + "role": "Purchase Manager", + "submit": 1, + "write": 1 }, { + "amend": 0, + "cancel": 0, + "create": 0, "doctype": "DocPerm", - "role": "Material Manager" + "permlevel": 1, + "report": 0, + "role": "Material Manager", + "submit": 0, + "write": 0 }, { + "amend": 1, + "cancel": 1, + "create": 1, "doctype": "DocPerm", - "role": "Material User" + "permlevel": 0, + "report": 1, + "role": "Material Manager", + "submit": 1, + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "report": 0, + "role": "Material User", + "submit": 0, + "write": 0 + }, + { + "amend": 1, + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Material User", + "submit": 1, + "write": 1 + }, + { + "amend": 1, + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "permlevel": 0, + "report": 1, + "role": "Purchase User", + "submit": 1, + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "role": "Purchase User", + "submit": 0 } ] \ No newline at end of file diff --git a/stock/doctype/material_request/test_material_request.py b/stock/doctype/material_request/test_material_request.py new file mode 100644 index 00000000000..1fa1a9f4586 --- /dev/null +++ b/stock/doctype/material_request/test_material_request.py @@ -0,0 +1,118 @@ +# ERPNext - web based ERP (http://erpnext.com) +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes, unittest + +class TestMaterialRequest(unittest.TestCase): + def _test_expected(self, doclist, expected_values): + for i, expected in enumerate(expected_values): + for fieldname, val in expected.items(): + self.assertEquals(val, doclist[i].fields.get(fieldname)) + + def test_completed_qty_for_purchase(self): + # submit material request of type Purchase + mr = webnotes.bean(copy=test_records[0]) + mr.insert() + mr.submit() + + # check if per complete is None + self._test_expected(mr.doclist, [{"per_ordered": None}, {"ordered_qty": None}, {"ordered_qty": None}]) + + # map a purchase order + po = webnotes.map_doclist([["Material Request", "Purchase Order"], + ["Material Request Item", "Purchase Order Item"]], mr.doc.name) + po = webnotes.bean(po) + po.doc.fields.update({ + "supplier": "_Test Supplier", + "supplier_name": "_Test Supplier", + "transaction_date": mr.doc.transaction_date, + "fiscal_year": "_Test Fiscal Year 2013", + "currency": "INR", + "conversion_rate": 1.0, + "grand_total_import": 0.0 + }) + po.doclist[1].qty = 27.0 + po.doclist[2].qty = 1.5 + po.insert() + po.submit() + + # check if per complete is as expected + mr.load_from_db() + self._test_expected(mr.doclist, [{"per_ordered": 50}, {"ordered_qty": 27.0}, {"ordered_qty": 1.5}]) + + po.cancel() + # check if per complete is as expected + mr.load_from_db() + self._test_expected(mr.doclist, [{"per_ordered": 0}, {"ordered_qty": 0}, {"ordered_qty": 0}]) + + def test_completed_qty_for_transfer(self): + # submit material request of type Purchase + mr = webnotes.bean(copy=test_records[0]) + mr.doc.material_request_type = "Transfer" + mr.insert() + mr.submit() + + # check if per complete is None + self._test_expected(mr.doclist, [{"per_ordered": None}, {"ordered_qty": None}, {"ordered_qty": None}]) + + # map a stock entry + se = webnotes.map_doclist([["Material Request", "Stock Entry"], + ["Material Request Item", "Stock Entry Detail"]], mr.doc.name) + se = webnotes.bean(se) + se.doc.fields.update({ + "posting_date": "2013-03-01", + "posting_time": "00:00" + }) + se.doclist[1].fields.update({ + "qty": 27.0, + "transfer_qty": 27.0, + "s_warehouse": "_Test Warehouse 1", + "incoming_rate": 1.0 + }) + se.doclist[2].fields.update({ + "qty": 1.5, + "transfer_qty": 1.5, + "s_warehouse": "_Test Warehouse 1", + "incoming_rate": 1.0 + }) + se.insert() + se.submit() + + # check if per complete is as expected + mr.load_from_db() + self._test_expected(mr.doclist, [{"per_ordered": 50}, {"ordered_qty": 27.0}, {"ordered_qty": 1.5}]) + +test_records = [ + [ + { + "company": "_Test Company", + "doctype": "Material Request", + "fiscal_year": "_Test Fiscal Year 2013", + "transaction_date": "2013-02-18", + "material_request_type": "Purchase" + }, + { + "description": "_Test Item Home Desktop 100", + "doctype": "Material Request Item", + "item_code": "_Test Item Home Desktop 100", + "item_name": "_Test Item Home Desktop 100", + "parentfield": "indent_details", + "qty": 54.0, + "schedule_date": "2013-02-18", + "uom": "_Test UOM", + "warehouse": "_Test Warehouse" + }, + { + "description": "_Test Item Home Desktop 200", + "doctype": "Material Request Item", + "item_code": "_Test Item Home Desktop 200", + "item_name": "_Test Item Home Desktop 200", + "parentfield": "indent_details", + "qty": 3.0, + "schedule_date": "2013-02-19", + "uom": "_Test UOM", + "warehouse": "_Test Warehouse" + } + ] +] \ No newline at end of file diff --git a/stock/doctype/material_request_item/__init__.py b/stock/doctype/material_request_item/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/buying/doctype/purchase_request_item/locale/_messages_doc.json b/stock/doctype/material_request_item/locale/_messages_doc.json similarity index 81% rename from buying/doctype/purchase_request_item/locale/_messages_doc.json rename to stock/doctype/material_request_item/locale/_messages_doc.json index a8706dc070a..5ed4ee54876 100644 --- a/buying/doctype/purchase_request_item/locale/_messages_doc.json +++ b/stock/doctype/material_request_item/locale/_messages_doc.json @@ -5,15 +5,15 @@ "Lead Time Date", "Brand", "Ordered Qty", + "Sales Order No", "Page Break", "Stock UOM", - "Item Group", + "Material Request Item", "Min Order Qty", - "Purchase Request Item", + "Item Group", "Warehouse", "Projected Qty", - "Sales Order No", + "Quantity", "Item Code", - "Buying", - "Quantity" + "Stock" ] \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/ar-doc.json b/stock/doctype/material_request_item/locale/ar-doc.json similarity index 84% rename from buying/doctype/purchase_request_item/locale/ar-doc.json rename to stock/doctype/material_request_item/locale/ar-doc.json index 0bc61886140..b4d02cf5b39 100644 --- a/buying/doctype/purchase_request_item/locale/ar-doc.json +++ b/stock/doctype/material_request_item/locale/ar-doc.json @@ -1,19 +1,19 @@ { "Brand": "\u0639\u0644\u0627\u0645\u0629 \u062a\u062c\u0627\u0631\u064a\u0629", - "Buying": "\u0634\u0631\u0627\u0621", "Description": "\u0648\u0635\u0641", "Item Code": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0631\u0645\u0632", "Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629", "Item Name": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0627\u0633\u0645", "Lead Time Date": "\u062a\u0624\u062f\u064a \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0642\u062a", + "Material Request Item": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0627\u0644\u0625\u063a\u0644\u0627\u0642", "Min Order Qty": "\u062f\u0642\u064a\u0642\u0629 \u0627\u0644\u0643\u0645\u064a\u0629 \u062a\u0631\u062a\u064a\u0628", "Ordered Qty": "\u0623\u0645\u0631\u062a \u0627\u0644\u0643\u0645\u064a\u0647", "Page Break": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0633\u062a\u0631\u0627\u062d\u0629", "Projected Qty": "\u0627\u0644\u0643\u0645\u064a\u0629 \u0627\u0644\u0645\u062a\u0648\u0642\u0639", - "Purchase Request Item": "\u0634\u0631\u0627\u0621 \u0627\u0644\u0633\u0644\u0639\u0629 \u0637\u0644\u0628", "Quantity": "\u0643\u0645\u064a\u0629", "Required Date": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0645\u0637\u0644\u0648\u0628\u0629", "Sales Order No": "\u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0645\u0628\u064a\u0639\u0627\u062a \u0644\u0627", + "Stock": "\u0627\u0644\u0623\u0648\u0631\u0627\u0642 \u0627\u0644\u0645\u0627\u0644\u064a\u0629", "Stock UOM": "\u0627\u0644\u0623\u0633\u0647\u0645 UOM", "Warehouse": "\u0645\u0633\u062a\u0648\u062f\u0639" } \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/es-doc.json b/stock/doctype/material_request_item/locale/es-doc.json similarity index 86% rename from buying/doctype/purchase_request_item/locale/es-doc.json rename to stock/doctype/material_request_item/locale/es-doc.json index 7fb0d6e9166..95d68f78261 100644 --- a/buying/doctype/purchase_request_item/locale/es-doc.json +++ b/stock/doctype/material_request_item/locale/es-doc.json @@ -1,19 +1,19 @@ { "Brand": "Marca", - "Buying": "Comprar", "Description": "Descripci\u00f3n", "Item Code": "C\u00f3digo del art\u00edculo", "Item Group": "Grupo de art\u00edculos", "Item Name": "Nombre del elemento", "Lead Time Date": "Plomo Fecha Hora", + "Material Request Item": "Art\u00edculo Material Request", "Min Order Qty": "Min. Orden Cantidad", "Ordered Qty": "Cantidad Pedido", "Page Break": "Salto de p\u00e1gina", "Projected Qty": "Cantidad proyectada", - "Purchase Request Item": "Compra Solicitar Art\u00edculo", "Quantity": "Cantidad", "Required Date": "Fecha requerida", "Sales Order No": "Ventas de orden", + "Stock": "Valores", "Stock UOM": "De la UOM", "Warehouse": "Almac\u00e9n" } \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/fr-doc.json b/stock/doctype/material_request_item/locale/fr-doc.json similarity index 87% rename from buying/doctype/purchase_request_item/locale/fr-doc.json rename to stock/doctype/material_request_item/locale/fr-doc.json index d8bbae7f81b..874b54c44d5 100644 --- a/buying/doctype/purchase_request_item/locale/fr-doc.json +++ b/stock/doctype/material_request_item/locale/fr-doc.json @@ -1,19 +1,19 @@ { "Brand": "Marque", - "Buying": "Achat", "Description": "Description", "Item Code": "Code de l'article", "Item Group": "Groupe d'\u00e9l\u00e9ments", "Item Name": "Nom d'article", "Lead Time Date": "Plomb Date Heure", + "Material Request Item": "Article demande de mat\u00e9riel", "Min Order Qty": "Quantit\u00e9 de commande minimale", "Ordered Qty": "Qt\u00e9 command\u00e9e", "Page Break": "Saut de page", "Projected Qty": "Qt\u00e9 projet\u00e9", - "Purchase Request Item": "Achetez article Demande d'", "Quantity": "Quantit\u00e9", "Required Date": "Requis Date", "Sales Order No": "Ordonnance n \u00b0 de vente", + "Stock": "Stock", "Stock UOM": "Stock UDM", "Warehouse": "Entrep\u00f4t" } \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/hi-doc.json b/stock/doctype/material_request_item/locale/hi-doc.json similarity index 86% rename from buying/doctype/purchase_request_item/locale/hi-doc.json rename to stock/doctype/material_request_item/locale/hi-doc.json index a115d684d1a..c0ce26e526e 100644 --- a/buying/doctype/purchase_request_item/locale/hi-doc.json +++ b/stock/doctype/material_request_item/locale/hi-doc.json @@ -1,19 +1,19 @@ { "Brand": "\u092c\u094d\u0930\u093e\u0902\u0921", - "Buying": "\u0915\u094d\u0930\u092f", "Description": "\u0935\u093f\u0935\u0930\u0923", "Item Code": "\u0906\u0907\u091f\u092e \u0915\u094b\u0921", "Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939", "Item Name": "\u092e\u0926 \u0915\u093e \u0928\u093e\u092e", "Lead Time Date": "\u0932\u0940\u0921 \u0926\u093f\u0928\u093e\u0902\u0915 \u0914\u0930 \u0938\u092e\u092f", + "Material Request Item": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0906\u0907\u091f\u092e", "Min Order Qty": "\u0928\u094d\u092f\u0942\u0928\u0924\u092e \u0906\u0926\u0947\u0936 \u092e\u093e\u0924\u094d\u0930\u093e", "Ordered Qty": "\u0939\u093f\u0938\u093e\u092c \u0938\u0947 \u092e\u093e\u0924\u094d\u0930\u093e", "Page Break": "\u092a\u0943\u0937\u094d\u0920\u093e\u0924\u0930", "Projected Qty": "\u0905\u0928\u0941\u092e\u093e\u0928\u093f\u0924 \u092e\u093e\u0924\u094d\u0930\u093e", - "Purchase Request Item": "\u0905\u0928\u0941\u0930\u094b\u0927 \u0906\u0907\u091f\u092e \u0916\u0930\u0940\u0926", "Quantity": "\u092e\u093e\u0924\u094d\u0930\u093e", "Required Date": "\u0906\u0935\u0936\u094d\u092f\u0915 \u0924\u093f\u0925\u093f", "Sales Order No": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0928\u0939\u0940\u0902", + "Stock": "\u0938\u094d\u091f\u0949\u0915", "Stock UOM": "\u0938\u094d\u091f\u0949\u0915 UOM", "Warehouse": "\u0917\u094b\u0926\u093e\u092e" } \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/hr-doc.json b/stock/doctype/material_request_item/locale/hr-doc.json similarity index 86% rename from buying/doctype/purchase_request_item/locale/hr-doc.json rename to stock/doctype/material_request_item/locale/hr-doc.json index b8c5f2dfeb8..d74503a1f99 100644 --- a/buying/doctype/purchase_request_item/locale/hr-doc.json +++ b/stock/doctype/material_request_item/locale/hr-doc.json @@ -1,19 +1,19 @@ { "Brand": "Marka", - "Buying": "Kupovina", "Description": "Opis", "Item Code": "Stavka \u0160ifra", "Item Group": "Stavka Grupa", "Item Name": "Stavka Ime", "Lead Time Date": "Olovo Time Date", + "Material Request Item": "Materijal Zahtjev artikla", "Min Order Qty": "Min Red Kol", "Ordered Qty": "\u017d Kol", "Page Break": "Prijelom stranice", "Projected Qty": "Predvi\u0111en Kol", - "Purchase Request Item": "Zahtjev za kupnju predmeta", "Quantity": "Koli\u010dina", "Required Date": "Potrebna Datum", "Sales Order No": "Prodajnog naloga Ne", + "Stock": "Zaliha", "Stock UOM": "Katalo\u0161ki UOM", "Warehouse": "Skladi\u0161te" } \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/nl-doc.json b/stock/doctype/material_request_item/locale/nl-doc.json similarity index 86% rename from buying/doctype/purchase_request_item/locale/nl-doc.json rename to stock/doctype/material_request_item/locale/nl-doc.json index a928a746630..a7444dd33a9 100644 --- a/buying/doctype/purchase_request_item/locale/nl-doc.json +++ b/stock/doctype/material_request_item/locale/nl-doc.json @@ -1,19 +1,19 @@ { "Brand": "Merk", - "Buying": "Het kopen", "Description": "Beschrijving", "Item Code": "Artikelcode", "Item Group": "Item Group", "Item Name": "Naam van het punt", "Lead Time Date": "Lead Tijd Datum", + "Material Request Item": "Materiaal aanvragen Item", "Min Order Qty": "Minimum Aantal", "Ordered Qty": "Besteld Aantal", "Page Break": "Pagina-einde", "Projected Qty": "Verwachte Aantal", - "Purchase Request Item": "Aankoop Request Item", "Quantity": "Hoeveelheid", "Required Date": "Vereiste Datum", "Sales Order No": "Sales Order No", + "Stock": "Voorraad", "Stock UOM": "Stock Verpakking", "Warehouse": "Magazijn" } \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/locale/pt-doc.json b/stock/doctype/material_request_item/locale/pt-doc.json similarity index 84% rename from buying/doctype/purchase_request_item/locale/pt-doc.json rename to stock/doctype/material_request_item/locale/pt-doc.json index ecbbc103fa3..c2b306ad180 100644 --- a/buying/doctype/purchase_request_item/locale/pt-doc.json +++ b/stock/doctype/material_request_item/locale/pt-doc.json @@ -1,19 +1,19 @@ { "Brand": "Marca", - "Buying": "Comprar", "Description": "Descri\u00e7\u00e3o", "Item Code": "C\u00f3digo do artigo", "Item Group": "Grupo Item", "Item Name": "Nome do item", "Lead Time Date": "Chumbo Data Hora", + "Material Request Item": "Item de solicita\u00e7\u00e3o de material", "Min Order Qty": "Min Qty Ordem", "Ordered Qty": "Qtde ordenou", "Page Break": "Quebra de p\u00e1gina", "Projected Qty": "Qtde Projetada", - "Purchase Request Item": "Comprar item de solicita\u00e7\u00e3o", "Quantity": "Quantidade", "Required Date": "Data Obrigat\u00f3rio", "Sales Order No": "Vendas decreto n \u00ba", + "Stock": "Estoque", "Stock UOM": "Estoque UOM", "Warehouse": "Armaz\u00e9m" } \ No newline at end of file diff --git a/stock/doctype/material_request_item/material_request_item.py b/stock/doctype/material_request_item/material_request_item.py new file mode 100644 index 00000000000..928aa9ff9f2 --- /dev/null +++ b/stock/doctype/material_request_item/material_request_item.py @@ -0,0 +1,8 @@ +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes + +class DocType: + def __init__(self, d, dl): + self.doc, self.doclist = d, dl \ No newline at end of file diff --git a/buying/doctype/purchase_request_item/purchase_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt similarity index 94% rename from buying/doctype/purchase_request_item/purchase_request_item.txt rename to stock/doctype/material_request_item/material_request_item.txt index f364ddb1527..d6087436047 100644 --- a/buying/doctype/purchase_request_item/purchase_request_item.txt +++ b/stock/doctype/material_request_item/material_request_item.txt @@ -1,29 +1,29 @@ [ { - "creation": "2013-01-10 16:34:11", + "creation": "2013-02-20 13:25:31", "docstatus": 0, - "modified": "2013-02-04 09:52:22", + "modified": "2013-02-20 14:06:58", "modified_by": "Administrator", "owner": "Administrator" }, { - "autoname": "IDTD/.#####", + "autoname": "MREQD-.#####", "doctype": "DocType", "istable": 1, - "module": "Buying", + "module": "Stock", "name": "__common__" }, { "doctype": "DocField", "name": "__common__", - "parent": "Purchase Request Item", + "parent": "Material Request Item", "parentfield": "fields", "parenttype": "DocType", "permlevel": 0 }, { "doctype": "DocType", - "name": "Purchase Request Item" + "name": "Material Request Item" }, { "allow_on_submit": 0, @@ -177,7 +177,7 @@ "doctype": "DocField", "fieldname": "ordered_qty", "fieldtype": "Float", - "label": "Ordered Qty", + "label": "Completed Qty", "no_copy": 1, "oldfieldname": "ordered_qty", "oldfieldtype": "Currency", diff --git a/stock/doctype/purchase_receipt/purchase_receipt.py b/stock/doctype/purchase_receipt/purchase_receipt.py index 600be7fc873..8858fd52e1d 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/stock/doctype/purchase_receipt/purchase_receipt.py @@ -17,9 +17,9 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cstr, flt, get_defaults +from webnotes.utils import cstr, flt from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint @@ -30,7 +30,6 @@ class DocType(BuyingController): def __init__(self, doc, doclist=[]): self.doc = doc self.doclist = doclist - self.defaults = get_defaults() self.tname = 'Purchase Receipt Item' self.fname = 'purchase_receipt_details' self.count = 0 @@ -297,7 +296,7 @@ class DocType(BuyingController): # 4.Update Bin self.update_stock(is_submit = 0) - # 5.Update Purchase Requests Pending Qty and accordingly it's Status + # 5.Update Material Requests Pending Qty and accordingly it's Status pc_obj.update_prevdoc_detail(self, is_submit = 0) # 6. Update last purchase rate diff --git a/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.py b/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.py index 92b0cb1d097..f0170bb20e2 100644 --- a/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.py +++ b/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import flt from webnotes.model import db_exists from webnotes.model.doc import addchild -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/stock/doctype/serial_no/test_serial_no.py b/stock/doctype/serial_no/test_serial_no.py index 1398e68ae8d..ef20de8f470 100644 --- a/stock/doctype/serial_no/test_serial_no.py +++ b/stock/doctype/serial_no/test_serial_no.py @@ -41,7 +41,7 @@ class TestSerialNo(unittest.TestCase): ["2012-01-01", "02:00", "10006", 1200, 800], ["2012-01-01", "06:00", "10007", 1500, 900]] for d in data: - webnotes.model_wrapper([{ + webnotes.bean([{ "doctype": "Serial No", "item_code": "Nebula 8", "warehouse": "Default Warehouse", diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 73af2bfdf7c..342cd6b3ed5 100644 --- a/stock/doctype/stock_entry/stock_entry.py +++ b/stock/doctype/stock_entry/stock_entry.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cstr, cint, flt, comma_or from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint, _ from stock.utils import get_incoming_rate diff --git a/stock/doctype/stock_entry/test_stock_entry.py b/stock/doctype/stock_entry/test_stock_entry.py new file mode 100644 index 00000000000..39ec58ac3a4 --- /dev/null +++ b/stock/doctype/stock_entry/test_stock_entry.py @@ -0,0 +1,103 @@ +# ERPNext - web based ERP (http://erpnext.com) +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes, unittest + +class TestStockEntry(unittest.TestCase): + def test_auto_material_request(self): + webnotes.conn.sql("""delete from `tabMaterial Request Item`""") + webnotes.conn.sql("""delete from `tabMaterial Request`""") + + st1 = webnotes.bean(copy=test_records[0]) + st1.insert() + st1.submit() + + st2 = webnotes.bean(copy=test_records[1]) + st2.insert() + st2.submit() + + mr_name = webnotes.conn.sql("""select parent from `tabMaterial Request Item` + where item_code='_Test Item'""") + + self.assertTrue(mr_name) + +test_records = [ + [ + { + "company": "_Test Company", + "doctype": "Stock Entry", + "posting_date": "2013-01-25", + "posting_time": "17:14:24", + "purpose": "Material Receipt" + }, + { + "conversion_factor": 1.0, + "doctype": "Stock Entry Detail", + "item_code": "_Test Item", + "parentfield": "mtn_details", + "incoming_rate": 100, + "qty": 50.0, + "stock_uom": "_Test UOM", + "transfer_qty": 50.0, + "uom": "_Test UOM", + "t_warehouse": "_Test Warehouse", + }, + ], + [ + { + "company": "_Test Company", + "doctype": "Stock Entry", + "posting_date": "2013-01-25", + "posting_time": "17:15", + "purpose": "Material Issue" + }, + { + "conversion_factor": 1.0, + "doctype": "Stock Entry Detail", + "item_code": "_Test Item", + "parentfield": "mtn_details", + "incoming_rate": 100, + "qty": 40.0, + "stock_uom": "_Test UOM", + "transfer_qty": 40.0, + "uom": "_Test UOM", + "s_warehouse": "_Test Warehouse", + }, + ], + [ + { + "company": "_Test Company", + "doctype": "Stock Entry", + "posting_date": "2013-01-25", + "posting_time": "17:14:24", + "purpose": "Material Transfer" + }, + { + "conversion_factor": 1.0, + "doctype": "Stock Entry Detail", + "item_code": "_Test Item Home Desktop 100", + "parentfield": "mtn_details", + "incoming_rate": 100, + "qty": 45.0, + "stock_uom": "_Test UOM", + "transfer_qty": 45.0, + "uom": "_Test UOM", + "s_warehouse": "_Test Warehouse", + "t_warehouse": "_Test Warehouse 1", + }, + { + "conversion_factor": 1.0, + "doctype": "Stock Entry Detail", + "item_code": "_Test Item Home Desktop 100", + "parentfield": "mtn_details", + "qty": 45.0, + "incoming_rate": 100, + "stock_uom": "_Test UOM", + "transfer_qty": 45.0, + "uom": "_Test UOM", + "s_warehouse": "_Test Warehouse", + "t_warehouse": "_Test Warehouse 1", + } + ] +] \ No newline at end of file diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt index 18fac821e26..bb8610cb37a 100644 --- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt +++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-14 16:33:34", + "creation": "2013-01-29 19:25:45", "docstatus": 0, - "modified": "2013-01-29 16:27:57", + "modified": "2013-02-20 16:46:26", "modified_by": "Administrator", "owner": "Administrator" }, @@ -195,5 +195,28 @@ "options": "BOM", "print_hide": 1, "read_only": 0 + }, + { + "description": "Material Request used to make this Stock Entry", + "doctype": "DocField", + "fieldname": "material_request", + "fieldtype": "Link", + "hidden": 1, + "label": "Material Request", + "no_copy": 1, + "options": "Material Request", + "print_hide": 1, + "read_only": 1 + }, + { + "doctype": "DocField", + "fieldname": "material_request_item", + "fieldtype": "Link", + "hidden": 1, + "label": "Material Request Item", + "no_copy": 1, + "options": "Material Request Item", + "print_hide": 1, + "read_only": 1 } ] \ No newline at end of file diff --git a/stock/doctype/stock_ledger/stock_ledger.py b/stock/doctype/stock_ledger/stock_ledger.py index 0c0e246a7dd..05fc0e0642b 100644 --- a/stock/doctype/stock_ledger/stock_ledger.py +++ b/stock/doctype/stock_ledger/stock_ledger.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import add_days, cstr, flt, nowdate, cint from webnotes.model.doc import Document -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import session, msgprint from stock.utils import get_valid_serial_nos @@ -221,7 +221,7 @@ class DocType: if args.get("warehouse"): args["warehouse_type"] = webnotes.conn.get_value('Warehouse' , args["warehouse"], 'warehouse_type') - sle = webnotes.model_wrapper([args]) + sle = webnotes.bean([args]) sle.ignore_permissions = 1 sle.insert() return sle.doc.name diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.py b/stock/doctype/stock_reconciliation/stock_reconciliation.py index 32fcf891513..e0f7f09c580 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -248,7 +248,7 @@ class DocType(DocListController): } args.update(opts) # create stock ledger entry - sle_wrapper = webnotes.model_wrapper([args]) + sle_wrapper = webnotes.bean([args]) sle_wrapper.ignore_permissions = 1 sle_wrapper.insert() diff --git a/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 7030c1b4920..80579aed5b4 100644 --- a/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -115,7 +115,7 @@ class TestStockReconciliation(unittest.TestCase): self.setUp() def submit_stock_reconciliation(self, qty, rate, posting_date, posting_time): - return webnotes.model_wrapper([{ + return webnotes.bean([{ "doctype": "Stock Reconciliation", "name": "RECO-001", "__islocal": 1, diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py index a02758dfb3e..dbcccc4418c 100644 --- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cstr, flt, now from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/stock/doctype/warehouse/test_warehouse.py b/stock/doctype/warehouse/test_warehouse.py index eb4554b5eeb..99f29c1cc81 100644 --- a/stock/doctype/warehouse/test_warehouse.py +++ b/stock/doctype/warehouse/test_warehouse.py @@ -3,5 +3,10 @@ test_records = [ "doctype": "Warehouse", "warehouse_name": "_Test Warehouse", "warehouse_type": "_Test Warehouse Type" - }] -] \ No newline at end of file + }], + [{ + "doctype": "Warehouse", + "warehouse_name": "_Test Warehouse 1", + "warehouse_type": "_Test Warehouse Type" + }] +] diff --git a/stock/doctype/warehouse/warehouse.py b/stock/doctype/warehouse/warehouse.py index fb6fc298e26..a7fc1853ce4 100644 --- a/stock/doctype/warehouse/warehouse.py +++ b/stock/doctype/warehouse/warehouse.py @@ -34,7 +34,7 @@ class DocType: warehouse = %s", (item_code, warehouse)) bin = bin and bin[0][0] or '' if not bin: - bin_wrapper = webnotes.model_wrapper([{ + bin_wrapper = webnotes.bean([{ "doctype": "Bin", "item_code": item_code, "warehouse": warehouse, @@ -158,7 +158,7 @@ class DocType: def repost_indented_qty(self, bin): indented_qty = webnotes.conn.sql("""select sum(pr_item.qty - pr_item.ordered_qty) - from `tabPurchase Request Item` pr_item, `tabPurchase Request` pr + from `tabMaterial Request Item` pr_item, `tabMaterial Request` pr where pr_item.item_code=%s and pr_item.warehouse=%s and pr_item.qty > pr_item.ordered_qty and pr_item.parent=pr.name and pr.status!='Stopped' and pr.docstatus=1""" diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index 473bb2f5b7b..a09cae75bd6 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -6,6 +6,11 @@ wn.module_page["Stock"] = [ title: wn._("Documents"), icon: "icon-copy", items: [ + { + label: wn._("Material Request"), + description: wn._("Request Material for Transfer or Purchase."), + doctype:"Material Request" + }, { label: wn._("Stock Entry"), description: wn._("Transfer stock from one warehouse to another."), diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 3455e2b48ab..3607b00fa48 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -40,7 +40,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order", - "Purchase Request Item", "Purchase Order Item", "Sales Order Item", "Brand"], + "Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand"], }); this.wrapper.bind("make", function() { @@ -164,7 +164,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ $.each([ ["Stock Ledger Entry", "actual_qty"], ["Production Order", "planned_qty"], - ["Purchase Request Item", "requested_qty"], + ["Material Request Item", "requested_qty"], ["Purchase Order Item", "ordered_qty"], ["Sales Order Item", "reserved_qty"]], function(i, v) { diff --git a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt index 340d7d5aa36..bf2c0ffd497 100644 --- a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt +++ b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-02 22:33:12", "docstatus": 0, - "modified": "2013-02-05 16:53:19", + "modified": "2013-02-21 11:40:05", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,7 +10,7 @@ "doctype": "Report", "is_standard": "Yes", "name": "__common__", - "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project_name` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", "ref_doctype": "Delivery Note" }, { diff --git a/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt b/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt index cc56d37f651..0d3fbb145a4 100644 --- a/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt +++ b/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-02 22:33:12", "docstatus": 0, - "modified": "2013-02-05 16:54:01", + "modified": "2013-02-21 11:40:58", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,7 +10,7 @@ "doctype": "Report", "is_standard": "Yes", "name": "__common__", - "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n `tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n `tabPurchase Order`.`project_name` as \"Project\",\n `tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabPurchase Order Item`.description as \"Description::180\",\n `tabPurchase Order Item`.qty as \"Qty:Float:100\",\n `tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\", \n (`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) as \"Qty to Receive:Float:100\"\nfrom\n `tabPurchase Order`, `tabPurchase Order Item`\nwhere\n `tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n and `tabPurchase Order`.docstatus = 1\n and ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", + "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n `tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n `tabPurchase Order`.`project_name` as \"Project\",\n `tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabPurchase Order Item`.description as \"Description::180\",\n `tabPurchase Order Item`.qty as \"Qty:Float:100\",\n `tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\", \n (`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) as \"Qty to Receive:Float:100\"\nfrom\n `tabPurchase Order`, `tabPurchase Order Item`\nwhere\n `tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n and `tabPurchase Order`.docstatus = 1\n and `tabPurchase Order`.status != \"Stopped\"\n and ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", "ref_doctype": "Purchase Receipt" }, { diff --git a/stock/stock_ledger.py b/stock/stock_ledger.py index 26f03c6478d..60b5fd4aea8 100644 --- a/stock/stock_ledger.py +++ b/stock/stock_ledger.py @@ -86,7 +86,7 @@ def update_entries_after(args, verbose=1): # update bin if not webnotes.conn.exists({"doctype": "Bin", "item_code": args["item_code"], "warehouse": args["warehouse"]}): - bin_wrapper = webnotes.model_wrapper([{ + bin_wrapper = webnotes.bean([{ "doctype": "Bin", "item_code": args["item_code"], "warehouse": args["warehouse"], diff --git a/stock/utils.py b/stock/utils.py index 62c2a1794fd..6fac0fdef19 100644 --- a/stock/utils.py +++ b/stock/utils.py @@ -18,6 +18,7 @@ import webnotes from webnotes import msgprint, _ import json from webnotes.utils import flt, cstr +from webnotes.defaults import get_global_default def validate_end_of_life(item_code, end_of_life=None, verbose=1): if not end_of_life: @@ -30,7 +31,7 @@ def validate_end_of_life(item_code, end_of_life=None, verbose=1): "in Item master") % { "item_code": item_code, "date": formatdate(end_of_life), - "end_of_life_label": webnotes.get_label("Item", "end_of_life") + "end_of_life_label": webnotes.get_doctype("Item").get_label("end_of_life") } _msgprint(msg, verbose) @@ -99,8 +100,7 @@ def get_valuation_method(item_code): """get valuation method from item or default""" val_method = webnotes.conn.get_value('Item', item_code, 'valuation_method') if not val_method: - from webnotes.utils import get_defaults - val_method = get_defaults().get('valuation_method', 'FIFO') + val_method = get_global_default('valuation_method') or "FIFO" return val_method def get_fifo_rate(previous_stock_queue, qty): diff --git a/support/doctype/customer_issue/customer_issue.py b/support/doctype/customer_issue/customer_issue.py index af93f33eda6..3a4ffc1d0a0 100644 --- a/support/doctype/customer_issue/customer_issue.py +++ b/support/doctype/customer_issue/customer_issue.py @@ -19,7 +19,7 @@ from __future__ import unicode_literals import webnotes from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes import session, msgprint from webnotes.utils import today diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.py b/support/doctype/maintenance_schedule/maintenance_schedule.py index 46891dcff25..60962b1d524 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import add_days, cstr, getdate from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import getlist +from webnotes.model.bean import getlist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/support/doctype/maintenance_visit/maintenance_visit.py b/support/doctype/maintenance_visit/maintenance_visit.py index 98a3f522a7e..cf1ddeb8ccd 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.py +++ b/support/doctype/maintenance_visit/maintenance_visit.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import cstr from webnotes.model import db_exists -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist from webnotes.model.code import get_obj from webnotes import msgprint diff --git a/support/doctype/newsletter/locale/_messages_doc.json b/support/doctype/newsletter/locale/_messages_doc.json index bb0b4baf006..6b608b5973c 100644 --- a/support/doctype/newsletter/locale/_messages_doc.json +++ b/support/doctype/newsletter/locale/_messages_doc.json @@ -1,26 +1,30 @@ [ - "All Blog Subscribers", + "Lead", "Create and Send Newsletters", "Support", - "A Lead with this email id should exist", - "Check how the newsletter looks in an email by sending it to your email.", - "All Contacts", - "All Leads", - "Test Email Id", + "Lead Source", + "Custom", "Test", - "All Active Leads", + "Test Email Id", + "Supplier", "Send To", "Select who you want to send this newsletter to", "Comma separated list of email addresses", "Newsletter Content", + "Send To Type", "Naming Series", + "Customer", "Email Sent?", "Send to this list", - "Send From", + "Contact", + "A Lead with this email id should exist", + "Lead Status", "NL-", - "All Customer Contacts", "Test the Newsletter", + "Check how the newsletter looks in an email by sending it to your email.", + "Send From", "Newsletter Status", + "Contact Type", "If specified, send the newsletter using this email address", "Message", "Newsletter", diff --git a/support/doctype/newsletter/locale/ar-doc.json b/support/doctype/newsletter/locale/ar-doc.json index bbda3f4648b..851200a30f8 100644 --- a/support/doctype/newsletter/locale/ar-doc.json +++ b/support/doctype/newsletter/locale/ar-doc.json @@ -7,9 +7,16 @@ "All Leads": "\u0643\u0644 \u0627\u0644\u0639\u0631\u0648\u0636", "Check how the newsletter looks in an email by sending it to your email.": "\u0627\u0644\u062a\u062d\u0642\u0642 \u0645\u0646 \u0643\u064a\u0641\u064a\u0629 \u0627\u0644\u0646\u0634\u0631\u0629 \u0627\u0644\u0625\u062e\u0628\u0627\u0631\u064a\u0629 \u064a\u0628\u062f\u0648 \u0641\u064a \u0631\u0633\u0627\u0644\u0629 \u0628\u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0639\u0646 \u0637\u0631\u064a\u0642 \u0625\u0631\u0633\u0627\u0644\u0647 \u0625\u0644\u0649 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0627\u0644\u062e\u0627\u0635 \u0628\u0643.", "Comma separated list of email addresses": "\u0641\u0627\u0635\u0644\u0629 \u0641\u0635\u0644 \u0642\u0627\u0626\u0645\u0629 \u0645\u0646 \u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a", + "Contact": "\u0627\u062a\u0635\u0644", + "Contact Type": "\u0646\u0648\u0639 \u0627\u0644\u0627\u062a\u0635\u0627\u0644", "Create and Send Newsletters": "\u0625\u0646\u0634\u0627\u0621 \u0648\u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u0631\u0633\u0627\u0626\u0644 \u0627\u0644\u0625\u062e\u0628\u0627\u0631\u064a\u0629", + "Custom": "\u0639\u0631\u0641", + "Customer": "\u0632\u0628\u0648\u0646", "Email Sent?": "\u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0627\u0644\u0645\u0631\u0633\u0644\u0629\u061f", "If specified, send the newsletter using this email address": "\u0641\u064a \u062d\u0627\u0644\u0629 \u062a\u062d\u062f\u064a\u062f\u060c \u0648\u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u0631\u0633\u0627\u0644\u0629 \u0627\u0644\u0625\u062e\u0628\u0627\u0631\u064a\u0629 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0647\u0630\u0627", + "Lead": "\u0642\u064a\u0627\u062f\u0629", + "Lead Source": "\u062a\u0624\u062f\u064a \u0627\u0644\u0645\u0635\u062f\u0631", + "Lead Status": "\u062a\u0624\u062f\u064a \u0627\u0644\u062d\u0627\u0644\u0629", "Message": "\u0631\u0633\u0627\u0644\u0629", "NL-": "NL-", "Naming Series": "\u062a\u0633\u0645\u064a\u0629 \u0627\u0644\u0633\u0644\u0633\u0644\u0629", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "\u062d\u062f\u062f \u0627\u0644\u0630\u064a \u062a\u0631\u064a\u062f \u0625\u0631\u0633\u0627\u0644 \u0647\u0630\u0647 \u0627\u0644\u0646\u0634\u0631\u0629 \u0625\u0644\u0649", "Send From": "\u0623\u0631\u0633\u0644 \u0645\u0646 \u0642\u0628\u0644", "Send To": "\u0623\u0631\u0633\u0644 \u0625\u0644\u0649", + "Send To Type": "\u0625\u0631\u0633\u0627\u0644 \u0625\u0644\u0649 \u0643\u062a\u0627\u0628\u0629", "Send to this list": "\u0625\u0631\u0633\u0627\u0644 \u0625\u0644\u0649 \u0647\u0630\u0647 \u0627\u0644\u0642\u0627\u0626\u0645\u0629", "Subject": "\u0645\u0648\u0636\u0648\u0639", + "Supplier": "\u0645\u0632\u0648\u062f", "Support": "\u062f\u0639\u0645", "Test": "\u0627\u062e\u062a\u0628\u0627\u0631", "Test Email Id": "\u0627\u062e\u062a\u0628\u0627\u0631 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0645\u0639\u0631\u0641", diff --git a/support/doctype/newsletter/locale/es-doc.json b/support/doctype/newsletter/locale/es-doc.json index b33ab1cab64..30f650f1395 100644 --- a/support/doctype/newsletter/locale/es-doc.json +++ b/support/doctype/newsletter/locale/es-doc.json @@ -7,9 +7,16 @@ "All Leads": "Todos los cables", "Check how the newsletter looks in an email by sending it to your email.": "Comprobar c\u00f3mo el bolet\u00edn se ve en un correo electr\u00f3nico mediante el env\u00edo a su correo electr\u00f3nico.", "Comma separated list of email addresses": "Lista separada por comas de direcciones de correo electr\u00f3nico", + "Contact": "Contacto", + "Contact Type": "Tipo de contacto", "Create and Send Newsletters": "Creaci\u00f3n y env\u00edo de Newsletters", + "Custom": "Costumbre", + "Customer": "Cliente", "Email Sent?": "Correo electr\u00f3nico enviado?", "If specified, send the newsletter using this email address": "Si se especifica, enviar el bolet\u00edn utilizando la siguiente direcci\u00f3n de correo electr\u00f3nico", + "Lead": "Conducir", + "Lead Source": "Plomo Fuente", + "Lead Status": "Lead Estado", "Message": "Mensaje", "NL-": "NL-", "Naming Series": "Nombrar Series", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "Seleccione a quien desea enviar este bolet\u00edn a", "Send From": "Enviar desde", "Send To": "Enviar a un", + "Send To Type": "Enviar a un tipo", "Send to this list": "Enviar a esta lista", "Subject": "Sujeto", + "Supplier": "Proveedor", "Support": "Apoyar", "Test": "Prueba", "Test Email Id": "Prueba de Identificaci\u00f3n del email", diff --git a/support/doctype/newsletter/locale/fr-doc.json b/support/doctype/newsletter/locale/fr-doc.json index b289f8d5709..bd2af712185 100644 --- a/support/doctype/newsletter/locale/fr-doc.json +++ b/support/doctype/newsletter/locale/fr-doc.json @@ -7,9 +7,16 @@ "All Leads": "Tous les fils", "Check how the newsletter looks in an email by sending it to your email.": "V\u00e9rifiez comment la newsletter regarde dans un e-mail en l'envoyant \u00e0 votre adresse email.", "Comma separated list of email addresses": "Comma liste s\u00e9par\u00e9e par des adresses e-mail", + "Contact": "Contacter", + "Contact Type": "Type de contact", "Create and Send Newsletters": "Cr\u00e9er et envoyer des bulletins", + "Custom": "Coutume", + "Customer": "Client", "Email Sent?": "Envoyer envoy\u00e9s?", "If specified, send the newsletter using this email address": "S'il est sp\u00e9cifi\u00e9, envoyer le bulletin en utilisant cette adresse e-mail", + "Lead": "Conduire", + "Lead Source": "Source plomb", + "Lead Status": "Lead Etat", "Message": "Message", "NL-": "NL-", "Naming Series": "Nommer S\u00e9rie", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "S\u00e9lectionnez qui vous souhaitez envoyer ce bulletin \u00e0", "Send From": "Envoyer partir de", "Send To": "Send To", + "Send To Type": "Envoyer \u00e0 taper", "Send to this list": "Envoyer cette liste", "Subject": "Sujet", + "Supplier": "Fournisseur", "Support": "Soutenir", "Test": "Test", "Test Email Id": "Id Test Email", diff --git a/support/doctype/newsletter/locale/hi-doc.json b/support/doctype/newsletter/locale/hi-doc.json index 70d20faea2a..55ec5569265 100644 --- a/support/doctype/newsletter/locale/hi-doc.json +++ b/support/doctype/newsletter/locale/hi-doc.json @@ -7,9 +7,16 @@ "All Leads": "\u0938\u092d\u0940 \u0938\u0941\u0930\u093e\u0917", "Check how the newsletter looks in an email by sending it to your email.": "\u0915\u0948\u0938\u0947 \u0928\u094d\u092f\u0942\u091c\u0932\u0947\u091f\u0930 \u0905\u092a\u0928\u0947 \u0908\u092e\u0947\u0932 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u092d\u0947\u091c\u0928\u0947 \u0938\u0947 \u090f\u0915 \u0908\u092e\u0947\u0932 \u092e\u0947\u0902 \u0932\u0917 \u0930\u0939\u093e \u0939\u0948 \u0915\u0940 \u091c\u093e\u0901\u091a \u0915\u0930\u0947\u0902.", "Comma separated list of email addresses": "\u0908\u092e\u0947\u0932 \u092a\u0924\u094b\u0902 \u0915\u0940 \u0905\u0932\u094d\u092a\u0935\u093f\u0930\u093e\u092e \u0905\u0932\u0917 \u0938\u0942\u091a\u0940", + "Contact": "\u0938\u0902\u092a\u0930\u094d\u0915", + "Contact Type": "\u0938\u0902\u092a\u0930\u094d\u0915 \u092a\u094d\u0930\u0915\u093e\u0930", "Create and Send Newsletters": "\u0938\u092e\u093e\u091a\u093e\u0930\u092a\u0924\u094d\u0930\u093f\u0915\u093e\u090f\u0901 \u092c\u0928\u093e\u090f\u0901 \u0914\u0930 \u092d\u0947\u091c\u0947\u0902", + "Custom": "\u0930\u093f\u0935\u093e\u091c", + "Customer": "\u0917\u094d\u0930\u093e\u0939\u0915", "Email Sent?": "\u0908\u092e\u0947\u0932 \u092d\u0947\u091c\u093e \u0939\u0948?", "If specified, send the newsletter using this email address": "\u0905\u0917\u0930 \u0928\u093f\u0930\u094d\u0926\u093f\u0937\u094d\u091f, \u0928\u094d\u092f\u0942\u091c\u093c\u0932\u0947\u091f\u0930 \u092d\u0947\u091c\u0928\u0947 \u0915\u0947 \u0907\u0938 \u0908\u092e\u0947\u0932 \u092a\u0924\u0947 \u0915\u093e \u0909\u092a\u092f\u094b\u0917", + "Lead": "\u0928\u0947\u0924\u0943\u0924\u094d\u0935", + "Lead Source": "\u0938\u094d\u0930\u094b\u0924 \u0932\u0940\u0921", + "Lead Status": "\u0938\u094d\u0925\u093f\u0924\u093f \u0932\u0940\u0921", "Message": "\u0938\u0902\u0926\u0947\u0936", "NL-": "NL-", "Naming Series": "\u0936\u094d\u0930\u0943\u0902\u0916\u0932\u093e \u0915\u093e \u0928\u093e\u092e\u0915\u0930\u0923", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "\u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0915\u093f \u0906\u092a \u091c\u094b \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0907\u0938 \u0938\u092e\u093e\u091a\u093e\u0930 \u092a\u0924\u094d\u0930 \u092d\u0947\u091c\u0928\u093e \u091a\u093e\u0939\u0924\u0947 \u0939\u0948\u0902", "Send From": "\u0938\u0947 \u092d\u0947\u091c\u0947\u0902", "Send To": "\u0907\u0928\u094d\u0939\u0947\u0902 \u092d\u0947\u091c\u0947\u0902", + "Send To Type": "\u091f\u093e\u0907\u092a \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u092d\u0947\u091c\u0947\u0902", "Send to this list": "\u0907\u0938 \u0938\u0942\u091a\u0940 \u0915\u094b \u092d\u0947\u091c\u0947\u0902", "Subject": "\u0935\u093f\u0937\u092f", + "Supplier": "\u092a\u094d\u0930\u0926\u093e\u092f\u0915", "Support": "\u0938\u092e\u0930\u094d\u0925\u0928", "Test": "\u092a\u0930\u0940\u0915\u094d\u0937\u0923", "Test Email Id": "\u091f\u0947\u0938\u094d\u091f \u0908\u092e\u0947\u0932 \u0906\u0908\u0921\u0940", diff --git a/support/doctype/newsletter/locale/hr-doc.json b/support/doctype/newsletter/locale/hr-doc.json index d7ca97a3fd7..e71b29b03f2 100644 --- a/support/doctype/newsletter/locale/hr-doc.json +++ b/support/doctype/newsletter/locale/hr-doc.json @@ -7,9 +7,16 @@ "All Leads": "Sve vodi", "Check how the newsletter looks in an email by sending it to your email.": "Pogledajte kako izgleda newsletter u e-mail tako da ga \u0161alju na e-mail.", "Comma separated list of email addresses": "Zarez odvojen popis e-mail adrese", + "Contact": "Kontaktirati", + "Contact Type": "Vrsta kontakta", "Create and Send Newsletters": "Stvaranje i slati newslettere", + "Custom": "Obi\u010daj", + "Customer": "Kupac", "Email Sent?": "E-mail poslan?", "If specified, send the newsletter using this email address": "Ako je navedeno, po\u0161aljite newsletter koriste\u0107i ovu e-mail adresu", + "Lead": "Dovesti", + "Lead Source": "Olovo Source", + "Lead Status": "Olovo Status", "Message": "Poruka", "NL-": "NL-", "Naming Series": "Imenovanje serije", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "Odaberite koji \u017eelite poslati ovu newsletter", "Send From": "Po\u0161alji Iz", "Send To": "Po\u0161alji", + "Send To Type": "Po\u0161alji Upi\u0161ite", "Send to this list": "Po\u0161alji na ovom popisu", "Subject": "Predmet", + "Supplier": "Dobavlja\u010d", "Support": "Podr\u017eati", "Test": "Test", "Test Email Id": "Test E-mail ID", diff --git a/support/doctype/newsletter/locale/nl-doc.json b/support/doctype/newsletter/locale/nl-doc.json index 368d6b640c4..c35876fb519 100644 --- a/support/doctype/newsletter/locale/nl-doc.json +++ b/support/doctype/newsletter/locale/nl-doc.json @@ -7,9 +7,16 @@ "All Leads": "Alle Leads", "Check how the newsletter looks in an email by sending it to your email.": "Controleer hoe de nieuwsbrief eruit ziet in een e-mail door te sturen naar uw e-mail.", "Comma separated list of email addresses": "Komma's gescheiden lijst van e-mailadressen", + "Contact": "Contact", + "Contact Type": "Contact Type", "Create and Send Newsletters": "Maken en versturen nieuwsbrieven", + "Custom": "Gewoonte", + "Customer": "Klant", "Email Sent?": "E-mail verzonden?", "If specified, send the newsletter using this email address": "Als de opgegeven, stuurt u de nieuwsbrief via dit e-mailadres", + "Lead": "Leiden", + "Lead Source": "Lood Bron", + "Lead Status": "Lead Status", "Message": "Bericht", "NL-": "NL-", "Naming Series": "Benoemen Series", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "Selecteer de personen die u wilt deze nieuwsbrief te sturen naar", "Send From": "Stuur Van", "Send To": "Verzenden naar", + "Send To Type": "Verzenden naar type", "Send to this list": "Stuur deze lijst", "Subject": "Onderwerp", + "Supplier": "Leverancier", "Support": "Ondersteunen", "Test": "Test", "Test Email Id": "Test E-mail Identiteitskaart", diff --git a/support/doctype/newsletter/locale/pt-doc.json b/support/doctype/newsletter/locale/pt-doc.json index fb446cbeee1..bf4899be49a 100644 --- a/support/doctype/newsletter/locale/pt-doc.json +++ b/support/doctype/newsletter/locale/pt-doc.json @@ -7,9 +7,16 @@ "All Leads": "Todos Leads", "Check how the newsletter looks in an email by sending it to your email.": "Verifique como o boletim olha em um e-mail enviando-o para o seu e-mail.", "Comma separated list of email addresses": "Lista separada por v\u00edrgulas de endere\u00e7os de e-mail", + "Contact": "Contato", + "Contact Type": "Tipo de Contato", "Create and Send Newsletters": "Criar e enviar Newsletters", + "Custom": "Personalizado", + "Customer": "Cliente", "Email Sent?": "E-mail enviado?", "If specified, send the newsletter using this email address": "Se especificado, enviar a newsletter usando esse endere\u00e7o de e-mail", + "Lead": "Conduzir", + "Lead Source": "Chumbo Fonte", + "Lead Status": "Chumbo Estado", "Message": "Mensagem", "NL-": "NL-", "Naming Series": "Nomeando Series", @@ -19,8 +26,10 @@ "Select who you want to send this newsletter to": "Selecione para quem voc\u00ea deseja enviar esta newsletter para", "Send From": "Enviar de", "Send To": "Enviar para", + "Send To Type": "Enviar para Digite", "Send to this list": "Enviar para esta lista", "Subject": "Assunto", + "Supplier": "Fornecedor", "Support": "Apoiar", "Test": "Teste", "Test Email Id": "Email Id teste", diff --git a/support/doctype/newsletter/newsletter.py b/support/doctype/newsletter/newsletter.py index 88ec384c725..78921f176fc 100644 --- a/support/doctype/newsletter/newsletter.py +++ b/support/doctype/newsletter/newsletter.py @@ -28,6 +28,7 @@ class DocType(): def test_send(self, doctype="Lead"): self.recipients = self.doc.test_email_id.split(",") + self.send_to_doctype = "Lead" self.send_bulk() webnotes.msgprint("""Scheduled to send to %s""" % self.doc.test_email_id) diff --git a/support/doctype/newsletter/test_newsletter.py b/support/doctype/newsletter/test_newsletter.py index 98ad21f1603..4650c0adbfb 100644 --- a/support/doctype/newsletter/test_newsletter.py +++ b/support/doctype/newsletter/test_newsletter.py @@ -2,7 +2,7 @@ import webnotes, unittest class TestNewsletter(unittest.TestCase): def test_get_recipients_lead(self): - w = webnotes.model_wrapper(test_records[0]) + w = webnotes.bean(test_records[0]) w.insert() self.assertTrue("test_lead@example.com" in w.controller.get_recipients()) webnotes.conn.sql("""delete from `tabBulk Email`""") @@ -10,24 +10,24 @@ class TestNewsletter(unittest.TestCase): self.assertTrue(webnotes.conn.get_value("Bulk Email", {"recipient": "test_lead@example.com"})) def test_get_recipients_lead_by_status(self): - w = webnotes.model_wrapper(test_records[0]) + w = webnotes.bean(test_records[0]) w.doc.lead_status="Converted" w.insert() self.assertTrue("test_lead3@example.com" in w.controller.get_recipients()) def test_get_recipients_contact_customer(self): - w = webnotes.model_wrapper(test_records[1]) + w = webnotes.bean(test_records[1]) w.insert() self.assertTrue("test_contact_customer@example.com" in w.controller.get_recipients()) def test_get_recipients_contact_supplier(self): - w = webnotes.model_wrapper(test_records[1]) + w = webnotes.bean(test_records[1]) w.doc.contact_type="Supplier" w.insert() self.assertTrue("test_contact_supplier@example.com" in w.controller.get_recipients()) def test_get_recipients_custom(self): - w = webnotes.model_wrapper(test_records[2]) + w = webnotes.bean(test_records[2]) w.insert() self.assertTrue("test_custom2@example.com" in w.controller.get_recipients()) self.assertTrue(webnotes.conn.get("Lead", diff --git a/support/doctype/support_ticket/get_support_mails.py b/support/doctype/support_ticket/get_support_mails.py index d431d8f1357..a91d483200f 100644 --- a/support/doctype/support_ticket/get_support_mails.py +++ b/support/doctype/support_ticket/get_support_mails.py @@ -38,12 +38,12 @@ class SupportMailbox(POP3Mailbox): ticket = None if thread_id and webnotes.conn.exists("Support Ticket", thread_id): - ticket = webnotes.model_wrapper("Support Ticket", thread_id) + ticket = webnotes.bean("Support Ticket", thread_id) ticket.doc.status = 'Open' ticket.doc.save() else: - ticket = webnotes.model_wrapper([{ + ticket = webnotes.bean([{ "doctype":"Support Ticket", "description": mail.content, "subject": mail.mail["Subject"], diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index 43b8283b547..170497dd7fa 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -67,7 +67,7 @@ class DocType(TransactionBase): @webnotes.whitelist() def set_status(name, status): - st = webnotes.model_wrapper("Support Ticket", name) + st = webnotes.bean("Support Ticket", name) st.doc.status = status st.save() diff --git a/translations/ar.csv b/translations/ar.csv index 05f1dc032a8..9e5cbcdc82e 100644 --- a/translations/ar.csv +++ b/translations/ar.csv @@ -1,5 +1,5 @@ , - Reason: ,اŲ„ØģØĻØĻ: + (Half Day),(Ų†ØĩŲ ŲŠŲˆŲ…) against same operation,ØķØŊ Ų†ŲØģ اŲ„ØđŲ…Ų„ŲŠØĐ by Role ,Ų…Ų† ØŊŲˆØą cannot be 0,Ų„ا ŲŠŲ…ŲƒŲ† ØĢŲ† ØŠŲƒŲˆŲ† 0 @@ -157,6 +157,7 @@ Activity Log,ØģØŽŲ„ اŲ„Ų†Øīاط Activity Name,اØģŲ… اŲ„Ų†Øīاط Activity Type,اŲ„Ų†Øīاط Ų†ŲˆØđ Actual,ŲØđŲ„ŲŠ +Actual Amount,اŲ„Ų…ØĻŲ„Øš اŲ„ŲØđŲ„ŲŠ Actual Budget,اŲ„Ų…ŲŠØēاŲ†ŲŠØĐ Ø§Ų„ŲØđŲ„ŲŠØĐ Actual Completion Date,ØŠØ§ØąŲŠØŪ اŲ„اŲ†ØŠŲ‡Ø§ØĄ اŲ„ŲØđŲ„ŲŠ Actual Date,ØŠØ§ØąŲŠØŪ اŲ„ŲØđŲ„ŲŠØĐ @@ -236,17 +237,13 @@ Against Voucher Type,ØķØŊ Ų†ŲˆØđ Ų‚ØģŲŠŲ…ØĐ Agent,ŲˆŲƒŲŠŲ„ "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials",ØĨØŽŲ…اŲ„ŲŠ Ų…ØŽŲ…ŲˆØđØĐ Ų…Ų† اŲ„ØđŲ†Ø§ØĩØą ** ** ** ŲŲŠ ØĻŲ†ØŊ ØĒØŪØą. ** Ų‡Ø°Ø§ Ų…ŲŲŠØŊ ØĨذا ŲƒŲ†ØŠ ØŠØŽŲ…ŲŠØđ ØđŲ†Ø§ØĩØą Ų…ØđŲŠŲ†ØĐ ** ** ŲŲŠ Ø­ØēŲ…ØĐ ŲˆŲŠŲ…ŲƒŲ†Ųƒ اŲ„Ø­ŲØ§Øļ ØđŲ„Ų‰ اŲ„Ų…ØŪØēŲˆŲ† Ų…Ų† اŲ„ØĢØĩŲ†Ø§Ų ** ** Ų…ØđØĻØĢØĐ ŲˆŲ„ŲŠØģ اŲ„ŲƒŲ„ŲŠ ** اŲ„ØģŲ„ØđØĐ **. اŲ„Ø­ØēŲ…ØĐ Ø§Ų„ØģŲ„ØđØĐ ** ** ØģŲŠŲƒŲˆŲ† "Ų‡Ųˆ اŲ„Ų…ØŪØēŲˆŲ† اŲ„ØģŲ„ØđØĐ" ØĻ "Ų„ا" Ųˆ "Ų‡Ų„ اŲ„Ų…ØĻŲŠØđا؊ اŲ„ØģŲ„ØđØĐ" ØĻ "Ų†ØđŲ…" ØđŲ„Ų‰ ØģØĻŲŠŲ„ اŲ„Ų…ØŦاŲ„: ØĨذا ŲƒŲ†ØŠ ØŠØĻŲŠØđ ØĢØŽŲ‡ØēØĐ Ø§Ų„ŲƒŲ…ØĻŲŠŲˆØŠØą اŲ„Ų…Ø­Ų…ŲˆŲ„ØĐ ŲˆØ­Ų‚اØĶØĻ ؊حŲ…Ų„ ØđŲ„Ų‰ اŲ„ØļŲ‡Øą ØĻØīŲƒŲ„ Ų…Ų†ŲØĩŲ„ ŲˆŲ„Ų‡Ø§ ØģØđØą ØŪاØĩ اذا ŲƒØ§Ų† اŲ„ØēØĻŲˆŲ† ŲŠØīØŠØąŲŠ ŲƒŲ„ ، ØŦŲ… ØģŲŠŲ‚ŲˆŲ… اŲ„ŲƒŲ…ØĻŲŠŲˆØŠØą اŲ„Ų…Ø­Ų…ŲˆŲ„ + Ø­Ų‚ŲŠØĻØĐ Ø§Ų„ØļŲ‡Øą ØŠŲƒŲˆŲ† ØŽØŊŲŠØŊØĐ Ø§Ų„Ų…ØĻŲŠØđا؊ BOM Item.Note: BOM = ØĻŲŠŲ„ اŲ„Ų…ŲˆØ§ØŊ Aging Date,اŲ„ØīŲŠØŪŲˆØŪØĐ ØŠØ§ØąŲŠØŪ -All Active Leads,ŲƒŲ„ اŲ„ØđØąŲˆØķ ØĻاŲ„Ų…ŲˆŲ‚Øđ All Addresses.,ØŽŲ…ŲŠØđ اŲ„ØđŲ†Ø§ŲˆŲŠŲ†. -All Blog Subscribers,ØŽŲ…ŲŠØđ اŲ„Ų…ØīØŠØąŲƒŲŠŲ† اŲ„Ų…ØŊŲˆŲ†ØĐ All Contact,ØŽŲ…ŲŠØđ اŲ„ا؊ØĩاŲ„ا؊ -All Contacts,ØŽŲ…ŲŠØđ ا؊ØĩاŲ„ا؊ All Contacts.,ØŽŲ…ŲŠØđ ØŽŲ‡Ø§ØŠ اŲ„ا؊ØĩاŲ„. All Customer Contact,ØŽŲ…ŲŠØđ اŲ„ØđŲ…Ų„Ø§ØĄ اŲ„ا؊ØĩاŲ„ -All Customer Contacts,ØŽŲ…ŲŠØđ اŲ„ØđŲ…Ų„Ø§ØĄ ا؊ØĩاŲ„ا؊ +All Day,ŲƒŲ„ ŲŠŲˆŲ… All Employee (Active),ØŽŲ…ŲŠØđ اŲ„Ų…ŲˆØļŲŲŠŲ† (ŲØđاŲ„ØĐ) All Lead (Open),ØŽŲ…ŲŠØđ اŲ„ØąØĩاØĩ (ŲØŠØ­) -All Leads,ŲƒŲ„ اŲ„ØđØąŲˆØķ All Products or Services.,ØŽŲ…ŲŠØđ اŲ„Ų…Ų†ØŠØŽØ§ØŠ ØĢŲˆ اŲ„ØŪØŊŲ…ا؊. All Sales Partner Contact,ØŽŲ…ŲŠØđ Ų…ØĻŲŠØđا؊ اŲ„ا؊ØĩاŲ„ اŲ„ØīØąŲŠŲƒ All Sales Person,ŲƒŲ„ ØđŲ…Ų„ŲŠØĐ ØĻŲŠØđ ØīØŪØĩ @@ -436,7 +433,6 @@ Budget Details,ØŠŲØ§ØĩŲŠŲ„ اŲ„Ų…ŲŠØēاŲ†ŲŠØĐ Budget Distribution,ØŠŲˆØēŲŠØđ اŲ„Ų…ŲŠØēاŲ†ŲŠØĐ Budget Distribution Detail,ØŠŲˆØēŲŠØđ اŲ„Ų…ŲŠØēاŲ†ŲŠØĐ Ø§Ų„ØŠŲØ§ØĩŲŠŲ„ Budget Distribution Details,ØŠŲØ§ØĩŲŠŲ„ اŲ„Ų…ŲŠØēاŲ†ŲŠØĐ Ø§Ų„ØŠŲˆØēŲŠØđ -Build Report,ØĻŲ†Ø§ØĄ اŲ„ØŠŲ‚ØąŲŠØą Bulk Email,اŲ„ØŽØēØĄ اŲ„ØĢŲƒØĻØą اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ Bulk Email records.,اŲ„ØŽØēØĄ اŲ„ØĢŲƒØĻØą اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ اŲ„ØģØŽŲ„ا؊. Bundle items at time of sale.,Ø­ØēŲ…ØĐ Ø§Ų„ØĻŲ†ŲˆØŊ ŲŲŠ ŲˆŲ‚ØŠ اŲ„ØĻŲŠØđ. @@ -465,6 +461,7 @@ Calculate Tax,Ø­ØģاØĻ اŲ„ØķØąØ§ØĶØĻ Calculate Taxes and Charges,Ø­ØģاØĻ اŲ„ØķØąØ§ØĶØĻ ŲˆØ§Ų„ØąØģŲˆŲ… Calculate Total Score,Ø­ØģاØĻ اŲ„Ų†ØŠŲŠØŽØĐ Ø§Ų„ØĨØŽŲ…اŲ„ŲŠØĐ Calendar,ØŠŲ‚ŲˆŲŠŲ… +Calendar Events,اŲ„ØĢØ­ØŊاØŦ Call,ØŊØđŲˆØĐ Campaign,Ø­Ų…Ų„ØĐ Campaign Name,اØģŲ… اŲ„Ø­Ų…Ų„ØĐ @@ -601,6 +598,7 @@ Contact Name,اØģŲ… ØŽŲ‡ØĐ Ø§Ų„ا؊ØĩاŲ„ Contact No,اŲ„ا؊ØĩاŲ„ Ų„ا Contact No.,اŲ„ا؊ØĩاŲ„ ØąŲ‚Ų… Contact Person,ا؊ØĩŲ„ ØīØŪØĩ +Contact Type,Ų†ŲˆØđ اŲ„ا؊ØĩاŲ„ Contact Us Settings,اŲ„ا؊ØĩاŲ„ ØĻŲ†Ø§ ØĨØđØŊاØŊا؊ Contact in Future,اŲ„ا؊ØĩاŲ„ ŲŲŠ اŲ„Ų…ØģØŠŲ‚ØĻŲ„ "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.",ØŪŲŠØ§ØąØ§ØŠ اŲ„ا؊ØĩاŲ„ØŒ Ų…ØŦŲ„ "اŲ„اØģØŠØđŲ„اŲ… اŲ„Ų…ØĻŲŠØđا؊ ŲˆØ§Ų„ØŊØđŲ… اŲ„اØģØŠØđŲ„اŲ…" اŲ„ØŪ ŲƒŲ„ ØđŲ„Ų‰ ØģØ·Øą ØŽØŊŲŠØŊ ØĢŲˆ Ų…ŲØĩŲˆŲ„ØĐ ØĻŲŲˆØ§ØĩŲ„. @@ -664,6 +662,7 @@ Current Value,اŲ„Ų‚ŲŠŲ…ØĐ Ø§Ų„حاŲ„ŲŠØĐ Current status,اŲ„ŲˆØķØđ اŲ„حاŲ„ŲŠ Cust/Supp Address,اŲ„ØēØĻŲˆŲ† / اŲ„Ų…Ų„Ø­Ų‚ اŲ„ØđŲ†ŲˆØ§Ų† Cust/Supp Name,اŲ„ØēØĻŲˆŲ† / اŲ„Ų…Ų„Ø­Ų‚ اØģŲ… +Custom,ØđØąŲ Custom Autoreply Message,ØąØŊ ØŠŲ„Ų‚اØĶŲŠ اŲ„Ų…ØŪØĩØĩØĐ ØąØģاŲ„ØĐ Custom CSS,اŲ„ØđØąŲ CSS Custom Field,Ų…ØŪØĩØĩ اŲ„Ų…ŲŠØŊاŲ†ŲŠØĐ @@ -879,6 +878,7 @@ Editable,Ų„Ų„ØŠØ­ØąŲŠØą Educational Qualification,اŲ„Ų…ØĪŲ‡Ų„ا؊ اŲ„ØđŲ„Ų…ŲŠØĐ Educational Qualification Details,ØŠŲØ§ØĩŲŠŲ„ اŲ„Ų…ØĪŲ‡Ų„ا؊ اŲ„ØđŲ„Ų…ŲŠØĐ Eg. smsgateway.com/api/send_sms.cgi,ØđŲ„Ų‰ ØģØĻŲŠŲ„ اŲ„Ų…ØŦاŲ„. smsgateway.com / API / send_sms.cgi +Eligible Amount,اŲ„Ų…ØĪŲ‡Ų„ØĐ Ø§Ų„Ų…ØĻŲ„Øš Email,اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ Email (By company),اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ (Ø­ØģØĻ اŲ„ØīØąŲƒØĐ) Email Digest,اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ ØŊاŲŠØŽØģØŠ @@ -927,6 +927,7 @@ Encashment Date,ØŠØ§ØąŲŠØŪ اŲ„؊حØĩŲŠŲ„ End Date,Ų†Ų‡Ø§ŲŠØĐ Ø§Ų„ØŠØ§ØąŲŠØŪ End date of current invoice's period,ØŠØ§ØąŲŠØŪ Ų†Ų‡Ø§ŲŠØĐ ŲØŠØąØĐ Ø§Ų„ŲØ§ØŠŲˆØąØĐ Ø§Ų„حاŲ„ŲŠØĐ End of Life,Ų†Ų‡Ø§ŲŠØĐ Ø§Ų„Ø­ŲŠØ§ØĐ +Ends on,ŲŠŲ†ØŠŲ‡ŲŠ ŲŲŠ Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,ØĨØŊØŪاŲ„ اŲ„ØąŲ‚Ų… اŲ„ØĻØąŲŠØŊ اŲ„اŲ„ŲƒØŠØąŲˆŲ†ŲŠ Ų„ØŠŲ„Ų‚ŲŠ ØŠŲ‚ØąŲŠØą ØđŲ† اŲ„ØŪØ·ØĢ اŲ„ØŠŲŠ ØĻØđØŦ ØĻŲ‡Ø§ users.Eg: support@iwebnotes.com Enter Form Type,ØĢØŊØŪŲ„ Ų†ŲˆØđ اŲ„Ų†Ų…ŲˆØ°ØŽ Enter Row,ØŊØŪŲˆŲ„ اŲ„ØĩŲ @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,Ų„ا ŲŠ Error,ØŪØ·ØĢ Estimated Material Cost,ØŠŲ‚ØŊØą ØŠŲƒŲ„ŲØĐ Ø§Ų„Ų…ŲˆØ§ØŊ Event,Ø­ØŊØŦ -Event Date,ØŠØ§ØąŲŠØŪ اŲ„Ø­ØŊØŦ Event Individuals,اŲ„Ø­ØŊØŦ اŲ„ØĢŲØąØ§ØŊ -Event Name,اØģŲ… اŲ„Ø­ØŊØŦ Event Role,اŲ„Ø­ØŊØŦ اŲ„ØŊŲˆØą Event Roles,اŲ„Ø­ØŊØŦ اŲ„ØĢØŊŲˆØ§Øą -Event Time,ŲˆŲ‚ØŠ اŲ„Ø­ØŊØŦ Event Type,Ų†ŲˆØđ اŲ„Ø­ØŊØŦ Event Updates,اŲ„Ø­ØŊØŦ اŲ„؊حØŊŲŠØŦا؊ Event User,Ø­ØŊØŦ اŲ„Ų…ØģØŠØŪØŊŲ… @@ -1046,6 +1044,7 @@ Fixed Asset Account,Ø­ØģاØĻ اŲ„ØĢØĩŲˆŲ„ اŲ„ØŦاØĻØŠØĐ Float,اŲ„Ø·ŲŲˆ Float Precision,ØŠØđŲˆŲŠŲ… اŲ„ØŊŲ‚ØĐ Floral,اŲ„ØĢØēŲ‡Ø§Øą +Following dates are blocked for Leave,ŲŠØŠŲ… Ø­ØļØą اŲ„Ų…ŲˆØ§ØđŲŠØŊ اŲ„؊اŲ„ŲŠØĐ Ų„ØĨ؎اØēØĐ "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",ØģŲˆŲ ØŠØļŲ‡Øą ØĻØđØŊ اŲ„ØŽØŊŲˆŲ„ اŲ„Ų‚ŲŠŲ… اŲ„ØĻŲ†ŲˆØŊ اŲ„ŲØąØđŲŠØĐ ØĨذا - اŲ„Ų…ØŠØđاŲ‚ØŊ ØđŲ„ŲŠŲ‡Ø§. ŲˆØģŲŠØŠŲ… ØŽŲ„ØĻ Ų…Ų† Ų‡Ø°Ų‡ اŲ„Ų‚ŲŠŲ… ØģŲŠØŊ "ØĻŲŠŲ„ Ų…Ų† Ų…ŲˆØ§ØŊ" Ų…Ų† ØŊŲˆŲ† - اŲ„ØĻŲ†ŲˆØŊ اŲ„Ų…ØŠØđاŲ‚ØŊ ØđŲ„ŲŠŲ‡Ø§. Font,اŲ„ØŪØ· Font Size,Ø­ØŽŲ… اŲ„ØŪØ· @@ -1073,6 +1072,7 @@ For ranges,Ų„Ų„Ų†Ø·Ø§Ų‚ا؊ For reference,Ų„Ų„ØąØŽŲˆØđ ØĨŲ„ŲŠŲ‡Ø§ For reference only.,Ų„Ų„ØĨØīØ§ØąØĐ ŲŲ‚Ø·. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",Ų„ØąØ§Ø­ØĐ Ø§Ų„ØđŲ…Ų„Ø§ØĄØŒ ŲˆŲŠŲ…ŲƒŲ† اØģØŠØŪØŊاŲ… Ų‡Ø°Ų‡ اŲ„ØąŲ…ŲˆØē ŲŲŠ ØĢØīŲƒØ§Ų„ اŲ„Ø·ØĻاØđØĐ Ų…ØŦŲ„ اŲ„ŲŲˆØ§ØŠŲŠØą ŲˆØ§Ų„ØģŲ†ØŊا؊ اŲ„ØŠØģŲ„ŲŠŲ… +Form,ØīŲƒŲ„ Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,اŲ„ØĩŲŠØšØĐ: HH: Ų…Ų… ØģØĻŲŠŲ„ اŲ„Ų…ØŦاŲ„ Ų„اŲ†ØŠŲ‡Ø§ØĄ ØĩŲ„احŲŠØŠŲ‡Ø§ ØģاØđØĐ ŲˆØ§Ø­ØŊØĐ ØđŲ„Ų‰ اŲ„Ų†Ø­Ųˆ 01:00. ŲˆØģŲˆŲ ŲŠŲƒŲˆŲ† اŲ„Ø­ØŊ اŲ„ØĢŲ‚ØĩŲ‰ اŲ†Ų‚ØķØ§ØĄ 72 ØģاØđØĐ. اŲ„اŲØŠØąØ§ØķŲŠ Ų‡Ųˆ 24 ØģاØđØĐ Forum,Ų…Ų†ØŠØŊŲ‰ Fraction,ØŽØēØĄ @@ -1089,7 +1089,9 @@ From PR Date,Ų…Ų† ØŠØ§ØąŲŠØŪ PR From Package No.,Ų…Ų† ØąŲ‚Ų… Ø­ØēŲ…ØĐ From Table,Ų…Ų† اŲ„ØŽØŊŲˆŲ„ Frozen,ØŠØŽŲ…ŲŠØŊ +Full Image,اŲ„ØĩŲˆØąØĐ Full Name,ØĻØŊØą ؊اŲ… +Full description (formatted as markdown),اŲ„ŲˆØĩŲ اŲ„ŲƒØ§Ų…Ų„ (ØĻØŠŲ†ØģŲŠŲ‚ ØŠØŪŲŲŠØķ اŲ„ØģØđØą) Fully Billed,ŲˆØĩŲØŠ ØĻاŲ„ŲƒØ§Ų…Ų„ Fully Completed,ŲŠŲƒØŠŲ…Ų„ GL Control,GL اŲ„؊حŲƒŲ… @@ -1104,7 +1106,7 @@ Gender,ØŽŲ†Øģ General,ØđاŲ… General Ledger,ØŊŲØŠØą اŲ„ØĢØģ؊اذ اŲ„ØđاŲ… Generate Description HTML,ØŠŲˆŲ„ŲŠØŊ HTML ŲˆØĩŲ -Generate Purchase Requests (MRP) and Production Orders.,ØĨŲ†ØīØ§ØĄ Ø·Ų„ØĻا؊ اŲ„ØīØąØ§ØĄ (MRP) ŲˆØĢŲˆØ§Ų…Øą اŲ„ØĨŲ†ØŠØ§ØŽ. +Generate Material Requests (MRP) and Production Orders.,ØĨŲ†ØīØ§ØĄ Ø·Ų„ØĻا؊ اŲ„Ų…ŲˆØ§ØŊ (MRP) ŲˆØĢŲˆØ§Ų…Øą اŲ„ØĨŲ†ØŠØ§ØŽ. Generate Salary Slips,ØŠŲˆŲ„ŲŠØŊ Ų‚ØģاØĶŲ… ØąØ§ØŠØĻ Generate Schedule,ØŠŲˆŲ„ŲŠØŊ ØŽØŊŲˆŲ„ "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",ØŠŲˆŲ„ŲŠØŊ اŲ„ØŠØđØĻØĶØĐ ØēŲ„ا؊ Ų„Ø­ØēŲ… Ų„ŲŠØŠŲ… ØŠØģŲ„ŲŠŲ…Ų‡Ø§. اŲ„Ų…ØģØŠØŪØŊŲ…ØĐ Ų„ØĨØŪØ·Ø§Øą ØđØŊØŊ Ø­ØēŲ…ØĐ، Ø­ØēŲ…ØĐ Ø§Ų„Ų…ح؊ŲˆŲŠØ§ØŠ ŲˆØēŲ†Ų‡. @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,؊؎اŲ‡Ų„ Image,ØĩŲˆØąØĐ Image View,ØđØąØķ اŲ„ØĩŲˆØąØĐ +Image for listing (Width: 100px) (Attach First),ØĩŲˆØąØĐ Ų„Ų‚اØĶŲ…ØĐ (اŲ„ØđØąØķ: 100px) (ŲŠØąŲŲ‚ اŲ„ØĢŲˆŲ„Ų‰) +Image for listing (Width: 300px) (Attach First),ØĩŲˆØąØĐ Ų„Ų‚اØĶŲ…ØĐ (اŲ„ØđØąØķ: 300px) (ŲŠØąŲŲ‚ اŲ„ØĢŲˆŲ„Ų‰) Implementation Partner,ØŠŲ†ŲŲŠØ° اŲ„ØīØąŲŠŲƒ Import,اØģØŠŲŠØąØ§ØŊ Import Date Format ,اØģØŠŲŠØąØ§ØŊ ØŠŲ†ØģŲŠŲ‚ اŲ„ØŠØ§ØąŲŠØŪ @@ -1391,6 +1395,7 @@ Item Name,اŲ„ØĻŲ†ØŊ اŲ„اØģŲ… Item Price,اŲ„ØĻŲ†ØŊ اŲ„ØģØđØą Item Prices,اŲ„ØĻŲ†ØŊ اŲ„ØĢØģØđØ§Øą Item Quality Inspection Parameter,Ų…ØđŲ„Ų…ØĐ Ø§Ų„ØĻŲ†ØŊ اŲ„ØŠŲØŠŲŠØī اŲ„ØŽŲˆØŊØĐ +Item Reorder,اŲ„ØĻŲ†ØŊ ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Item Serial No,اŲ„ØĻŲ†ØŊ ØąŲ‚Ų… اŲ„Ų…ØģŲ„ØģŲ„ Item Serial Nos,اŲ„Ų…ØģŲ„ØģŲ„ Ø§ØąŲ‚اŲ… اŲ„ØĻŲ†ØŊ Item Supplier,اŲ„ØĻŲ†ØŊ Ų…ØēŲˆØŊ @@ -1470,15 +1475,24 @@ Lead Lost,ŲŠØĪØŊŲŠ ŲŲ‚ØŊاŲ† Lead Name,ŲŠØĪØŊŲŠ اØģŲ… Lead Owner,ŲŠØĪØŊŲŠ اŲ„Ų…اŲ„Ųƒ Lead Ref,ŲŠØĪØŊŲŠ اŲ„Ų…ØąØŽØđ +Lead Source,ØŠØĪØŊŲŠ اŲ„Ų…ØĩØŊØą +Lead Status,ØŠØĪØŊŲŠ اŲ„حاŲ„ØĐ Lead Time Date,ØŠØĪØŊŲŠ ØŠØ§ØąŲŠØŪ اŲ„ŲˆŲ‚ØŠ Lead Time Days,ŲŠØĪØŊŲŠ ŲŠŲˆŲ…ا Ų…ØąØĐ -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,ŲŠØĪØŊŲŠ اŲ„ŲˆŲ‚ØŠ Ų‡Ųˆ ØĢŲŠØ§Ų… ØđØŊØŊ اŲ„ØĢŲŠØ§Ų… اŲ„ØŠŲŠ Ų…Ų† اŲ„Ų…ØŠŲˆŲ‚Øđ Ų‡Ø°Ø§ اŲ„ØĻŲ†ØŊ ŲŲŠ اŲ„Ų…ØģØŠŲˆØŊØđ اŲ„ØŪاØĩ ØĻŲƒ. ŲŠØŠŲ… ØĨØ­ØķØ§Øą Ų‡Ø°Ų‡ اŲ„ØĢŲŠØ§Ų… ŲŲŠ Ø·Ų„ØĻ ØīØąØ§ØĄ ØđŲ†ØŊ اØŪØŠŲŠØ§Øą Ų‡Ø°Ø§ اŲ„ØĻŲ†ØŊ. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,ŲŠØĪØŊŲŠ اŲ„ŲˆŲ‚ØŠ Ų‡Ųˆ ØĢŲŠØ§Ų… ØđØŊØŊ اŲ„ØĢŲŠØ§Ų… اŲ„ØŠŲŠ Ų…Ų† اŲ„Ų…ØŠŲˆŲ‚Øđ Ų‡Ø°Ø§ اŲ„ØĻŲ†ØŊ ŲŲŠ اŲ„Ų…ØģØŠŲˆØŊØđ اŲ„ØŪاØĩ ØĻŲƒ. ŲŠØŠŲ… ØĨØ­ØķØ§Øą Ų‡Ø°Ų‡ اŲ„ØĢŲŠØ§Ų… ŲŲŠ Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ ØđŲ†ØŊ اØŪØŠŲŠØ§Øą Ų‡Ø°Ø§ اŲ„ØĻŲ†ØŊ. Lead Type,ŲŠØĪØŊŲŠ اŲ„Ų†ŲˆØđ Leave Allocation,ØŠØąŲƒ ØŠŲˆØēŲŠØđ Leave Allocation Tool,ØŠØąŲƒ ØĢØŊاØĐ ØŠØŪØĩŲŠØĩ Leave Application,ØŠØąŲƒ اŲ„؊طØĻŲŠŲ‚ Leave Approver,ØŠØąŲƒ اŲ„Ų…ŲˆØ§ŲŲ‚ Leave Balance Before Application,ØŠØąŲƒ اŲ„ØąØĩŲŠØŊ Ų‚ØĻŲ„ ؊طØĻŲŠŲ‚ +Leave Block List,ØŠØąŲƒ Ų‚اØĶŲ…ØĐ Ø§Ų„Ø­ØļØą +Leave Block List Allow,ØŠØąŲƒ Ų‚اØĶŲ…ØĐ Ø§Ų„Ø­ØļØą اŲ„ØģŲ…اح +Leave Block List Allowed,ØŠØąŲƒ Ų‚اØĶŲ…ØĐ Ø§Ų„Ø­ØļØą Ų…ØģŲ…ŲˆØ­ +Leave Block List Date,ØŠØąŲƒ ØĻŲ„ŲˆŲƒ ØŠØ§ØąŲŠØŪ Ų‚اØĶŲ…ØĐ +Leave Block List Dates,ØŠØąŲƒ اŲ„ØŠŲˆØ§ØąŲŠØŪ Ų‚اØĶŲ…ØĐ Ø§Ų„Ø­ØļØą +Leave Block List Name,ØŠØąŲƒ اØģŲ… ŲƒØŠŲ„ØĐ Ų‚اØĶŲ…ØĐ +Leave Blocked,ØŠØąŲƒ اŲ„Ų…Ų…Ų†ŲˆØđ Leave Control Panel,ØŠØąŲƒ Ų„ŲˆØ­ØĐ Ø§Ų„؊حŲƒŲ… Leave Encashed?,ØŠØąŲƒ ØĩØąŲŲ‡Ø§ØŸ Leave Encashment Amount,ØŠØąŲƒ اŲ„Ų…ØĻŲ„Øš اŲ„؊حØĩŲŠŲ„ @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,Ø§ØŠØąŲƒŲ‡ ŲØ§ØąØšØ§ ØĨذا Ų†Øļ Leave blank if considered for all designations,ØŠØąŲƒ ŲØ§ØąØšØ§ ØĨذا Ų†ØļØąØŠ Ų„ØŽŲ…ŲŠØđ اŲ„ØŠØģŲ…ŲŠØ§ØŠ Leave blank if considered for all employee types,ØŠØąŲƒ ŲØ§ØąØšØ§ ØĨذا Ų†ØļØąØŠ Ų„ØŽŲ…ŲŠØđ ØĢŲ†ŲˆØ§Øđ Ų…ŲˆØļŲ Leave blank if considered for all grades,Ø§ØŠØąŲƒŲ‡ ŲØ§ØąØšØ§ ØĨذا Ų†ØļØąØŠ Ų„ØŽŲ…ŲŠØđ اŲ„ØĩŲŲˆŲ +Leave by,ØŠØąŲƒ Ų…Ų† Ų‚ØĻŲ„ "Leave can be approved by users with Role, ""Leave Approver""",ŲŠŲ…ŲƒŲ† اŲ„Ų…ŲˆØ§ŲŲ‚ØĐ ØđŲ„Ų‰ اŲ„ØĨ؎اØēØĐ Ų…Ų† Ų‚ØĻŲ„ اŲ„Ų…ØģØŠØŪØŊŲ…ŲŠŲ† Ų…Øđ اŲ„ØŊŲˆØą "Ø§ØŠØąŲƒ اŲ„Ų…ŲˆØ§ŲŲ‚" Ledger,ØŊŲØŠØą اŲ„Ø­ØģاØĻا؊ Left,ØŠØąŲƒ @@ -1525,12 +1540,14 @@ Login Before,ØŠØģØŽŲŠŲ„ اŲ„ØŊØŪŲˆŲ„ Ų‚ØĻŲ„ Login Id,اŲ„ØŊØŪŲˆŲ„ Ų…ØđØąŲ Login Page,اŲ„ØŊØŪŲˆŲ„ اŲ„ØĩŲØ­ØĐ Logout,ØŪØąŲˆØŽ +Long Description,اŲ„ŲˆØĩŲ اŲ„Ų…Ø·ŲˆŲ„ Long Text,Ų†Øĩ Ø·ŲˆŲŠŲ„ Lost Reason,ŲŲ‚ØŊ اŲ„ØģØĻØĻ Low,Ų…Ų†ØŪŲØķ Lower Income,ذا؊ اŲ„ØŊØŪŲ„ اŲ„Ų…Ų†ØŪŲØķ Lucida Grande,ØģØŊا ØšØąØ§Ų†ØŊŲŠ MIS Control,MIS اŲ„؊حŲƒŲ… +MREQ,MREQ MTN Details,ØŠŲØ§ØĩŲŠŲ„ MTN Mail Footer,اŲ„ØĻØąŲŠØŊ ؊ذŲŠŲŠŲ„ Mail Password,اŲ„ØĻØąŲŠØŊ ŲƒŲ„Ų…ØĐ Ø§Ų„Ų…ØąŲˆØą @@ -1591,6 +1608,14 @@ Match Id,؊طاØĻŲ‚ ØąŲ‚Ų… Match non-linked Invoices and Payments.,ØšŲŠØą Ų…طاØĻŲ‚ØĐ Ø§Ų„ŲŲˆØ§ØŠŲŠØą ŲˆØ§Ų„Ų…ØŊŲŲˆØđا؊ اŲ„Ų…ØąØŠØĻØ·ØĐ. Material Issue,اŲ„Ų…ŲˆØ§ØŊ اŲ„ØđØŊØŊ Material Receipt,اŲ„Ų…اØŊØĐ Ø§ØģØŠŲ„اŲ… +Material Request,Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ +Material Request Date,Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ ØŠØ§ØąŲŠØŪ +Material Request Detail No,ØŠŲØ§ØĩŲŠŲ„ Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ Ų„ا +Material Request For Warehouse,Ø·Ų„ØĻ Ų„Ų„Ø­ØĩŲˆŲ„ ØđŲ„Ų‰ اŲ„Ų…ŲˆØ§ØŊ Ų…ØģØŠŲˆØŊØđ +Material Request Item,Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ اŲ„ØĨØšŲ„اŲ‚ +Material Request Items,اŲ„ØđŲ†Ø§ØĩØą اŲ„Ų…اØŊŲŠØĐ Ø·Ų„ØĻ +Material Request No,Ø·Ų„ØĻ Ų…ŲˆØ§ØŊ Ų„ا +Material Request Type,Ø·Ų„ØĻ Ų†ŲˆØđ اŲ„Ų…ŲˆØ§ØŊ Material Transfer,Ų„Ų†Ų‚Ų„ اŲ„Ų…ŲˆØ§ØŊ Materials,اŲ„Ų…ŲˆØ§ØŊ Materials Required (Exploded),اŲ„Ų…ŲˆØ§ØŊ اŲ„Ų…Ø·Ų„ŲˆØĻØĐ (اŲ†ŲØŽØąØŠ) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),Ų…ŲˆØ§ØŊ Ų…؊طŲ„ØĻا؊ اŲ„ØŠØŪØ·ŲŠØ· (MRP Max Attachments,اŲ„Ų…ØąŲŲ‚ا؊ Ų…اŲƒØģ Max Days Leave Allowed,Ø§ØŠØąŲƒ ØĢŲŠØ§Ų… ŲƒØ­ØŊ ØĢŲ‚ØĩŲ‰ Ų…ØģŲ…ŲˆØ­ Max Discount (%),Ų…اŲƒØģ اŲ„ØŪØĩŲ… (ŲŠ) +Max. Limit,Ų…اŲƒØģ. Ų‚ØĩØą "Meaning of Submit, Cancel, Amend",Ų…ØđŲ†Ų‰ ØŠŲ‚ØŊŲŠŲ…ØŒ ØĨŲ„ØšØ§ØĄ ŲˆØŠØđØŊŲŠŲ„ Medium,Ų…ØŠŲˆØģØ· Merge,ØŊŲ…ØŽ @@ -1676,14 +1702,15 @@ New Communications,ØŽØŊŲŠØŊ اŲ„ا؊ØĩاŲ„ا؊ New Delivery Notes,Ų…Ų„احØļا؊ اŲ„ØŠØģŲ„ŲŠŲ… ØŽØŊŲŠØŊØĐ New Enquiries,اØģØŠŲØģØ§ØąØ§ØŠ ØŽØŊŲŠØŊØĐ New Leads,ØŽØŊŲŠØŊ اŲ„ØđØąŲˆØķ +New Leave Application,ØĨ؎اØēØĐ ØŽØŊŲŠØŊØĐ Ø§Ų„؊طØĻŲŠŲ‚ New Leaves Allocated,اŲ„ØŽØŊŲŠØŊ ŲŠØŠØąŲƒ اŲ„Ų…ØŪØĩØĩØĐ New Leaves Allocated (In Days),ØĢŲˆØąØ§Ų‚ اŲ„ØŽØŊŲŠØŊØĐ Ø§Ų„Ų…ØŪØĩØĩØĐ (ØĻاŲ„ØĢŲŠØ§Ų…) +New Material Requests,؊طŲ„ØĻ اŲ„Ų…ŲˆØ§ØŊ اŲ„ØŽØŊŲŠØŊØĐ New Name,اØģŲ… ØŽØŊŲŠØŊ New Password,ŲƒŲ„Ų…ØĐ Ų…ØąŲˆØą ØŽØŊŲŠØŊØĐ New Projects,Ų…ØīØ§ØąŲŠØđ ØŽØŊŲŠØŊØĐ New Purchase Orders,ØĢŲˆØ§Ų…Øą اŲ„ØīØąØ§ØĄ اŲ„ØŽØŊŲŠØŊØĐ New Purchase Receipts,ØĨŲŠØĩاŲ„ا؊ ØīØąØ§ØĄ ØŽØŊŲŠØŊØĐ -New Purchase Requests,Ø·Ų„ØĻا؊ ØīØąØ§ØĄ ØŽØŊŲŠØŊØĐ New Quotations,اŲ„اŲ‚ØŠØĻاØģا؊ اŲ„ØŽØŊŲŠØŊØĐ New Record,ØąŲ‚Ų… Ų‚ŲŠØ§ØģŲŠ ØŽØŊŲŠØŊ New Sales Orders,ØĢŲˆØ§Ų…Øą اŲ„Ų…ØĻŲŠØđا؊ اŲ„ØŽØŊŲŠØŊØĐ @@ -1863,6 +1890,7 @@ Parent Territory,اŲ„ØĢŲ… اŲ„ØĢØąØķ Parenttype,Parenttype Partially Completed,ØĢŲ†ØŽØēØŠ ØŽØēØĶŲŠØ§ Participants,اŲ„Ų…ØīØ§ØąŲƒŲŠŲ† +Particulars,ØŠŲØ§ØĩŲŠŲ„ Partly Billed,ŲˆØĩŲØŠ ØŽØēØĶŲŠØ§ Partly Delivered,Ų‡Ø°Ų‡ ØŽØēØĶŲŠØ§ Partner,ØīØąŲŠŲƒ @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc DOCTYPE Prevdoc Doctype,Prevdoc DOCTYPE Preview,Ų…ØđاŲŠŲ†ØĐ Previous Work Experience,ØŪØĻØąØĐ Ø§Ų„ØđŲ…Ų„ اŲ„ØģاØĻŲ‚ØĐ +Price,اŲ„ØģØđØą Price List,Ų‚اØĶŲ…ØĐ Ø§Ų„ØĢØģØđØ§Øą Price List Currency,Ų‚اØĶŲ…ØĐ Ø§Ų„ØĢØģØđØ§Øą اŲ„ØđŲ…Ų„ا؊ Price List Currency Conversion Rate,ØģØđØą ؊حŲˆŲŠŲ„ ØđŲ…Ų„ØĐ Ų‚اØĶŲ…ØĐ Ų‚ŲŠŲ… @@ -2067,14 +2096,6 @@ Purchase Receipt Items,ØīØąØ§ØĄ Ų‚Ø·Øđ اŲ„ØĨŲŠØĩاŲ„ Purchase Receipt Message,ØąØģاŲ„ØĐ ØĨŲŠØĩاŲ„ ØīØąØ§ØĄ Purchase Receipt No,Ų„ا ØīØąØ§ØĄ اØģØŠŲ„اŲ… Purchase Receipt Required,Ų…Ø·Ų„ŲˆØĻ ØĨŲŠØĩاŲ„ اŲ„ØīØąØ§ØĄ -Purchase Request,Ø·Ų„ØĻ ØīØąØ§ØĄ -Purchase Request Date,ØŠØ§ØąŲŠØŪ Ø·Ų„ØĻ ØīØąØ§ØĄ -Purchase Request Detail No,ØŠŲØ§ØĩŲŠŲ„ Ø·Ų„ØĻ ØīØąØ§ØĄ Ų„ا -Purchase Request For Warehouse,ØīØąØ§ØĄ Ø·Ų„ØĻ Ų„Ų„Ø­ØĩŲˆŲ„ ØđŲ„Ų‰ Ų…ØģØŠŲˆØŊØđ -Purchase Request Item,ØīØąØ§ØĄ اŲ„ØģŲ„ØđØĐ Ø·Ų„ØĻ -Purchase Request No,Ø·Ų„ØĻ ØīØąØ§ØĄ ØąŲ‚Ų… -Purchase Requisition Details,ØŠŲØ§ØĩŲŠŲ„ اŲ„اØģØŠŲŠŲ„Ø§ØĄ ØīØąØ§ØĄ -Purchase Requisition No,Ø·Ų„ØĻ ØīØąØ§ØĄ ØąŲ‚Ų… Purchase Return,ØīØąØ§ØĄ اŲ„ØđŲˆØŊØĐ Purchase Returned,ØđاØŊ ØīØąØ§ØĄ Purchase Returns,ØīØąØ§ØĄ اŲ„ØĨØģØŠØąØŽØ§Øđ @@ -2122,9 +2143,9 @@ Quotation To,اŲ‚ØŠØĻاØģ Quotation no against which this Sales Order is made ,اŲ‚ØŠØĻاØģ Ų„ا ŲˆØ§Ų„ØŠŲŠ ؊؊Ų… ØķØŊ Ų‡Ø°Ø§ ØĢŲ…Øą اŲ„Ų…ØĻŲŠØđا؊ Quotes to Leads or Customers.,اŲ‚ØŠØĻاØģا؊ Ų„ØđØąŲˆØķ ØĢŲˆ اŲ„ØđŲ…Ų„Ø§ØĄ. Raise Exception,ØąŲØđ اØģØŠØŦŲ†Ø§ØĄ +Raise Material Request,ØąŲØđ Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ +Raise Material Request when stock reaches re-order level,ØąŲØđ Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ ØđŲ†ØŊ اŲ„ØĢØģŲ‡Ų… ØŠØĩŲ„ ØĨŲ„Ų‰ Ų…ØģØŠŲˆŲ‰ ØĨØđاØŊØĐ Ø§Ų„Ø·Ų„ØĻ Raise Production Order,ØąŲØđ ØĢŲ…Øą اŲ„ØĨŲ†ØŠØ§ØŽ -Raise Purchase Request,ØąŲØđ Ø·Ų„ØĻ ØīØąØ§ØĄ -Raise Purchase Request when stock reaches re-order level,ØąŲØđ Ø·Ų„ØĻ ØīØąØ§ØĄ اŲ„ØĢØģŲ‡Ų… ØđŲ†ØŊŲ…ا ŲŠØĩŲ„ Ų…ØģØŠŲˆŲ‰ ØĨØđاØŊØĐ Ø§Ų„Ø·Ų„ØĻ Raised By,اŲ„ØŠŲŠ ØĢØŦØ§ØąŲ‡Ø§ Raised By (Email),اŲ„ØŠŲŠ ØĢØŦØ§ØąŲ‡Ø§ (ØĻØąŲŠØŊ ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ) Random,ØđØīŲˆØ§ØĶŲŠ @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,اŲ„Ų…ŲˆØ§ØŊ اŲ„ØŪاŲ… اŲ„Ų…ŲˆØąØŊØĐ Ø§Ų„ØŠŲƒŲ„Ų Re-Calculate Values,ØĨØđاØŊØĐ Ø­ØģاØĻ اŲ„Ų‚ŲŠŲ… Re-Order Level,ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Ų…ØģØŠŲˆŲ‰ Re-Order Qty,ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ اŲ„ŲƒŲ…ŲŠØĐ +Re-order,ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ +Re-order Level,ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Ų…ØģØŠŲˆŲ‰ +Re-order Qty,ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ اŲ„ŲƒŲ…ŲŠØĐ Read,Ų‚ØąØĢ Read Only,Ų„Ų„Ų‚ØąØ§ØĄØĐ ŲŲ‚Ø· Reading 1,Ų‚ØąØ§ØĄØĐ 1 @@ -2261,6 +2285,8 @@ Right,Ø­Ų‚ Role,ØŊŲˆØą Role Name,ØŊŲˆØą اŲ„اØģŲ… Roles,اŲ„ØĢØŊŲˆØ§Øą +Roles Assigned,اŲ„ØĢØŊŲˆØ§Øą اŲ„Ų…ØģŲ†ØŊØĐ +Roles Assigned To User,اŲ„ØĢØŊŲˆØ§Øą اŲ„Ų…ØģŲ†ØŊØĐ ØĨŲ„Ų‰ اŲ„Ų…ØģØŠØŪØŊŲ… Roles HTML,اŲ„ØĢØŊŲˆØ§Øą HTML Rounded Total,ØŠŲ‚ØąŲŠØĻ ØĨØŽŲ…اŲ„ŲŠ Rounded Total (Export),ØŠŲ‚ØąŲŠØĻ اŲ„ØĨØŽŲ…اŲ„ŲŠ (ØŠØĩØŊŲŠØą) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,اØŪØŠŲŠØ§Øą اŲ„ØđŲ†Ø§ØĩØą Ų…Ų† Ų…Ø°ŲƒØąØĐ Ø§Ų„ Select Items from Purchase Order,اØŪØŠŲŠØ§Øą اŲ„ØđŲ†Ø§ØĩØą Ų…Ų† ØĢŲ…Øą اŲ„ØīØąØ§ØĄ Select Items from Purchase Receipt,اØŪØŠŲŠØ§Øą اŲ„ØđŲ†Ø§ØĩØą Ų…Ų† ØĨŲŠØĩاŲ„ اŲ„ØīØąØ§ØĄ Select Items from Sales Order,اØŪØŠŲŠØ§Øą اŲ„ØđŲ†Ø§ØĩØą Ų…Ų† ØŠØąØŠŲŠØĻ اŲ„Ų…ØĻŲŠØđا؊ +Select Material Request,Ø­ØŊØŊ Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ Select PR,Ø­ØŊØŊ PR +Select Price List for the web. Leave blank to hide price.,Ø­ØŊØŊ Ų‚اØĶŲ…ØĐ Ø§Ų„ØģØđØą Ų„ØīØĻŲƒØĐ Ø§Ų„ØĨŲ†ØŠØąŲ†ØŠ. Ø§ØŠØąŲƒŲ‡ ŲØ§ØąØšØ§ Ų„ØĨØŪŲØ§ØĄ اŲ„ØĢØģØđØ§Øą. Select Print Format,Ø­ØŊØŊ ØŠŲ†ØģŲŠŲ‚ Ø·ØĻاØđØĐ Select Print Heading,Ø­ØŊØŊ Ø·ØĻاØđØĐ Ø§Ų„ØđŲ†ŲˆØ§Ų† -Select Purchase Request,Ø­ØŊØŊ Ø·Ų„ØĻ ØīØąØ§ØĄ Select Report Name,Ø­ØŊØŊ اØģŲ… اŲ„ØŠŲ‚ØąŲŠØą Select Role,Ø­ØŊØŊ ØŊŲˆØą Select Sales Orders,Ø­ØŊØŊ ØĢŲˆØ§Ų…Øą اŲ„Ų…ØĻŲŠØđا؊ @@ -2423,7 +2450,10 @@ Select Type,Ø­ØŊØŊ Ų†ŲˆØđ Select User or Property to start.,Ø­ØŊØŊ اŲ„Ų…ØģØŠØŪØŊŲ… ØĢŲˆ ØđŲ‚Ø§Øą Ų„Ų„ØĻØŊØĄ. Select account head of the bank where cheque was deposited.,Ø­ØŊØŊ ØąØĶŲŠØģ Ø­ØģاØĻ ŲŲŠ اŲ„ØĻŲ†Ųƒ Ø­ŲŠØŦ ØĢŲˆØŊØđ اŲ„اØŪØŠŲŠØ§Øą. Select company name first.,Ø­ØŊØŊ اØģŲ… اŲ„ØīØąŲƒØĐ Ø§Ų„ØĢŲˆŲ„. +Select dates to create a new ,Ų‚Ų… ØĻ؊حØŊŲŠØŊ Ų…ŲˆØ§ØđŲŠØŊ ØŽØŊŲŠØŊØĐ Ų„ØĨŲ†ØīØ§ØĄ Select name of Customer to whom project belongs,Ø­ØŊØŊ اØģŲ… اŲ„Ų…ØīØąŲˆØđ اŲ„ØēØĻاØĶŲ† اŲ„Ø°ŲŠŲ† ŲŠŲ†ØŠŲ…ŲŠ +Select or drag across dates to create a new event.,؊حØŊŲŠØŊ ØĢŲˆ ØģØ­ØĻ ØđØĻØą اŲ„ØŠŲˆØ§ØąŲŠØŪ ŲˆØŠØđØąŲ ØđŲ„Ų‰ ØĨŲ†ØīØ§ØĄ Ø­ØŊØŦ ØŽØŊŲŠØŊ. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank",Ø­ØŊØŊ Ų…ØģØŠŲˆØŊØđ اŲ„ØīØ­Ų† Ų„ØĨØļŲ‡Ø§Øą "ŲŲŠ ØģŲˆŲ‚ اŲ„ØĢØģŲ‡Ų…" ØĢŲˆ "ØšŲŠØą Ų…؊اح". Ų„ØĨØŪŲØ§ØĄØŒ Ø§ØŠØąŲƒŲ‡ ŲØ§ØąØšØ§ Select template from which you want to get the Goals,Ø­ØŊØŊ Ų‚اŲ„ØĻ اŲ„Ø°ŲŠ ØŠØąŲŠØŊ Ų„Ų„Ø­ØĩŲˆŲ„ ØđŲ„Ų‰ اŲ„ØĢŲ‡ØŊاŲ Select the Employee for whom you are creating the Appraisal.,Ø­ØŊØŊ Ų…ŲˆØļŲ اŲ„Ø°ŲŠŲ† ØŠŲ‚ŲˆŲ… ØĻØĨŲ†ØīØ§ØĄ ØŠŲ‚ŲŠŲŠŲ…. Select the currency in which price list is maintained,؊حØŊŲŠØŊ اŲ„ØđŲ…Ų„ØĐ Ø§Ų„ØŠŲŠ ŲŠØŠŲ… اŲ„اح؊ŲØ§Øļ Ų‚اØĶŲ…ØĐ Ø§Ų„ØĢØģØđØ§Øą @@ -2445,10 +2475,12 @@ Send,ØĨØąØģاŲ„ Send Autoreply,ØĨØąØģاŲ„ ØąØŊ ØŠŲ„Ų‚اØĶŲŠ Send Email,ØĨØąØģاŲ„ اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ Send From,ØĢØąØģŲ„ Ų…Ų† Ų‚ØĻŲ„ +Send Invite Email,ØĨØąØģاŲ„ ØŊØđŲˆØĐ Ų„ØĩØŊŲŠŲ‚ Send Me A Copy,ØĢØąØģŲ„ Ų„ŲŠ Ų†ØģØŪØĐ "Send Newsletters to your contacts, leads.",ØĨØąØģاŲ„ اŲ„ØąØģاØĶŲ„ اŲ„ØĨØŪØĻØ§ØąŲŠØĐ Ų„ØŽŲ‡Ø§ØŠ اŲ„ا؊ØĩاŲ„ اŲ„ØŪاØĩØĐ ØĻŲƒØŒ ŲˆŲŠØĪØŊŲŠ. Send SMS,ØĨØąØģاŲ„ SMS Send To,ØĢØąØģŲ„ ØĨŲ„Ų‰ +Send To Type,ØĨØąØģاŲ„ ØĨŲ„Ų‰ ŲƒØŠØ§ØĻØĐ "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.",ØĨØąØģاŲ„ ØĻØąŲŠØŊ ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ ØĨŲ„Ų‰ Ų…ØģØŠØŪØŊŲ…ŲŠ "Ų…ØŊŲŠØą اŲ„Ų…ŲˆØ§ØŊ" ØŊŲˆØą Ųˆ"Ų…ØŊŲŠØą اŲ„Ų…ØīØŠØąŲŠØ§ØŠ" ØđŲ†ØŊŲ…ا ØđØĻØąØŠ ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Ų…ØģØŠŲˆŲ‰. Send automatic emails to Contacts on Submitting transactions.,ØĨØąØģاŲ„ ØąØģاØĶŲ„ اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ ØŠŲ„Ų‚اØĶŲŠØ§ ØĨŲ„Ų‰ ØŽŲ‡Ø§ØŠ اŲ„ا؊ØĩاŲ„ ØđŲ„Ų‰ ØŠŲ‚ØŊŲŠŲ… اŲ„Ų…ØđاŲ…Ų„ا؊. "Send bulk SMS to leads, customers, contacts",ØĨØąØģاŲ„ اŲ„ØąØģاØĶŲ„ اŲ„Ų‚ØĩŲŠØąØĐ ØĻاŲ„ØŽŲ…Ų„ØĐ Ų„ØŒ اØđŲ„اŲ†Ø§ØŠ ا؊ØĩاŲ„ا؊، ŲˆØ§Ų„ØēØĻاØĶŲ† @@ -2515,6 +2547,7 @@ Ship To,اŲ„ØģŲŲŠŲ†ØĐ Shipping Address,ØđŲ†ŲˆØ§Ų† اŲ„ØīØ­Ų† Shipping Address Name,ØđŲ†ŲˆØ§Ų† اŲ„ØīØ­Ų† اŲ„اØģŲ… Shipping Details,ØŠŲØ§ØĩŲŠŲ„ اŲ„ØīØ­Ų† +Short Description,ŲˆØĩŲ Ų‚ØĩŲŠØą Short biography for website and other publications.,Ų†ØĻØ°ØĐ ØđŲ† ØģŲŠØąØĐ Ø­ŲŠØ§ØĐ Ų„Ų…ŲˆŲ‚Øđ اŲ„ŲˆŲŠØĻ ŲˆØšŲŠØąŲ‡Ø§ Ų…Ų† اŲ„Ų…Ø·ØĻŲˆØđا؊. Shortcut,اŲ„اØŪØŠØĩØ§Øą "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",ØŠØļŲ‡Øą "ŲŲŠ ØģŲˆŲ‚ اŲ„ØĢØģŲ‡Ų…" ØĢŲˆ "Ų„ŲŠØģ ŲŲŠ اŲ„ØĢŲˆØąØ§Ų‚ اŲ„Ų…اŲ„ŲŠØĐ" ØđŲ„Ų‰ ØĢØģاØģ اŲ„ØĢØģŲ‡Ų… اŲ„Ų…؊احØĐ ŲŲŠ Ų‡Ø°Ø§ اŲ„Ų…ØŪØēŲ†. @@ -2563,6 +2596,7 @@ Standard Rate,Ų‚ŲŠŲ… اŲ„Ų‚ŲŠØ§ØģŲŠØĐ Start Date,ØŠØ§ØąŲŠØŪ اŲ„ØĻØŊØĄ Start Report For,ØŠŲ‚ØąŲŠØą ØđŲ† ØĻØŊØĄ Start date of current invoice's period,ØŠØ§ØąŲŠØŪ ØĻØŊØĄ ŲØŠØąØĐ Ø§Ų„ŲØ§ØŠŲˆØąØĐ Ø§Ų„حاŲ„ŲŠØĐ +Starts on,ŲŠØĻØŊØĢ ŲŠŲˆŲ… Startup,ØĻØŊØĄ اŲ„ØŠØīØšŲŠŲ„ State,ØŊŲˆŲ„ØĐ State Name,اØģŲ… ŲˆŲ„اŲŠØĐ @@ -2712,6 +2746,7 @@ Test Data,اØŪØŠØĻØ§Øą اŲ„ØĻŲŠØ§Ų†Ø§ØŠ Test Date,اØŪØŠØĻØ§Øą ØŠØ§ØąŲŠØŪ Test Email Id,اØŪØŠØĻØ§Øą اŲ„ØĻØąŲŠØŊ اŲ„ØĨŲ„ŲƒØŠØąŲˆŲ†ŲŠ Ų…ØđØąŲ Test Link,اØŪØŠØĻØ§Øą اŲ„Ø§ØąØŠØĻاط +Test Runner,اØŪØŠØĻØ§Øą ØđØŊØ§ØĄ Test Select,اØŪØŠØĻØ§Øą اŲ„اØŪØŠŲŠØ§Øą Test Text,اØŪØŠØĻØ§Øą Ų†Øĩ Test the Newsletter,اØŪØŠØĻØ§Øą اŲ„Ų†ØīØąØĐ Ø§Ų„ØĨØŪØĻØ§ØąŲŠØĐ @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,اØģŲ… اŲ„ØīØąŲƒØĐ / اŲ„Ų…ŲˆŲ‚Øđ ŲƒŲ…ا ØŠØąŲŠØŊ ØĢŲ† ŲŠØļŲ‡Øą ØđŲ„Ų‰ ØīØąŲŠØ· اŲ„ØđŲ†ŲˆØ§Ų† ŲŲŠ اŲ„Ų…ØŠØĩŲØ­. ŲˆØģŲˆŲ ŲŠŲƒŲˆŲ† Ų‡Ø°Ø§ ŲƒŲ„ اŲ„ØĩŲØ­Ø§ØŠ ŲƒŲ…ا اŲ„ØĻاØŊØĶØĐ ØđŲ„Ų‰ اŲ„Ų„Ų‚ØĻ. The net weight of this package. (calculated automatically as sum of net weight of items),ŲˆØēŲ† ØĩاŲŲŠ Ų…Ų† Ų‡Ø°Ų‡ اŲ„Ø­ØēŲ…ØĐ. (؊حØģØĻ ØŠŲ„Ų‚اØĶŲŠØ§ Ų…ØŽŲ…ŲˆØđ اŲ„ŲˆØēŲ† اŲ„ØĩاŲŲŠ Ų„Ų„ØģŲ„ØđØĐ) The new BOM after replacement,ŲˆBOM اŲ„ØŽØŊŲŠØŊØĐ ØĻØđØŊ اØģØŠØĻØŊاŲ„ -The quantity for the Purchase Request when the stock goes below re-order level.,ŲƒŲ…ŲŠØĐ Ų„Ų„Ø·Ų„ØĻ ØīØąØ§ØĄ اŲ„ØĢØģŲ‡Ų… ØđŲ†ØŊŲ…ا ŲŠØ°Ų‡ØĻ ØĢØŊŲ†Ø§Ų‡ ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Ų…ØģØŠŲˆŲ‰. The rate at which Bill Currency is converted into company's base currency,اŲ„Ų…ØđØŊŲ„ اŲ„Ø°ŲŠ ŲŠØŠŲ… ؊حŲˆŲŠŲ„ اŲ„ØđŲ…Ų„ØĐ ØĨŲ„Ų‰ ØđŲ…Ų„ØĐ ØĻŲŠŲ„ Ų‚اØđØŊØĐ Ø§Ų„ØīØąŲƒØĐ "The system provides pre-defined roles, but you can add new roles to set finer permissions",ŲˆŲŠŲˆŲØą Ų†ØļاŲ… ØĢØŊŲˆØ§Øą Ų…Ø­ØŊØŊØĐ Ų…ØģØĻŲ‚ا، ŲˆŲ„ŲƒŲ† ŲŠŲ…ŲƒŲ†Ųƒ ØĨØķاŲØĐ ØĢØŊŲˆØ§Øą ØŽØŊŲŠØŊØĐ Ų„ØŠØđŲŠŲŠŲ† ØĢØ°ŲˆŲ†Ø§ØŠ ŲØ§ŲŠŲ†Øą -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",ØģŲŠŲ‚ŲˆŲ… اŲ„Ų†ØļاŲ… ØĨŲ†ØīØ§ØĄ Ø·Ų„ØĻ ØīØąØ§ØĄ اŲ„ŲƒŲ…ŲŠØĐ Ø§Ų„Ų…ØŠØĻŲ‚ŲŠØĐ ØŠŲ„Ų‚اØĶŲŠØ§ ØđŲ†ØŊŲ…ا ŲŠØ°Ų‡ØĻ ØĢØŊŲ†Ø§Ų‡ ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Ų…ØģØŠŲˆŲ‰ ŲŲŠ Ų…ØģØŠŲˆØŊØđ "Ų…ØŠØ§ØŽØą" ØĢŲˆ Ų†ŲˆØđ "Ų…ØģØŠŲˆØŊØđ Ų…Ø­ŲŲˆØļØĐ". The unique id for tracking all recurring invoices. It is generated on submit.,اŲ„Ų…ØđØąŲ اŲ„ŲØąŲŠØŊ Ų„؊؊ØĻØđ ØŽŲ…ŲŠØđ اŲ„ŲŲˆØ§ØŠŲŠØą اŲ„Ų…ØŠŲƒØąØąØĐ. ŲŠØŠŲ… ØĨŲ†ØīØ§ØĄ ØđŲ„Ų‰ اŲ„Ø­Ų„Ų‚ØĐ. Theme,Ų…ŲˆØķŲˆØđ Then By (optional),ØŦŲ… (اØŪØŠŲŠØ§ØąŲŠ) @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,Ų‡Ø°Ø§ Ų‡Ųˆ This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,ØŠØģاØđØŊŲƒ Ų‡Ø°Ų‡ اŲ„ØĢØŊاØĐ Ų„؊حØŊŲŠØŦ ØĢŲˆ ؊حØŊŲŠØŊ اŲ„ŲƒŲ…ŲŠØĐ ŲˆØŠŲ‚ŲŠŲŠŲ… اŲ„ØĢŲˆØąØ§Ų‚ اŲ„Ų…اŲ„ŲŠØĐ ŲŲŠ اŲ„Ų†ØļاŲ…. ŲˆØđاØŊØĐ Ų…ا ØŠØģØŠØŪØŊŲ… Ų„Ų…ØēاŲ…Ų†ØĐ Ų†ØļاŲ… اŲ„Ų‚ŲŠŲ… ŲˆŲ…ا Ų‡Ųˆ Ų…ŲˆØŽŲˆØŊ ŲØđŲ„ا ŲŲŠ اŲ„Ų…ØŪاØēŲ† اŲ„ØŪاØĩØĐ ØĻŲƒ. This will be used for setting rule in HR module,ŲˆØģŲˆŲ ØŠØģØŠØŪØŊŲ… Ų‡Ø°Ų‡ اŲ„Ų‚اØđØŊØĐ Ų„ØĨØđØŊاØŊ ŲˆØ­ØŊØĐ ŲŲŠ HR Thread HTML,اŲ„Ų…ŲˆØķŲˆØđ HTML +Thumbnail Image,ØĩŲˆØąØĐ Ų…ØĩØšØąØĐ Thursday,اŲ„ØŪŲ…ŲŠØģ Time,Ų…ØąØĐ Time Zone,Ų…Ų†Ø·Ų‚ØĐ ØēŲ…Ų†ŲŠØĐ @@ -2777,6 +2811,7 @@ To,ØĨŲ„Ų‰ To Date,ح؊Ų‰ اŲ„اŲ† To Discuss,Ų„Ų…Ų†Ø§Ų‚ØīØĐ To Do,Ų‡Ų„ Ų„ +To Do List,ŲˆØ§Ų„Ų‚ŲŠØ§Ų… Ų‚اØĶŲ…ØĐ To DocType,Ų„DOCTYPE To Field,Ų„اŲ„Ų…ŲŠØŊاŲ†ŲŠØĐ To PR Date,Ų„PR ØŠØ§ØąŲŠØŪ @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,Ų„ØŠŲ‚ŲŠŲŠØŊ اŲ„Ų…ØģØŠØŪØŊŲ… Ų…Ų† ØŊŲˆØą ØŪاØĩ Ų„Ų„ŲˆØŦاØĶŲ‚ اŲ„ØŠŲŠ Ų„ŲŠØģØŠ ØģŲˆŲ‰ اŲ„ذا؊ŲŠ اŲ„ØĨŲ†ØīØ§ØĄ. "To set user roles, just go to Setup > Users and click on the user to assign roles.",Ų„ØŠØđŲŠŲŠŲ† ØĢØŊŲˆØ§Øą اŲ„Ų…ØģØŠØŪØŊŲ…ŲŠŲ†ØŒ ŲˆØ§Ø°Ų‡ØĻŲˆØ§ ØĨŲ„Ų‰ ØĨØđØŊاØŊ اŲ„Ų…ØģØŠØŪØŊŲ…ŲŠŲ†> ŲˆØ§Ų†Ų‚Øą ØđŲ„Ų‰ اŲ„Ų…ØģØŠØŪØŊŲ… Ų„ØŠØđŲŠŲŠŲ† اŲ„ØĢØŊŲˆØ§Øą. To track any installation or commissioning related work after sales,Ų„؊؊ØĻØđ ØĢŲŠ ØŠØąŲƒŲŠØĻ ØĢŲˆ اŲ„ØĢØđŲ…اŲ„ ذا؊ اŲ„ØĩŲ„ØĐ Ø§Ų„ØŠŲƒŲ„ŲŠŲ ØĻØđØŊ اŲ„ØĻŲŠØđ -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No",Ų„ØŠØđŲ‚ØĻ اØģŲ… اŲ„ØđŲ„اŲ…ØĐ Ø§Ų„ØŠØŽØ§ØąŲŠØĐ ŲŲŠ اŲ„ŲˆØŦاØĶŲ‚ اŲ„؊اŲ„ŲŠØĐ
Ų…Ų„احØļØĐ Ø§Ų„ØŠØģŲ„ŲŠŲ…ØŒ Enuiry، Ø·Ų„ØĻ ØīØąØ§ØĄØŒ اŲ„Ų…ØŊŲŠŲ†ØĐ، ØĢŲ…Øą اŲ„ØīØąØ§ØĄØŒ Ų‚ØģŲŠŲ…ØĐ ØīØąØ§ØĄ ŲˆØ§ØģØŠŲ„اŲ… اŲ„Ų…ØīØŠØąŲŠØŒ اŲ‚ØŠØĻاØģ، ŲØ§ØŠŲˆØąØĐ Ø§Ų„Ų…ØĻŲŠØđا؊، BOM اŲ„Ų…ØĻŲŠØđا؊، ØŠØąØŠŲŠØĻ اŲ„Ų…ØĻŲŠØđا؊، ØąŲ‚Ų… اŲ„Ų…ØģŲ„ØģŲ„ +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No",Ų„ØŠØđŲ‚ØĻ اØģŲ… اŲ„ØđŲ„اŲ…ØĐ Ø§Ų„ØŠØŽØ§ØąŲŠØĐ ŲŲŠ اŲ„ŲˆØŦاØĶŲ‚ اŲ„؊اŲ„ŲŠØĐ
Ų…Ų„احØļØĐ Ø§Ų„ØŠØģŲ„ŲŠŲ…ØŒ Enuiry، Ø·Ų„ØĻ اŲ„Ų…ŲˆØ§ØŊ، اŲ„Ų…ØŊŲŠŲ†ØĐ، ØĢŲ…Øą اŲ„ØīØąØ§ØĄØŒ Ų‚ØģŲŠŲ…ØĐ ØīØąØ§ØĄ ŲˆØ§ØģØŠŲ„اŲ… اŲ„Ų…ØīØŠØąŲŠØŒ اŲ‚ØŠØĻاØģ، ŲØ§ØŠŲˆØąØĐ Ø§Ų„Ų…ØĻŲŠØđا؊، BOM اŲ„Ų…ØĻŲŠØđا؊، ØŠØąØŠŲŠØĻ اŲ„Ų…ØĻŲŠØđا؊، ØąŲ‚Ų… اŲ„Ų…ØģŲ„ØģŲ„ To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Ų„؊؊ØĻØđ اŲ„ØĻŲ†ØŊ ŲŲŠ اŲ„Ų…ØĻŲŠØđا؊ ŲˆØŦاØĶŲ‚ اŲ„ØīØąØ§ØĄ ØđŲ„Ų‰ ØĢØģاØģ Øš Ų…Ų† اŲ„Ų…ØģŲ„ØģŲ„. ŲˆŲŠŲ…ŲƒŲ† ØĢŲŠØķا اØģØŠØŪØŊاŲ… Ų‡Ø°Ų‡ اŲ„Ų…ØđŲ„ŲˆŲ…ا؊ Ų„ØŠØđŲ‚ØĻ اŲ„ØķŲ…اŲ† Ų„Ų„Ų…Ų†ØŠØŽ. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,Ų„ØŠØđŲ‚ØĻ اŲ„ØđŲ†Ø§ØĩØą ŲŲŠ اŲ„Ų…ØĻŲŠØđا؊ ŲˆØŦاØĶŲ‚ اŲ„ØīØąØ§ØĄ Ų…Øđ NOS ØŊŲØđØĐ
اŲ„ØĩŲ†Ø§ØđØĐ Ø§Ų„Ų…ŲØķŲ„: اŲ„ŲƒŲŠŲ…ŲŠØ§ØĄ اŲ„ØŪ To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Ų„ØŠØđŲ‚ØĻ اŲ„ØđŲ†Ø§ØĩØą ØĻاØģØŠØŪØŊاŲ… اŲ„ØĻØ§ØąŲƒŲˆØŊ. ØģŲˆŲ ØŠŲƒŲˆŲ† Ų‚اØŊØąØĐ ØđŲ„Ų‰ اŲ„ØŊØŪŲˆŲ„ ŲŲŠ ØĻŲ†ŲˆØŊ Ų…Ø°ŲƒØąØĐ Ø§Ų„ØŠØģŲ„ŲŠŲ… ŲˆØ§Ų„ŲØ§ØŠŲˆØąØĐ Ø§Ų„Ų…ØĻŲŠØđا؊ ØđŲ† Ø·ØąŲŠŲ‚ Ų…ØģØ­ اŲ„ØĻØ§ØąŲƒŲˆØŊ Ų…Ų† اŲ„ØđŲ†ØĩØą. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,؊؊ØĻØđ Ų‡Ø°Ų‡ اŲ„ŲØ§ØŠŲˆØąØĐ Ø§ Track this Sales Order against any Project,؊؊ØĻØđ Ų‡Ø°Ø§ اŲ„ØĢŲ…Øą ØķØŊ ØĢŲŠ Ų…ØīØąŲˆØđ اŲ„Ų…ØĻŲŠØđا؊ Transaction,ØĩŲŲ‚ØĐ Transaction Date,ØŠØ§ØąŲŠØŪ اŲ„Ų…ØđاŲ…Ų„ØĐ +Transfer,Ų†Ų‚Ų„ Transfer stock from one warehouse to another.,Ų†Ų‚Ų„ اŲ„ØĢØģŲ‡Ų… Ų…Ų† Ų…ØģØŠŲˆØŊØđ ØĨŲ„Ų‰ ØĒØŪØą. Transition Rules,اŲ„اŲ†ØŠŲ‚اŲ„ Ų‚ŲˆØ§Ų†ŲŠŲ† Transporter Info,Ų†Ų‚Ų„ Ų…ØđŲ„ŲˆŲ…ا؊ @@ -2882,6 +2918,7 @@ URL,URL Unable to complete request: ,ØšŲŠØą Ų‚اØŊØą ØđŲ„Ų‰ ØĨŲƒŲ…اŲ„ اŲ„Ø·Ų„ØĻ: Under AMC,؊ح؊ AMC Under Graduate,؊ح؊ اŲ„ØŊØąØ§Øģا؊ اŲ„ØđŲ„ŲŠØ§ +Under Section,؊ح؊ اŲ„Ų‚ØģŲ… Under Warranty,؊ح؊ اŲ„ŲƒŲØ§Ų„ØĐ Unit of Measure,ŲˆØ­ØŊØĐ Ø§Ų„Ų‚ŲŠØ§Øģ "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).",ŲˆØ­ØŊØĐ Ø§Ų„Ų‚ŲŠØ§Øģ ŲŲŠ Ų‡Ø°Ø§ اŲ„ØĻŲ†ØŊ (Ų…ØŦŲ„ ŲƒØŽŲ…ØŒ ŲˆØ­ØŊØĐ، Ų„ا، اŲ„ØēŲˆØŽ). @@ -2966,6 +3003,7 @@ Warehouse Type,Ų…ØģØŠŲˆØŊØđ Ų†ŲˆØđ Warehouse User,Ų…ØģØŠŲˆØŊØđ اŲ„ØđØķŲˆ Warehouse Users,Ų…ØģØŠŲˆØŊØđ اŲ„Ų…ØģØŠØŪØŊŲ…ŲŠŲ† Warehouse where you are maintaining stock of rejected items,Ų…ØģØŠŲˆØŊØđ Ø­ŲŠØŦ ŲƒŲ†ØŠ اŲ„Ø­ŲØ§Øļ ØđŲ„Ų‰ اŲ„Ų…ØŪØēŲˆŲ† Ų…Ų† اŲ„Ų…ŲˆØ§ØŊ ØąŲØķØŠ +Warehouse-wise Item Reorder,Ų…ØģØŠŲˆØŊØđ اŲ„Ų…ØŊŲŠŲ†ØĐ Ų…Ų† اŲ„Ø­ŲƒŲ…ØĐ ØĨØđاØŊØĐ ØŠØąØŠŲŠØĻ Warn,Ø­Ø°Øą Warning,؊حذŲŠØą Warranty / AMC Details,اŲ„ØķŲ…اŲ† / AMC ØŠŲØ§ØĩŲŠŲ„ @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,ŲŠŲ…ŲƒŲ†Ųƒ ØĨŲ† You can enter any date manually,ŲŠŲ…ŲƒŲ†Ųƒ ØĨØŊØŪاŲ„ ØĢŲŠ ØŠØ§ØąŲŠØŪ ŲŠØŊŲˆŲŠØ§ You can enter the minimum quantity of this item to be ordered.,ŲŠŲ…ŲƒŲ†Ųƒ ØĨØŊØŪاŲ„ ŲƒŲ…ŲŠØĐ Ø§Ų„Ø­ØŊ اŲ„ØĢØŊŲ†Ų‰ ŲŲŠ Ų‡Ø°Ø§ اŲ„ØĻŲ†ØŊ ØĨŲ„Ų‰ ØĢŲ† ŲŠØĪŲ…Øą. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,ŲŠŲ…ŲƒŲ†Ųƒ ØŠŲ‚ØŊŲŠŲ… Ų…Ø°ŲƒØąØĐ Ø§Ų„ØŠØģŲ„ŲŠŲ… Ų…Ų† ØĢŲˆØ§Ų…Øą اŲ„ØĻŲŠØđ Ų…ØŠØđØŊØŊØĐ. Ø­ØŊØŊ ØĢŲˆØ§Ų…Øą اŲ„ØĻŲŠØđ ŲˆØ§Ø­ØŊا ØŠŲ„Ųˆ اŲ„ØĒØŪØą ØŦŲ… اŲ†Ų‚Øą ØđŲ„Ų‰ اŲ„ØēØą ØĢØŊŲ†Ø§Ų‡. -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,ŲŠŲ…ŲƒŲ†Ųƒ ØĨØĩØŊØ§Øą ØĢŲ…Øą ØīØąØ§ØĄ Ų…Ų† Ø·Ų„ØĻا؊ اŲ„ØīØąØ§ØĄ Ų…ØŠØđØŊØŊØĐ. Ø­ØŊØŊ Ø·Ų„ØĻا؊ اŲ„ØīØąØ§ØĄ ŲˆØ§Ø­ØŊا ØŠŲ„Ųˆ اŲ„ØĒØŪØą ØŦŲ… اŲ†Ų‚Øą ØđŲ„Ų‰ اŲ„ØēØą ØĢØŊŲ†Ø§Ų‡. +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,ŲŠŲ…ŲƒŲ†Ųƒ ØĨØĩØŊØ§Øą ØĢŲ…Øą ØīØąØ§ØĄ Ų…Ų† Ø·Ų„ØĻا؊ اŲ„Ų…ŲˆØ§ØŊ Ų…ØŠØđØŊØŊØĐ. Ø­ØŊØŊ اŲ„Ų…ŲˆØ§ØŊ ؊طŲ„ØĻ ŲˆØ§Ø­ØŊا ØŠŲ„Ųˆ اŲ„ØĒØŪØą ØŦŲ… اŲ†Ų‚Øą ØđŲ„Ų‰ اŲ„ØēØą ØĢØŊŲ†Ø§Ų‡. You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,ŲŠŲ…ŲƒŲ†Ųƒ ØĨØĩØŊØ§Øą ØĢŲ…Øą ØīØąØ§ØĄ Ų…Ų† اŲ„اŲ‚ØŠØĻاØģا؊ Ų…ØēŲˆØŊ Ų…ØŠØđØŊØŊØĐ. Ø­ØŊØŊ Ų…ØēŲˆØŊ اŲ„اŲ‚ØŠØĻاØģا؊ ŲˆØ§Ø­ØŊا ØŠŲ„Ųˆ اŲ„ØĒØŪØą ØŦŲ… اŲ†Ų‚Øą ØđŲ„Ų‰ اŲ„ØēØą ØĢØŊŲ†Ø§Ų‡. You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,ŲŠŲ…ŲƒŲ†Ųƒ ØŽØđŲ„ ØĨŲŠØĩاŲ„ اŲ„ØīØąØ§ØĄ Ų…Ų† ØĢŲˆØ§Ų…Øą اŲ„ØīØąØ§ØĄ Ų…ØŠØđØŊØŊØĐ. Ø­ØŊØŊ ØĢŲˆØ§Ų…Øą اŲ„ØīØąØ§ØĄ ŲˆØ§Ø­ØŊا ØŠŲ„Ųˆ اŲ„ØĒØŪØą ØŦŲ… اŲ†Ų‚Øą ØđŲ„Ų‰ اŲ„ØēØą ØĢØŊŲ†Ø§Ų‡. You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,ŲŠŲ…ŲƒŲ†Ųƒ ØŠØđŲŠŲŠŲ† Ų…ØŪØŠŲ„Ų 'ØŪØĩاØĶØĩ' Ų„Ų„Ų…ØģØŠØŪØŊŲ…ŲŠŲ† Ų„ØķØĻØ· اŲ„Ų‚ŲŠŲ… اŲ„اŲØŠØąØ§ØķŲŠØĐ ŲˆØŠØ·ØĻŲŠŲ‚ اŲ„Ų‚ŲˆØ§ØđØŊ ØĨØ°Ų† ØđŲ„Ų‰ ØĢØģاØģ Ų‚ŲŠŲ…ØĐ Ų‡Ø°Ų‡ اŲ„ØŪØĩاØĶØĩ ŲŲŠ ØĢØīŲƒØ§Ų„ Ų…ØŪØŠŲ„ŲØĐ. You can use Customize Form to set levels on fields.,ŲŠŲ…ŲƒŲ†Ųƒ اØģØŠØŪØŊاŲ… Ų†Ų…ŲˆØ°ØŽ ØŠØŪØĩŲŠØĩ Ų„؊حØŊŲŠØŊ Ų…ØģØŠŲˆŲŠØ§ØŠ ØđŲ„Ų‰ اŲ„Ø­Ų‚ŲˆŲ„. -You cannot apply for a leave on the following date because it is blocked,Ų„ا ŲŠŲ…ŲƒŲ†Ųƒ اŲ„ØŠŲ‚ØŊŲ… Ų„Ų„Ø­ØĩŲˆŲ„ ØđŲ„Ų‰ اŲ„ØĨ؎اØēØĐ ŲŲŠ ØŠØ§ØąŲŠØŪ اŲ„؊اŲ„ŲŠØĐ Ų„ØŠŲ… Ø­ØļØąŲ‡ Your Customer's TAX registration numbers (if applicable) or any general information,ØđŲ…ŲŠŲ„Ųƒ ØĢØąŲ‚اŲ… اŲ„ØŠØģØŽŲŠŲ„ اŲ„ØķØąŲŠØĻŲŠ (ØĨŲ† ŲˆØŽØŊØŠ) ØĢŲˆ ØĢŲŠ Ų…ØđŲ„ŲˆŲ…ا؊ ØđاŲ…ØĐ "Your download is being built, this may take a few moments...",ŲˆŲŠØŽØąŲŠ ØĻŲ†Ø§ØĄ اŲ„ØŠŲ†ØēŲŠŲ„ØŒ ŲˆŲ‡Ø°Ø§ Ų‚ØŊ ŲŠØģØŠØšØąŲ‚ ØĻØķØđ Ų„Ø­Øļا؊ ... Your letter head content in HTML.,اŲ„Ų…ح؊ŲˆŲ‰ ØąØĢØģ اŲ„ØąØģاŲ„ØĐ ŲŲŠ HTML. @@ -3231,6 +3268,7 @@ tag,ØĻطاŲ‚ØĐ tags,ØĻŲ‡ "target = ""_blank""",اŲ„Ų‡ØŊŲ = "_blank" tasks,اŲ„Ų…Ų‡Ø§Ų… +test,اØŪØŠØĻØ§Øą text-height,Ø§ØąØŠŲØ§Øđ اŲ„Ų†Øĩ text-width,ØđØąØķ اŲ„Ų†Øĩ th,اŲ„ diff --git a/translations/es.csv b/translations/es.csv index d2178fafdff..aad7ca9e902 100644 --- a/translations/es.csv +++ b/translations/es.csv @@ -1,5 +1,5 @@ , - Reason: ,RazÃģn: + (Half Day),(Medio día) against same operation,contra la misma operaciÃģn by Role ,por funciÃģn cannot be 0,no puede ser 0 @@ -157,6 +157,7 @@ Activity Log,Registro de actividad Activity Name,Nombre de la actividad Activity Type,Tipo de actividad Actual,Real +Actual Amount,Cantidad real Actual Budget,Presupuesto Real Actual Completion Date,Fecha de TerminaciÃģn del Real Actual Date,Fecha Actual @@ -236,17 +237,13 @@ Against Voucher Type,Contra el tipo de comprobante Agent,Agente "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Grupo global de productos ** ** en otro artículo **. ** Esto es Útil si usted estÃĄ empaquetando un cierto ** ** Los productos en un paquete y usted mantiene un balance de los artículos envasados ​​** ** y no el agregado del artículo **. ** El paquete ** artículo ** habrÃĄ "es el tema de" como "No" y "ÂŋSales Item" como "Sí", por ejemplo:. Si usted estÃĄ vendiendo computadoras portÃĄtiles y Mochilas por separado y recibir un descuento si el cliente compra a la vez , entonces el ordenador portÃĄtil + Mochila serÃĄ una nueva lista de materiales de ventas Item.Note: BOM = Bill de Materiales" Aging Date,Fecha de antigÞedad -All Active Leads,Todas las derivaciones activas All Addresses.,Todas las direcciones. -All Blog Subscribers,Todos los suscriptores de blog All Contact,Todo contacto -All Contacts,Todos los contactos All Contacts.,Todos los contactos. All Customer Contact,Todo servicio al cliente -All Customer Contacts,Todos los contactos de clientes +All Day,Todo el día All Employee (Active),Todos los empleados (Activo) All Lead (Open),Todos Plomo (Abierto) -All Leads,Todos los cables All Products or Services.,Todos los Productos o Servicios. All Sales Partner Contact,Todo contacto Sales Partner All Sales Person,Todas Ventas Persona @@ -436,7 +433,6 @@ Budget Details,Datos del Presupuesto Budget Distribution,DistribuciÃģn del presupuesto Budget Distribution Detail,Presupuesto Detalle DistribuciÃģn Budget Distribution Details,Detalles DistribuciÃģn del presupuesto -Build Report,Construir Informe Bulk Email,E-mail a granel Bulk Email records.,Correo electrÃģnico masivo registros. Bundle items at time of sale.,Agrupe elementos en tiempo de venta. @@ -465,6 +461,7 @@ Calculate Tax,CÃĄlculo de Impuestos Calculate Taxes and Charges,CÃĄlculo de Impuestos y Cargos Calculate Total Score,Calcular la puntuaciÃģn total Calendar,Calendario +Calendar Events,Calendario de Eventos Call,Llamar Campaign,CampaÃąa Campaign Name,Nombre de la campaÃąa @@ -601,6 +598,7 @@ Contact Name,Nombre de contacto Contact No,Contacto No Contact No.,Contactar No. Contact Person,Persona de Contacto +Contact Type,Tipo de contacto Contact Us Settings,ContÃĄctenos ConfiguraciÃģn Contact in Future,PÃģngase en contacto con en el Futuro "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","Opciones de contacto, como "Consulta de Ventas, Soporte de consultas", etc cada uno en una nueva línea o separados por comas." @@ -664,6 +662,7 @@ Current Value,Valor actual Current status,SituaciÃģn actual Cust/Supp Address,Cust / Supp DirecciÃģn Cust/Supp Name,Cust / Supp Nombre +Custom,Costumbre Custom Autoreply Message,Custom mensaje de respuesta automÃĄtica Custom CSS,Custom CSS Custom Field,Campo personalizado @@ -879,6 +878,7 @@ Editable,Editable Educational Qualification,CapacitaciÃģn Educativa Educational Qualification Details,Datos Educativos de calificaciÃģn Eg. smsgateway.com/api/send_sms.cgi,Por ejemplo. smsgateway.com / api / send_sms.cgi +Eligible Amount,Monto Elegible Email,Email Email (By company),E-mail (por empresa) Email Digest,Email Resumen @@ -927,6 +927,7 @@ Encashment Date,Cobro Fecha End Date,Fecha de finalizaciÃģn End date of current invoice's period,Fecha de finalizaciÃģn del periodo de facturaciÃģn actual End of Life,Fin de la Vida +Ends on,Finaliza el Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,Introduzca la ID de correo electrÃģnico para recibir informe de error enviado por users.Eg: support@iwebnotes.com Enter Form Type,Introduzca el tipo de formulario Enter Row,Ingrese Row @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,No se pe Error,Error Estimated Material Cost,Costo estimado de material Event,Evento -Event Date,Fecha del evento Event Individuals,Los individuos del Evento -Event Name,Nombre del evento Event Role,Evento Papel Event Roles,Roles de eventos -Event Time,Evento Event Type,Tipo de evento Event Updates,Actualizaciones del Evento Event User,Evento del usuario @@ -1046,6 +1044,7 @@ Fixed Asset Account,Cuenta de Activos Fijos Float,Flotar Float Precision,Precision Float Floral,Floral +Following dates are blocked for Leave,Siguientes fechas son bloqueados por la licencia "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",Tras tabla mostrarÃĄ valores si los artículos son sub - contratado. Estos valores se obtienen de la maestra de la "Lista de materiales" de la sub - productos contratados. Font,Fuente Font Size,TamaÃąo de la Fuente @@ -1073,6 +1072,7 @@ For ranges,Para los rangos de For reference,Para referencia For reference only.,SÃģlo para referencia. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes, estos cÃģdigos se puede utilizar en formato impreso como facturas y albaranes" +Form,Formulario Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,Formato: hh: mm Ejemplo de una hora de caducidad fijado las 01:00. Max caducidad serÃĄ de 72 horas. Predeterminado es de 24 horas Forum,Foro Fraction,FracciÃģn @@ -1089,7 +1089,9 @@ From PR Date,Desde la fecha PR From Package No.,De Paquete No. From Table,De la Tabla Frozen,Congelado +Full Image,Imagen completa Full Name,Nombre Completo +Full description (formatted as markdown),DescripciÃģn completa (con formato Markdown) Fully Billed,Totalmente Anunciada Fully Completed,Totalmente Completada GL Control,GL control @@ -1104,7 +1106,7 @@ Gender,GÃĐnero General,General General Ledger,Contabilidad General Generate Description HTML,DescripciÃģn Generar HTML -Generate Purchase Requests (MRP) and Production Orders.,Generar Ordenes de Compra (MRP) y Órdenes de ProducciÃģn. +Generate Material Requests (MRP) and Production Orders.,Generar solicitudes de material (MRP) y Órdenes de ProducciÃģn. Generate Salary Slips,Generar las nÃģminas Generate Schedule,Generar Calendario "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albaranes para los paquetes que se entregarÃĄn. Se utiliza para notificar el nÚmero de paquetes, el contenido del paquete y su peso." @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,Pasar por alto Image,Imagen Image View,Ver imagen +Image for listing (Width: 100px) (Attach First),Imagen para el listado (Ancho: 100px) (Adjunte primero) +Image for listing (Width: 300px) (Attach First),Imagen para el listado (Ancho: 300px) (Adjunte primero) Implementation Partner,AplicaciÃģn Socio Import,Importar Import Date Format ,Importar formato de fecha @@ -1391,6 +1395,7 @@ Item Name,Nombre del elemento Item Price,Artículo Precio Item Prices,Precios de los artículos Item Quality Inspection Parameter,Calidad InspecciÃģn Tema ParÃĄmetro +Item Reorder,Artículo reorden Item Serial No,Artículo NÚmero de orden Item Serial Nos,Artículo nÚmeros de serie Item Supplier,Artículo Proveedor @@ -1470,15 +1475,24 @@ Lead Lost,El plomo Perdido Lead Name,Plomo Nombre Lead Owner,El plomo Propietario Lead Ref,El plomo Ref +Lead Source,Plomo Fuente +Lead Status,Lead Estado Lead Time Date,Plomo Fecha Hora Lead Time Days,Plomo días Tiempo -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,Lead Time día es el nÚmero de días en que se espera para este artículo en su almacÃĐn. Estos días se recupera en solicitud de compra al seleccionar este elemento. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Lead Time día es el nÚmero de días en que se espera para este artículo en su almacÃĐn. Estos días se recupera en la solicitud de material cuando se selecciona este elemento. Lead Type,Plomo Tipo Leave Allocation,Deja AsignaciÃģn Leave Allocation Tool,Deja herramienta de asignaciÃģn de Leave Application,Deja aplicaciÃģn Leave Approver,Deja Aprobador Leave Balance Before Application,Deja Saldo antes de la aplicaciÃģn +Leave Block List,Deja lista de bloqueo +Leave Block List Allow,Deja Lista de bloqueo Permitir +Leave Block List Allowed,Deja Lista de bloqueo animales +Leave Block List Date,Deje Fecha Lista de bloqueo +Leave Block List Dates,Dejar las fechas de listas de bloqueo +Leave Block List Name,Deja Bloquear Nombre de lista +Leave Blocked,Deja Bloqueados Leave Control Panel,Deja Panel de control Leave Encashed?,Deja cobrado? Leave Encashment Amount,Deja Cantidad Cobro @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,Dejar en blanco si se considera pa Leave blank if considered for all designations,Dejar en blanco si se considera para todas las designaciones Leave blank if considered for all employee types,Dejar en blanco si se considera para todos los tipos de empleados Leave blank if considered for all grades,Dejar en blanco si se considera para todos los grados +Leave by,Deja por "Leave can be approved by users with Role, ""Leave Approver""","Deje puede ser aprobado por los usuarios con rol, "Deja Aprobador"" Ledger,Libro mayor Left,Izquierda @@ -1525,12 +1540,14 @@ Login Before,Inicio de sesiÃģn antes Login Id,ID de Usuario Login Page,La pÃĄgina de inicio Logout,Cerrar sesiÃģn +Long Description,DescripciÃģn larga Long Text,Texto largo Lost Reason,RazÃģn Perdido Low,Bajo Lower Income,Menores ingresos Lucida Grande,Lucida Grande MIS Control,MIS control +MREQ,MREQ MTN Details,MTN Detalles Mail Footer,Correo pie de pÃĄgina Mail Password,Mail ContraseÃąa @@ -1591,6 +1608,14 @@ Match Id,Coincidir ID Match non-linked Invoices and Payments.,Coincidir no vinculados Facturas y Pagos. Material Issue,Material de EmisiÃģn Material Receipt,Recibo de Materiales +Material Request,Material de Solicitud +Material Request Date,Material de la Fecha de Solicitud +Material Request Detail No,Materiales Detalle Solicitud de No +Material Request For Warehouse,Material de Solicitud de AlmacÃĐn +Material Request Item,Artículo Material Request +Material Request Items,Artículos de materiales Solicitar +Material Request No,Material de Solicitud de No +Material Request Type,Tipo de material Solicitud Material Transfer,Transferencia de material Materials,Materiales Materials Required (Exploded),Materiales necesarios (despiece) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),Materiales planificaciÃģn de necesidades (M Max Attachments,Max Adjuntos Max Days Leave Allowed,Días mÃĄx Deja animales Max Discount (%),Max Descuento (%) +Max. Limit,Max. Limitar "Meaning of Submit, Cancel, Amend","Significado de Presentar, cancelaciÃģn, rectificaciÃģn" Medium,Medio Merge,Unir @@ -1676,14 +1702,15 @@ New Communications,Nueva Comunicaciones New Delivery Notes,Nuevos Títulos de entrega New Enquiries,Nueva Consultas New Leads,New Leads +New Leave Application,AplicaciÃģn salir de Nueva New Leaves Allocated,Nueva Hojas Asignado New Leaves Allocated (In Days),Las hojas nuevas asignado (en días) +New Material Requests,Pide Nuevo Material New Name,Nuevo nombre New Password,Nueva contraseÃąa New Projects,Nuevos Proyectos New Purchase Orders,Nuevas Ãģrdenes de compra New Purchase Receipts,Nuevos recibos de compra -New Purchase Requests,Las nuevas solicitudes de compra New Quotations,Las citas nuevas New Record,Nuevo registro New Sales Orders,Las Ãģrdenes de compra nuevo @@ -1863,6 +1890,7 @@ Parent Territory,Padres Territorio Parenttype,ParentType Partially Completed,Completada parcialmente Participants,Los participantes +Particulars,Datos Partly Billed,Mayormente Anunciado Partly Delivered,Mayormente Entregado Partner,Socio @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc DocType Prevdoc Doctype,Prevdoc Doctype Preview,Avance Previous Work Experience,Experiencia laboral previa +Price,Precio Price List,Precio de lista Price List Currency,Precio de Lista Currency Price List Currency Conversion Rate,Lista de precios de divisas ConversiÃģn de Tasa de @@ -2067,14 +2096,6 @@ Purchase Receipt Items,Comprar artículos de recibos Purchase Receipt Message,Compra mensaje recibido Purchase Receipt No,No recibo de compra Purchase Receipt Required,Se requiere recibo de compra -Purchase Request,Solicitud de compra -Purchase Request Date,Compra Fecha de Solicitud -Purchase Request Detail No,Detalle Solicitud de Compra No -Purchase Request For Warehouse,Solicitud de compra para el almacÃĐn -Purchase Request Item,Compra Solicitar Artículo -Purchase Request No,Solicitud de Compra No -Purchase Requisition Details,Compra Detalles requisiciones -Purchase Requisition No,Compra RequisiciÃģn No Purchase Return,Comprar Volver Purchase Returned,Compra Devuelto Purchase Returns,Devoluciones de compras @@ -2122,9 +2143,9 @@ Quotation To,PRESUPUESTO a Quotation no against which this Sales Order is made ,CotizaciÃģn no contra el que se hizo este pedido de ventas Quotes to Leads or Customers.,Cotizaciones a clientes potenciales o clientes. Raise Exception,Levante ExcepciÃģn +Raise Material Request,Levante solicitar material +Raise Material Request when stock reaches re-order level,Levante solicitar material cuando el stock llega a re-ordenar nivel Raise Production Order,Levante orden de producciÃģn -Raise Purchase Request,Elevar solicitud de compra -Raise Purchase Request when stock reaches re-order level,Levante Solicitud de compra cuando el stock llega a re-ordenar nivel Raised By,Raised By Raised By (Email),Raised By (correo electrÃģnico) Random,Azar @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,Materias primas suministradas Costo Re-Calculate Values,Vuelva a calcular los valores Re-Order Level,Re-Order Nivel Re-Order Qty,Re-Order Cantidad +Re-order,Reordenar +Re-order Level,Reordenar Nivel +Re-order Qty,Reordenar Cantidad Read,Leer Read Only,Solo lectura Reading 1,Lectura 1 @@ -2261,6 +2285,8 @@ Right,Derecho Role,Papel Role Name,Rol Nombre Roles,Roles +Roles Assigned,Roles asignados +Roles Assigned To User,Los roles asignados al usuario Roles HTML,Roles HTML Rounded Total,Total redondeado Rounded Total (Export),Total redondeado (ExportaciÃģn) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,Seleccionar elementos de la nota de entrega Select Items from Purchase Order,Seleccionar elementos de orden de compra Select Items from Purchase Receipt,Seleccionar elementos de recibo de compra Select Items from Sales Order,Seleccionar elementos de Ãģrdenes de venta +Select Material Request,Seleccione Solicitud de material Select PR,Seleccione PR +Select Price List for the web. Leave blank to hide price.,Seleccione Lista de precios para la web. Dejar en blanco para esconder precio. Select Print Format,Seleccione Formato de impresiÃģn Select Print Heading,Seleccione Imprimir Encabezado -Select Purchase Request,Seleccione Solicitud de Compra Select Report Name,Seleccione Nombre de informe Select Role,Seleccione Papel Select Sales Orders,Seleccione Ãģrdenes de venta @@ -2423,7 +2450,10 @@ Select Type,Seleccione el tipo de Select User or Property to start.,Seleccionar usuario o propiedad para comenzar. Select account head of the bank where cheque was deposited.,Seleccione cabeza cuenta del banco donde cheque fue depositado. Select company name first.,Seleccione el nombre de la empresa en primer lugar. +Select dates to create a new ,Selecciona fechas para crear un nuevo Select name of Customer to whom project belongs,Seleccione el nombre del cliente al que pertenece proyecto +Select or drag across dates to create a new event.,Seleccione o arrastre las fechas para crear un nuevo evento. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank","Seleccione almacÃĐn de expediciÃģn para mostrar "En Stock" o "Out of Stock". Para ocultar, dejar en blanco" Select template from which you want to get the Goals,Seleccione la plantilla de la que desea obtener los Objetivos de Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que estÃĄ creando la tasaciÃģn. Select the currency in which price list is maintained,Seleccione la moneda en la que se mantiene la lista de precios @@ -2445,10 +2475,12 @@ Send,Enviar Send Autoreply,Enviar respuesta automÃĄtica Send Email,Enviar correo Send From,Enviar desde +Send Invite Email,Enviar invitaciÃģn Email Send Me A Copy,Enviarme una copia "Send Newsletters to your contacts, leads.","Enviar boletines a sus contactos, clientes potenciales." Send SMS,Enviar SMS Send To,Enviar a un +Send To Type,Enviar a un tipo "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.",Enviar un correo electrÃģnico a los usuarios de "Administrador de Material" papel y "Administrador de compra" cuando re-ordenar nivel se cruza. Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrÃģnicos automÃĄticos en Contactos de Envío de transacciones. "Send bulk SMS to leads, customers, contacts","Envíe SMS a granel a clientes potenciales, clientes, contactos" @@ -2515,6 +2547,7 @@ Ship To,Enviamos Shipping Address,DirecciÃģn de envío Shipping Address Name,Nombre de embarque DirecciÃģn Shipping Details,Detalles del envío +Short Description,Breve DescripciÃģn Short biography for website and other publications.,Breve biografía de la pÃĄgina web y otras publicaciones. Shortcut,Atajo "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar "En Stock" o "no estÃĄ en stock", basada en el stock disponible en este almacÃĐn." @@ -2563,6 +2596,7 @@ Standard Rate,Tarifa EstÃĄndar Start Date,Fecha de inicio Start Report For,Inicio Informe para Start date of current invoice's period,Fecha de inicio del periodo de facturaciÃģn actual +Starts on,Comienza el Startup,Inicio State,Estado State Name,Estado Nombre @@ -2712,6 +2746,7 @@ Test Data,Datos de Prueba Test Date,Fecha del Examen Test Email Id,Prueba de IdentificaciÃģn del email Test Link,Prueba de enlace +Test Runner,Prueba Runner Test Select,Seleccione Test Test Text,Prueba de Texto Test the Newsletter,Pruebe el Boletín @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,El nombre de su empresa / sitio web como usted desea que aparezca en la barra de título del navegador. Todas las pÃĄginas tienen esto como el prefijo del título. The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (Calculado automÃĄticamente como la suma del peso neto de los artículos) The new BOM after replacement,La lista de materiales nuevo despuÃĐs de sustituirlo -The quantity for the Purchase Request when the stock goes below re-order level.,La cantidad de la solicitud de compra cuando la poblaciÃģn estÃĄ por debajo de reordenar nivel. The rate at which Bill Currency is converted into company's base currency,La velocidad a la cual se convierte en moneda Bill moneda base empresa "The system provides pre-defined roles, but you can add new roles to set finer permissions","El sistema proporciona roles predefinidos, pero usted puede aÃąadir nuevas funciones para establecer permisos mÃĄs finos" -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",El sistema generarÃĄ una solicitud de compra de forma automÃĄtica cuando la cantidad de existencias es inferior a re-ordenar nivel en el depÃģsito de tipo "tiendas" o "almacÃĐn reservada". The unique id for tracking all recurring invoices. It is generated on submit.,El identificador Único para el seguimiento de todas las facturas recurrentes. Se genera en enviar. Theme,Tema Then By (optional),Luego por (opcional) @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,Este es el n This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoraciÃģn de las existencias en el sistema. Se suele utilizar para sincronizar los valores del sistema y lo que realmente existe en sus almacenes. This will be used for setting rule in HR module,Esto serÃĄ utilizado para la regla de ajuste en el mÃģdulo HR Thread HTML,Tema HTML +Thumbnail Image,Imagen en miniatura Thursday,Jueves Time,Tiempo Time Zone,Time Zone @@ -2777,6 +2811,7 @@ To,A To Date,Conocer To Discuss,Para discutir To Do,Para hacer +To Do List,Para hacer la lista To DocType,Para DOCTYPE To Field,Al campo To PR Date,Conocer PR @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,Para restringir un usuario de un rol de particular a documentos que sÃģlo son de creaciÃģn propia. "To set user roles, just go to Setup > Users and click on the user to assign roles.","Para definir funciones de usuario, basta con ir a ConfiguraciÃģn> Usuarios y haga clic en el usuario para asignar roles." To track any installation or commissioning related work after sales,Para el seguimiento de cualquier instalaciÃģn o puesta en servicio despuÃĐs de la venta relacionados -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Para realizar el seguimiento de marca en los siguientes documentos
Nota de Entrega, Enuiry, solicitud de compra del artículo, orden de compra, comprobantes de compra, el recibo de compra, cotizaciÃģn, factura de venta, lista de materiales de ventas, pedidos de venta, Serial No" +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Para realizar el seguimiento de marca en los siguientes documentos
Nota de Entrega, Enuiry, solicitud de materiales, artículos, orden de compra, comprobantes de compra, el recibo de compra, cotizaciÃģn, factura de venta, lista de materiales de ventas, pedidos de venta, Serial No" To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para realizar el seguimiento elemento en documentos de ventas y compras en base a sus nÚmeros de serie. Esto tambiÃĐn se puede utilizar para rastrear detalles de la garantía del producto. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,"Para el seguimiento de los elementos de documentos de ventas y compras con los nÚmeros de lote
Industria de Preferencia: Productos químicos, etc" To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para el seguimiento de elementos mediante cÃģdigo de barras. Usted serÃĄ capaz de entrar en los elementos de albarÃĄn y factura de venta mediante el escaneo de cÃģdigo de barras del artículo. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,Seguir este Factura en contra de cu Track this Sales Order against any Project,Seguir este orden de venta en contra de cualquier proyecto Transaction,TransacciÃģn Transaction Date,Fecha de TransacciÃģn +Transfer,Transferir Transfer stock from one warehouse to another.,Traslado de stock de un almacÃĐn a otro. Transition Rules,Reglas de TransiciÃģn Transporter Info,Transportador Info @@ -2882,6 +2918,7 @@ URL,URL Unable to complete request: ,No se puede completar la solicitud: Under AMC,Bajo AMC Under Graduate,En virtud de Postgrado +Under Section,Bajo la SecciÃģn Under Warranty,En garantía Unit of Measure,Unidad de medida "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unidad de medida de este artículo (Kg por ejemplo, Unidad, No, par)." @@ -2966,6 +3003,7 @@ Warehouse Type,DepÃģsito de tipo Warehouse User,AlmacÃĐn del usuario Warehouse Users,Usuarios AlmacÃĐn Warehouse where you are maintaining stock of rejected items,AlmacÃĐn donde usted estÃĄ manteniendo un balance de los artículos rechazados +Warehouse-wise Item Reorder,Warehouse-sabio artículo reorden Warn,Advertir Warning,Advertencia Warranty / AMC Details,Garantía / AMC Detalles @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,Puede crear mÃĄ You can enter any date manually,Puede introducir cualquier fecha manualmente You can enter the minimum quantity of this item to be ordered.,Puede introducir la cantidad mínima de este artículo para ser ordenado. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,Usted puede hacer una nota de entrega de los pedidos de ventas mÚltiples. Seleccione las Ãģrdenes de venta de uno en uno y haga clic en el botÃģn de abajo. -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,Usted puede hacer una orden de compra de varias Ordenes de Compra. Seleccione Ordenes de Compra uno por uno y haga clic en el botÃģn de abajo. +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,Usted puede hacer una orden de compra de solicitudes de materiales mÚltiples. Seleccione solicitudes de material de uno en uno y haga clic en el botÃģn de abajo. You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,Usted puede hacer una orden de compra de cotizaciones de proveedores mÚltiples. Seleccione Citas Proveedor de uno en uno y haga clic en el botÃģn de abajo. You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,Usted puede hacer un recibo de compra a partir de Ãģrdenes de compra mÚltiples. Seleccione las Ãģrdenes de compra de uno en uno y haga clic en el botÃģn de abajo. You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,Puede establecer varias "propiedades" a los usuarios configurar los valores por defecto y aplicar reglas de permisos basados ​​en el valor de estas propiedades en diversas formas. You can use Customize Form to set levels on fields.,Puede utilizar Personalizar formulario para establecer los niveles en los campos. -You cannot apply for a leave on the following date because it is blocked,Usted no puede solicitar una licencia en la siguiente fecha porque estÃĄ bloqueado Your Customer's TAX registration numbers (if applicable) or any general information,De sus clientes nÚmeros impuesto de matriculaciÃģn (si es aplicable) o cualquier otra informaciÃģn de carÃĄcter general "Your download is being built, this may take a few moments...","Su descarga se estÃĄ construyendo, esto puede tardar unos minutos ..." Your letter head content in HTML.,Su carta de contenido cabeza en HTML. @@ -3231,6 +3268,7 @@ tag,etiqueta tags,etiquetas "target = ""_blank""",target = "_blank" tasks,tareas +test,prueba text-height,texto de altura text-width,texto de ancho th,Š diff --git a/translations/fr.csv b/translations/fr.csv index eb6fa03aad3..3a1b67da61c 100644 --- a/translations/fr.csv +++ b/translations/fr.csv @@ -1,5 +1,5 @@ , - Reason: ,Raison: + (Half Day),(Demi-journÃĐe) against same operation,contre une mÊme opÃĐration by Role ,par rÃīle cannot be 0,ne peut pas Être ÃĐgal à 0 @@ -157,6 +157,7 @@ Activity Log,Journal d'activitÃĐ Activity Name,Nom de l'activitÃĐ Activity Type,Type d'activitÃĐ Actual,RÃĐel +Actual Amount,Montant rÃĐel Actual Budget,Budget RÃĐel Actual Completion Date,Date d'achÃĻvement rÃĐelle Actual Date,Date RÃĐelle @@ -236,17 +237,13 @@ Against Voucher Type,Contre Type de Bon Agent,Agent "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Groupe global de ** ** Articles dans un autre article **. ** Ceci est utile si vous mettez en place un certains articles ** ** dans un paquet et vous maintenir le stock des articles emballÃĐs ** ** et non pas le total ** Article **. Le paquet ** ** Point aura ÂŦEst Produit en stock" comme "No" et "Est Point de vente" que "Oui" Par exemple:. Si vous vendez des ordinateurs portables et sacs à dos sÃĐparÃĐment et un prix spÃĐcial si le client achÃĻte à la fois , puis l'ordinateur portable Sac à dos + sera une nouvelle nomenclature des ventes Item.Note: BOM = Bill of Materials" Aging Date,Vieillissement Date -All Active Leads,Tous les prospects actifs All Addresses.,Toutes les adresses. -All Blog Subscribers,Tous les abonnÃĐs Blog All Contact,Tout contact -All Contacts,Tous les contacts All Contacts.,Tous les contacts. All Customer Contact,Tout contact avec la clientÃĻle -All Customer Contacts,Tous les contacts clients +All Day,Toute la journÃĐe All Employee (Active),Tous les employÃĐs (Actif) All Lead (Open),Tous plomb (Ouvert) -All Leads,Tous les fils All Products or Services.,Tous les produits ou services. All Sales Partner Contact,Tout contact Sales Partner All Sales Person,Tout Sales Person @@ -436,7 +433,6 @@ Budget Details,DÃĐtails du budget Budget Distribution,RÃĐpartition du budget Budget Distribution Detail,DÃĐtail RÃĐpartition du budget Budget Distribution Details,DÃĐtails de la rÃĐpartition du budget -Build Report,Rapport construire Bulk Email,Bulk Email Bulk Email records.,Bulk Email enregistrements. Bundle items at time of sale.,Regrouper des envois au moment de la vente. @@ -465,6 +461,7 @@ Calculate Tax,Calculer l'impÃīt sur Calculate Taxes and Charges,Calculer les impÃīts et charges Calculate Total Score,Calculer Score total Calendar,Calendrier +Calendar Events,Calendrier des ÃĐvÃĐnements Call,Appeler Campaign,Campagne Campaign Name,Nom de la campagne @@ -601,6 +598,7 @@ Contact Name,Contact Nom Contact No,Contact Aucune Contact No.,Contactez No. Contact Person,Personne à contacter +Contact Type,Type de contact Contact Us Settings,Contactez-nous RÃĐglages Contact in Future,Contactez dans l'avenir "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","Options de contact, comme "RequÊte ventes, du support requÊte" etc chacun sur une nouvelle ligne ou sÃĐparÃĐes par des virgules." @@ -664,6 +662,7 @@ Current Value,Valeur actuelle Current status,Situation actuelle Cust/Supp Address,Cust / Supp Adresse Cust/Supp Name,Cust / Supp Nom +Custom,Coutume Custom Autoreply Message,Message personnalisÃĐ Autoreply Custom CSS,CSS personnalisÃĐ Custom Field,Champ personnalisÃĐ @@ -879,6 +878,7 @@ Editable,Editable Educational Qualification,Qualification pour l'ÃĐducation Educational Qualification Details,DÃĐtails de qualification d'enseignement Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi +Eligible Amount,Montant admissible Email,Email Email (By company),Email (par entreprise) Email Digest,Email Digest @@ -927,6 +927,7 @@ Encashment Date,Date de l'encaissement End Date,Date de fin End date of current invoice's period,Date de fin de la pÃĐriode de facturation en cours End of Life,Fin de vie +Ends on,Se termine le Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,Entrez Id email pour recevoir Rapport d'erreur envoyÃĐ par users.Eg: support@iwebnotes.com Enter Form Type,Entrez le type de formulaire Enter Row,Entrez Row @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,Les insc Error,Erreur Estimated Material Cost,CoÃŧt des matiÃĻres premiÃĻres estimÃĐe Event,ÉvÃĐnement -Event Date,Date de l'ÃĐvÃĐnement Event Individuals,Les individus de l'ÃĐvÃĐnement -Event Name,Nom de l'ÃĐvÃĐnement Event Role,RÃīle de l'ÃĐvÃĐnement Event Roles,RÃīles de l'ÃĐvÃĐnement -Event Time,Heure de l'ÃĐvÃĐnement Event Type,Type d'ÃĐvÃĐnement Event Updates,Mises à jour de l'ÃĐvÃĐnement Event User,L'utilisateur d'Event @@ -1046,6 +1044,7 @@ Fixed Asset Account,Compte des immobilisations Float,Flotter Float Precision,Flotteur de prÃĐcision Floral,Floral +Following dates are blocked for Leave,Dates suivantes sont bloquÃĐes pendant le congÃĐ "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",Le tableau suivant indique les valeurs si les articles sont en sous - traitance. Ces valeurs seront extraites de la maÃŪtrise de la ÂŦBill of Materials" de sous - traitance articles. Font,Fonte Font Size,Taille de la police @@ -1073,6 +1072,7 @@ For ranges,Pour les plages For reference,Pour rÃĐfÃĐrence For reference only.,À titre de rÃĐfÃĐrence seulement. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commoditÃĐ des clients, ces codes peuvent Être utilisÃĐs dans des formats d'impression comme les factures et les bons de livraison" +Form,Forme Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,Format: hh: mm Exemple pour une heure fixÃĐe d'expiration 01:00. Max expiration sera de 72 heures. DÃĐfaut est 24 heures Forum,Forum Fraction,Fraction @@ -1089,7 +1089,9 @@ From PR Date,De PR Date From Package No.,De Ensemble numÃĐro From Table,D'aprÃĻs le tableau Frozen,Frozen +Full Image,L'image complÃĻte Full Name,Nom et PrÃĐnom +Full description (formatted as markdown),Description complÃĻte (format markdown) Fully Billed,EntiÃĻrement FacturÃĐ Fully Completed,EntiÃĻrement complÃĐtÃĐ GL Control,GL contrÃīle @@ -1104,7 +1106,7 @@ Gender,Sexe General,GÃĐnÃĐral General Ledger,General Ledger Generate Description HTML,GÃĐnÃĐrer HTML Description -Generate Purchase Requests (MRP) and Production Orders.,GÃĐnÃĐrer Demande d'Achat (MRP) et de la procÃĐdure de production. +Generate Material Requests (MRP) and Production Orders.,Lieu à des demandes de matÃĐriel (MRP) et de la procÃĐdure de production. Generate Salary Slips,GÃĐnÃĐrer les bulletins de salaire Generate Schedule,GÃĐnÃĐrer annexe "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","GÃĐnÃĐrer des bordereaux d'emballage pour les colis à livrer. UtilisÃĐ pour avertir le numÃĐro du colis, contenu du paquet et son poids." @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,Ignorer Image,Image Image View,Voir l'image +Image for listing (Width: 100px) (Attach First),Image de l'inscription (Largeur: 100px) (Joindre en premier) +Image for listing (Width: 300px) (Attach First),Image de l'inscription (Largeur: 300px) (Joindre en premier) Implementation Partner,Partenaire de mise en œuvre Import,Importer Import Date Format ,Format de la date d'importation @@ -1391,6 +1395,7 @@ Item Name,Nom d'article Item Price,Prix ​​de l'article Item Prices,Prix ​​du lot Item Quality Inspection Parameter,ParamÃĻtre d'inspection Article de qualitÃĐ +Item Reorder,RÃĐorganiser article Item Serial No,Point No de sÃĐrie Item Serial Nos,Point n ° de sÃĐrie Item Supplier,Fournisseur d'article @@ -1470,15 +1475,24 @@ Lead Lost,Conduire perdu Lead Name,Nom du chef de Lead Owner,Conduire du propriÃĐtaire Lead Ref,Le plomb RÃĐf +Lead Source,Source plomb +Lead Status,Lead Etat Lead Time Date,Plomb Date Heure Lead Time Days,Diriger jours Temps -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,Diriger jours Temps est le nombre de jours dont cet article est prÃĐvu dans votre entrepÃīt. Ces jours sont rÃĐcupÃĐrÃĐes dans la demande d'achat lorsque vous sÃĐlectionnez cette option. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Diriger jours Temps est le nombre de jours dont cet article est prÃĐvu dans votre entrepÃīt. Ces jours sont rÃĐcupÃĐrÃĐes dans la Demande de MatÃĐriel quand vous sÃĐlectionnez cette option. Lead Type,Type de cÃĒbles Leave Allocation,Laisser Allocation Leave Allocation Tool,Laisser outil de rÃĐpartition Leave Application,Demande de congÃĐs Leave Approver,Laisser approbateur Leave Balance Before Application,Laisser Solde Avant d'application +Leave Block List,Laisser Block List +Leave Block List Allow,Laisser Block List Autoriser +Leave Block List Allowed,Laisser Block List admis +Leave Block List Date,Laisser Date de Block List +Leave Block List Dates,Laisser Dates de listes rouges d' +Leave Block List Name,Laisser Nom de la liste de blocage +Leave Blocked,Laisser BloquÃĐ Leave Control Panel,Laisser le Panneau de configuration Leave Encashed?,Laisser encaissÃĐs? Leave Encashment Amount,Laisser Montant Encaissement @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,Laisser vide si cela est jugÃĐ pou Leave blank if considered for all designations,Laisser vide si cela est jugÃĐ pour toutes les dÃĐsignations Leave blank if considered for all employee types,Laisser vide si cela est jugÃĐ pour tous les types d'employÃĐs Leave blank if considered for all grades,Laisser vide si cela est jugÃĐ pour tous les grades +Leave by,Sortez par "Leave can be approved by users with Role, ""Leave Approver""",Le congÃĐ peut Être approuvÃĐes par les utilisateurs avec le rÃīle ÂŦLaissez approbateur" Ledger,Grand livre Left,Gauche @@ -1525,12 +1540,14 @@ Login Before,Connexion Avant Login Id,Connexion Id Login Page,Page de connexion Logout,DÃĐconnexion +Long Description,Description longue Long Text,Texte long Lost Reason,Raison perdu Low,Bas Lower Income,Basse revenu Lucida Grande,Lucida Grande MIS Control,MIS contrÃīle +MREQ,MREQ MTN Details,DÃĐtails MTN Mail Footer,Pied de messagerie Mail Password,Mail Mot de passe @@ -1591,6 +1608,14 @@ Match Id,ID match Match non-linked Invoices and Payments.,Correspondre non liÃĐes factures et paiements. Material Issue,Material Issue Material Receipt,RÃĐception matÃĐriau +Material Request,Demande de matÃĐriel +Material Request Date,Date de demande de matÃĐriel +Material Request Detail No,DÃĐtail Demande Support Aucun +Material Request For Warehouse,Demande de matÃĐriel pour l'entrepÃīt +Material Request Item,Article demande de matÃĐriel +Material Request Items,Articles Demande de matÃĐriel +Material Request No,Demande de Support Aucun +Material Request Type,Type de demande de matÃĐriel Material Transfer,De transfert de matÃĐriel Materials,MatÃĐriels Materials Required (Exploded),MatÃĐriel nÃĐcessaire (ÃĐclatÃĐe) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),Planification des besoins matiÃĻres (MRP) Max Attachments,Attachments Max Max Days Leave Allowed,Laisser jours Max admis Max Discount (%),Max RÃĐduction (%) +Max. Limit,Max. Limiter "Meaning of Submit, Cancel, Amend","Signification de soumettre, annuler, de modifier" Medium,Moyen Merge,Fusionner @@ -1676,14 +1702,15 @@ New Communications,Communications Nouveau- New Delivery Notes,Nouveaux bons de livraison New Enquiries,New Renseignements New Leads,New Leads +New Leave Application,Nouvelle demande d'autorisation New Leaves Allocated,Nouvelle Feuilles allouÃĐ New Leaves Allocated (In Days),Feuilles de nouveaux allouÃĐs (en jours) +New Material Requests,Demandes des matÃĐriaux nouveaux New Name,Nouveau nom New Password,Nouveau mot de passe New Projects,Nouveaux projets New Purchase Orders,De nouvelles commandes New Purchase Receipts,Reçus d'achat de nouveaux -New Purchase Requests,Demande d'Achat de nouveaux New Quotations,Citations de nouvelles New Record,Nouveau record New Sales Orders,Nouvelles commandes clients @@ -1863,6 +1890,7 @@ Parent Territory,Territoire Parent Parenttype,ParentType Partially Completed,Partiellement rÃĐalisÃĐ Participants,Les participants +Particulars,CoordonnÃĐes Partly Billed,PrÃĐsentÃĐe en partie Partly Delivered,LivrÃĐ en partie Partner,Partenaire @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc DocType Prevdoc Doctype,Prevdoc Doctype Preview,Avant-premiÃĻre Previous Work Experience,L'expÃĐrience de travail antÃĐrieure +Price,Prix Price List,Liste des Prix Price List Currency,Devise Prix Price List Currency Conversion Rate,Liste de prix de conversion de devises Taux @@ -2067,14 +2096,6 @@ Purchase Receipt Items,Acheter des articles reçus Purchase Receipt Message,Achat message de rÃĐception Purchase Receipt No,Achetez un accusÃĐ de rÃĐception Purchase Receipt Required,RÃĐception achat requis -Purchase Request,Demande d'achat -Purchase Request Date,Date d'achat Demande d' -Purchase Request Detail No,Achetez DÃĐtail demande no -Purchase Request For Warehouse,Demande d'achat pour l'entrepÃīt -Purchase Request Item,Achetez article Demande d' -Purchase Request No,Achat Demande Non -Purchase Requisition Details,Achat dÃĐtails de rÃĐquisition -Purchase Requisition No,Aucune demande d'achat Purchase Return,Achat de retour Purchase Returned,Achetez retour Purchase Returns,Retours d'achat @@ -2122,9 +2143,9 @@ Quotation To,Devis Pour Quotation no against which this Sales Order is made ,Devis pas contre lequel cette commande effective Quotes to Leads or Customers.,Citations à prospects ou clients. Raise Exception,Soulever Exception +Raise Material Request,Soulever la Demande de MatÃĐriel +Raise Material Request when stock reaches re-order level,Soulever demande de matÃĐriel lorsque le stock atteint le niveau de rÃĐapprovisionnement Raise Production Order,Soulever des ordres de fabrication -Raise Purchase Request,Soulever la demande d'achat -Raise Purchase Request when stock reaches re-order level,Soulever Demande d'achat lorsque le stock atteint le niveau de rÃĐapprovisionnement Raised By,Raised By Raised By (Email),Raised By (e-mail) Random,AlÃĐatoire @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,CoÃŧt des matiÃĻres premiÃĻres fournies Re-Calculate Values,Re-calculer les valeurs Re-Order Level,Re-Order niveau Re-Order Qty,Re-Cdt +Re-order,Re-order +Re-order Level,Re-order niveau +Re-order Qty,Re-order QuantitÃĐ Read,Lire Read Only,Lecture seule Reading 1,Lecture 1 @@ -2261,6 +2285,8 @@ Right,Droit Role,RÃīle Role Name,RÃīle Nom Roles,RÃīles +Roles Assigned,Les rÃīles assignÃĐs +Roles Assigned To User,RÃīles assignÃĐs à l'utilisateur Roles HTML,RÃīles HTML Rounded Total,Totale arrondie Rounded Total (Export),Totale arrondie (Exportation) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,SÃĐlectionner les ÃĐlÃĐments de la note de livra Select Items from Purchase Order,SÃĐlectionner les ÃĐlÃĐments de commande Select Items from Purchase Receipt,SÃĐlectionner les ÃĐlÃĐments du reçu d'achat Select Items from Sales Order,SÃĐlectionnez les objets à partir des commandes clients +Select Material Request,SÃĐlectionnez Demande de MatÃĐriel Select PR,SÃĐlectionnez PR +Select Price List for the web. Leave blank to hide price.,SÃĐlectionnez Liste de prix pour le web. Laissez vide pour cacher prix. Select Print Format,SÃĐlectionnez Format d'impression Select Print Heading,SÃĐlectionnez Imprimer Cap -Select Purchase Request,SÃĐlectionnez la demande d'achat Select Report Name,SÃĐlectionner Nom du rapport Select Role,SÃĐlectionnez rÃīle Select Sales Orders,SÃĐlectionnez les commandes clients @@ -2423,7 +2450,10 @@ Select Type,SÃĐlectionnez le type de Select User or Property to start.,SÃĐlectionnez l'utilisateur ou d'un bien pour commencer. Select account head of the bank where cheque was deposited.,SÃĐlectionnez tÊte compte de la banque oÃđ chÃĻque a ÃĐtÃĐ dÃĐposÃĐ. Select company name first.,SÃĐlectionnez le nom de la premiÃĻre entreprise. +Select dates to create a new ,Choisissez la date pour crÃĐer une nouvelle Select name of Customer to whom project belongs,SÃĐlectionnez le nom du client à qui appartient projet +Select or drag across dates to create a new event.,SÃĐlectionnez ou faites glisser sur les dates de crÃĐer un nouvel ÃĐvÃĐnement. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank","SÃĐlectionnez entrepÃīt d'expÃĐdition pour voir "En stock" ou "Out of Stock". Pour masquer, laissez en blanc" Select template from which you want to get the Goals,SÃĐlectionnez le modÃĻle à partir duquel vous souhaitez obtenir des Objectifs Select the Employee for whom you are creating the Appraisal.,SÃĐlectionnez l'employÃĐ pour lequel vous crÃĐez l'ÃĐvaluation. Select the currency in which price list is maintained,SÃĐlectionnez la devise dans laquelle la liste de prix est maintenue @@ -2445,10 +2475,12 @@ Send,Envoyer Send Autoreply,Envoyer Autoreply Send Email,Envoyer un email Send From,Envoyer partir de +Send Invite Email,Envoyer une invitation e-mail Send Me A Copy,Envoyez-moi une copie "Send Newsletters to your contacts, leads.","Envoyer des newsletters à vos contacts, entraÃŪne." Send SMS,Envoyer un SMS Send To,Send To +Send To Type,Envoyer à taper "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.",Envoyer un e-mail aux utilisateurs de "Gestionnaire de matÃĐriauxÂŦ rÃīle et la ÂŦPurchase Manager" quand la re-commande de niveau est franchi. Send automatic emails to Contacts on Submitting transactions.,Envoyer des emails automatiques vers les Contacts sur Envoi transactions. "Send bulk SMS to leads, customers, contacts","Envoyer un SMS en vrac de prospects, clients, contacts" @@ -2515,6 +2547,7 @@ Ship To,ExpÃĐdier à Shipping Address,Adresse de livraison Shipping Address Name,Adresse de livraison Nom Shipping Details,DÃĐtails d'Envoi +Short Description,Description courte Short biography for website and other publications.,Courte biographie pour le site Web et d'autres publications. Shortcut,Raccourci "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Voir "En stock" ou "Pas en stockÂŧ basÃĐe sur le stock disponible dans cet entrepÃīt. @@ -2563,6 +2596,7 @@ Standard Rate,Prix ​​Standard Start Date,Date de dÃĐbut Start Report For,DÃĐmarrer Rapport pour Start date of current invoice's period,Date de dÃĐbut de la pÃĐriode de facturation en cours +Starts on,Commence le Startup,DÃĐmarrage State,État State Name,Nom de l'État @@ -2712,6 +2746,7 @@ Test Data,Des donnÃĐes de test Test Date,Date du test Test Email Id,Id Test Email Test Link,Test Link +Test Runner,Test Runner Test Select,Test SÃĐlectionnez Test Text,Texte de test Test the Newsletter,Testez la Newsletter @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,Le nom de votre entreprise / site que vous souhaitez voir apparaÃŪtre sur la barre de titre du navigateur. Toutes les pages auront ce que le prÃĐfixe du titre. The net weight of this package. (calculated automatically as sum of net weight of items),Le poids net de ce paquet. (CalculÃĐ automatiquement comme la somme du poids net des articles) The new BOM after replacement,La nouvelle nomenclature aprÃĻs le remplacement -The quantity for the Purchase Request when the stock goes below re-order level.,La quantitÃĐ de la demande d'achat lorsque le stock passe en dessous de re-commander niveau. The rate at which Bill Currency is converted into company's base currency,La vitesse à laquelle le projet de loi Monnaie est convertie en monnaie de base entreprise "The system provides pre-defined roles, but you can add new roles to set finer permissions","Le systÃĻme fournit des rÃīles prÃĐdÃĐfinis, mais vous pouvez ajouter de nouveaux rÃīles pour dÃĐfinir des autorisations plus fines" -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",Le systÃĻme va gÃĐnÃĐrer une demande d'achat automatiquement lorsque quantitÃĐ en stock descend en dessous de re-commander niveau dans l'entrepÃīt de type ÂŦmagasinsÂŧ ou ÂŦentrepÃīt rÃĐservÃĐÂŧ. The unique id for tracking all recurring invoices. It is generated on submit.,L'identifiant unique pour le suivi de toutes les factures rÃĐcurrentes. Il est gÃĐnÃĐrÃĐ sur soumettre. Theme,ThÃĻme Then By (optional),Puis par (facultatif) @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,Il s'agi This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Cet outil vous permet de mettre à jour ou corriger la quantitÃĐ et la valorisation de stock dans le systÃĻme. Il est gÃĐnÃĐralement utilisÃĐ pour synchroniser les valeurs du systÃĻme et ce qui existe rÃĐellement dans vos entrepÃīts. This will be used for setting rule in HR module,Il sera utilisÃĐ pour la rÃĻgle de rÃĐglage dans le module RH Thread HTML,Discussion HTML +Thumbnail Image,Vignette Thursday,Jeudi Time,Temps Time Zone,Fuseau horaire @@ -2777,6 +2811,7 @@ To,À To Date,À ce jour To Discuss,Pour discuter To Do,To Do +To Do List,To Do List To DocType,Pour DOCTYPE To Field,Pour le terrain To PR Date,Date de PR @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,Pour limiter un utilisateur d'un rÃīle particulier aux documents qui ne sont auto-crÃĐÃĐ. "To set user roles, just go to Setup > Users and click on the user to assign roles.","Pour dÃĐfinir les rÃīles des utilisateurs, allez à Configuration> Utilisateurs et cliquez sur l'utilisateur d'attribuer des rÃīles." To track any installation or commissioning related work after sales,Pour suivre toute installation ou mise en service aprÃĻs-vente des travaux connexes -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Pour suivre la marque dans les documents suivants
Remarque livraison, Enuiry, demande d'achat, article, bon de commande, bon d'achat, facture de l'acheteur, devis, facture de vente, BOM des ventes, des commandes clients, N ° de sÃĐrie" +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Pour suivre la marque dans les documents suivants
Remarque livraison, Enuiry, Demande de MatÃĐriel, article, bon de commande, bon d'achat, facture de l'acheteur, devis, facture de vente, BOM des ventes, des commandes clients, N ° de sÃĐrie" To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Pour suivre piÃĻce documents de vente et d'achat en fonction de leurs numÃĐros de sÃĐrie. Ce n'est peut ÃĐgalement Être utilisÃĐ pour suivre les dÃĐtails de la garantie du produit. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,"Pour suivre les articles de chiffre d'affaires et des documents d'achat avec nos lots
Industrie prÃĐfÃĐrÃĐ: produits chimiques, etc" To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pour suivre les ÃĐlÃĐments à l'aide de code à barres. Vous serez en mesure d'entrer dans les articles bon de livraison et la facture de vente par balayage de code à barres de l'article. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,Suivre ce facture de vente contre t Track this Sales Order against any Project,Suivre ce dÃĐcret ventes contre tout projet Transaction,Transaction Transaction Date,Date de la transaction +Transfer,TransfÃĐrer Transfer stock from one warehouse to another.,Transfert de stocks d'un entrepÃīt à un autre. Transition Rules,RÃĻgles de transition Transporter Info,Infos Transporter @@ -2882,6 +2918,7 @@ URL,URL Unable to complete request: ,Impossible de terminer la requÊte: Under AMC,En vertu de l'AMC Under Graduate,Sous Graduate +Under Section,ConformÃĐment à l'article Under Warranty,Sous garantie Unit of Measure,UnitÃĐ de mesure "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","UnitÃĐ de mesure de cet article (Kg par exemple, unitÃĐ, Non, Pair)." @@ -2966,6 +3003,7 @@ Warehouse Type,Type d'entrepÃīt Warehouse User,L'utilisateur d'entrepÃīt Warehouse Users,Les utilisateurs d'entrepÃīt Warehouse where you are maintaining stock of rejected items,EntrepÃīt oÃđ vous Êtes maintenant le bilan des ÃĐlÃĐments rejetÃĐs +Warehouse-wise Item Reorder,Warehouse-sage RÃĐorganiser article Warn,Avertir Warning,Avertissement Warranty / AMC Details,Garantie / AMC DÃĐtails @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,Vous pouvez cr You can enter any date manually,Vous pouvez entrer une date manuellement You can enter the minimum quantity of this item to be ordered.,Vous pouvez entrer la quantitÃĐ minimale de cet ÃĐlÃĐment à commander. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,"Vous pouvez faire un bon de livraison de commandes de ventes multiples. SÃĐlectionnez les ordres de vente, un par un et cliquez sur le bouton ci-dessous." -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,Vous pouvez faire une commande à partir de demandes d'achat multiples. SÃĐlectionnez Demande d'Achat un par un et cliquez sur le bouton ci-dessous. +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,"Vous pouvez faire un bon de commande de matÃĐriel demandes multiples. SÃĐlectionnez demandes de matÃĐriel, un par un et cliquez sur le bouton ci-dessous." You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,Vous pouvez faire une commande de citations multiples fournisseurs. SÃĐlectionnez Citations fournisseurs un par un et cliquez sur le bouton ci-dessous. You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,Vous pouvez faire une facture d'achat de plusieurs bons de commande. SÃĐlectionnez les commandes une par une et cliquez sur le bouton ci-dessous. You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,Vous pouvez dÃĐfinir plusieurs ÂŦpropriÃĐtÃĐsÂŧ aux utilisateurs de dÃĐfinir des valeurs par dÃĐfaut et d'appliquer des rÃĻgles d'autorisation sur la base de la valeur de ces propriÃĐtÃĐs sous diverses formes. You can use Customize Form to set levels on fields.,Vous pouvez utiliser Personnaliser le formulaire de fixer des niveaux de champs. -You cannot apply for a leave on the following date because it is blocked,Vous ne pouvez pas demander un congÃĐ Ã  la date suivante car il est bloquÃĐ Your Customer's TAX registration numbers (if applicable) or any general information,Votre Client numÃĐros d'immatriculation fiscale (le cas ÃĐchÃĐant) ou toute autre information gÃĐnÃĐrale "Your download is being built, this may take a few moments...","Votre tÃĐlÃĐchargement est en cours de construction, ce qui peut prendre quelques instants ..." Your letter head content in HTML.,Votre contenu tÊte lettre en HTML. @@ -3231,6 +3268,7 @@ tag,balise tags,balises "target = ""_blank""",target = "_blank" tasks,tÃĒches +test,test text-height,Texte-hauteur text-width,Texte de largeur th,e diff --git a/translations/hi.csv b/translations/hi.csv index eeb15abd0dd..91492dd1862 100644 --- a/translations/hi.csv +++ b/translations/hi.csv @@ -1,5 +1,5 @@ , - Reason: ,āĪ•āĪūāĪ°āĪĢ: + (Half Day),(āĪ†āĪ§āĨ‡ āĪĶāĪŋāĪĻ) against same operation,āĪāĪ• āĪđāĨ€ āĪ†āĪŠāĪ°āĨ‡āĪķāĪĻ āĪ•āĨ‡ āĪ–āĪŋāĪēāĪūāĪŦ by Role ,āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū āĪĶāĨāĪĩāĪūāĪ°āĪū cannot be 0,0 āĪĻāĪđāĨ€āĪ‚ āĪđāĨ‹ āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚ @@ -157,6 +157,7 @@ Activity Log,āĪ—āĪĪāĪŋāĪĩāĪŋāĪ§āĪŋ āĪēāĨ‰āĪ— Activity Name,āĪ—āĪĪāĪŋāĪĩāĪŋāĪ§āĪŋ āĪĻāĪūāĪŪ Activity Type,āĪ—āĪĪāĪŋāĪĩāĪŋāĪ§āĪŋ āĪŠāĨāĪ°āĪ•āĪūāĪ° Actual,āĪĩāĪūāĪļāĨāĪĪāĪĩāĪŋāĪ• +Actual Amount,āĪĩāĪūāĪļāĨāĪĪāĪĩāĪŋāĪ• āĪ°āĪūāĪķāĪŋ Actual Budget,āĪĩāĪūāĪļāĨāĪĪāĪĩāĪŋāĪ• āĪŽāĪœāĪŸ Actual Completion Date,āĪĩāĪūāĪļāĨāĪĪāĪĩāĪŋāĪ• āĪŠāĨ‚āĪ°āĪū āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ€ āĪĪāĪŋāĪĨāĪŋ Actual Date,āĪĩāĪūāĪļāĨāĪĪāĪĩāĪŋāĪ• āĪĪāĪūāĪ°āĨ€āĪ– @@ -236,17 +237,13 @@ Against Voucher Type,āĪĩāĪūāĪ‰āĪšāĪ° āĪŠāĨāĪ°āĪ•āĪūāĪ° āĪ•āĨ‡ āĪ–āĪŋāĪēāĪūāĪŦ Agent,āĪāĪœāĨ‡āĪ‚āĪŸ "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","** āĪ†āĪ‡āĪŸāĪŪ āĪ•āĨ‡ āĪļāĪ•āĪē āĪļāĪŪāĨ‚āĪđ āĪŪāĨ‡āĪ‚ āĪāĪ• āĪ”āĪ° āĪ†āĪ‡āĪŸāĪŪ ** **. āĪŊāĪđ āĪ‰āĪŠāĪŊāĨ‹āĪ—āĨ€ āĪđāĨˆ āĪ…āĪ—āĪ° āĪ†āĪŠ āĪāĪ• āĪŠāĨˆāĪ•āĨ‡āĪœ āĪŪāĨ‡āĪ‚ ** āĪ•āĨāĪ› ** āĪ†āĪ‡āĪŸāĪŪ bundling āĪđāĨˆāĪ‚ āĪ”āĪ° āĪ†āĪŠ āĪŠāĨˆāĪ• ** āĪ”āĪ° āĪĻāĪđāĨ€āĪ‚ āĪ•āĨāĪē ** āĪ†āĪ‡āĪŸāĪŪ ** ** āĪ†āĪ‡āĪŸāĪŪ āĪ•āĨ‡ āĪļāĨāĪŸāĨ‰āĪ• āĪ•āĨ‹ āĪŽāĪĻāĪūāĪ āĪ°āĪ–āĪĻāĨ‡. āĪŠāĨˆāĪ•āĨ‡āĪœ ** āĪ†āĪ‡āĪŸāĪŪ ** āĪđāĨˆ "āĪļāĨāĪŸāĨ‰āĪ• āĪ†āĪ‡āĪŸāĪŪ āĪđāĨˆ" "āĪĻāĪđāĨ€āĪ‚" āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ āĪ”āĪ° āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ "āĪđāĪūāĪ" "āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ†āĪ‡āĪŸāĪŪ āĪđāĨˆ," āĪ‰āĪĶāĪūāĪđāĪ°āĪĢ āĪ•āĨ‡ āĪēāĪŋāĪ: āĪŊāĪĶāĪŋ āĪ†āĪŠ āĪēāĨˆāĪŠāĪŸāĨ‰āĪŠ āĪ”āĪ° Backpacks āĪŽāĨ‡āĪš āĪ°āĪđāĨ‡ āĪđāĨˆāĪ‚ āĪ”āĪ° āĪ…āĪēāĪ— āĪļāĨ‡ āĪāĪ• āĪĩāĪŋāĪķāĨ‡āĪ· āĪŪāĨ‚āĪēāĨāĪŊ āĪđāĨˆ āĪ…āĪ—āĪ° āĪ—āĨāĪ°āĪūāĪđāĪ• āĪĶāĨ‹āĪĻāĨ‹āĪ‚ āĪ–āĪ°āĨ€āĪĶāĪĪāĪū BOM = āĪĩāĪŋāĪ§āĨ‡āĪŊāĪ• āĪ•āĨ€ āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€:, āĪĪāĨ‹ āĪāĪ• āĪĻāĪŊāĪū āĪēāĨˆāĪŠāĪŸāĨ‰āĪŠ + āĪŽāĨˆāĪ— āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪŽāĨ€āĪ“āĪāĪŪ Item.Note āĪđāĨ‹āĪ—āĪū" Aging Date,āĪĪāĪŋāĪĨāĪŋ āĪāĪœāĪŋāĪ‚āĪ— -All Active Leads,āĪļāĪ­āĨ€ āĪļāĪ•āĨāĪ°āĪŋāĪŊ āĪļāĨāĪ°āĪūāĪ— All Addresses.,āĪļāĪ­āĨ€ āĪŠāĪĪāĨ‡. -All Blog Subscribers,āĪļāĪ­āĨ€ āĪŽāĨāĪēāĨ‰āĪ— āĪļāĪĶāĪļāĨāĪŊ All Contact,āĪļāĪ­āĨ€ āĪļāĪ‚āĪŠāĪ°āĨāĪ• -All Contacts,āĪļāĪ­āĨ€ āĪļāĪ‚āĪŠāĪ°āĨāĪ• All Contacts.,āĪļāĪ­āĨ€ āĪļāĪ‚āĪŠāĪ°āĨāĪ•. All Customer Contact,āĪļāĪ­āĨ€ āĪ—āĨāĪ°āĪūāĪđāĪ• āĪļāĪ‚āĪŠāĪ°āĨāĪ• -All Customer Contacts,āĪļāĪ­āĨ€ āĪ—āĨāĪ°āĪūāĪđāĪ• āĪļāĪ‚āĪŠāĪ°āĨāĪ• +All Day,āĪļāĪ­āĨ€ āĪĶāĪŋāĪĻ All Employee (Active),āĪļāĪ­āĨ€ āĪ•āĪ°āĨāĪŪāĪšāĪūāĪ°āĨ€ (āĪļāĪ•āĨāĪ°āĪŋāĪŊ) All Lead (Open),āĪļāĪ­āĨ€ āĪēāĨ€āĪĄ (āĪ“āĪŠāĪĻ) -All Leads,āĪļāĪ­āĨ€ āĪļāĨāĪ°āĪūāĪ— All Products or Services.,āĪļāĪ­āĨ€ āĪ‰āĪĪāĨāĪŠāĪūāĪĶāĨ‹āĪ‚ āĪŊāĪū āĪļāĨ‡āĪĩāĪūāĪ“āĪ‚. All Sales Partner Contact,āĪļāĪ­āĨ€ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪļāĪūāĪĨāĨ€ āĪļāĪ‚āĪŠāĪ°āĨāĪ• All Sales Person,āĪļāĪ­āĨ€ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪĩāĨāĪŊāĪ•āĨāĪĪāĪŋ @@ -436,7 +433,6 @@ Budget Details,āĪŽāĪœāĪŸ āĪĩāĪŋāĪĩāĪ°āĪĢ Budget Distribution,āĪŽāĪœāĪŸ āĪĩāĪŋāĪĪāĪ°āĪĢ Budget Distribution Detail,āĪŽāĪœāĪŸ āĪĩāĪŋāĪĪāĪ°āĪĢ āĪĩāĪŋāĪļāĨāĪĪāĪūāĪ° Budget Distribution Details,āĪŽāĪœāĪŸ āĪĩāĪŋāĪĪāĪ°āĪĢ āĪĩāĪŋāĪĩāĪ°āĪĢ -Build Report,āĪ°āĪŋāĪŠāĨ‹āĪ°āĨāĪŸ āĪŽāĪĻāĪūāĪāĪ Bulk Email,āĪĨāĨ‹āĪ• āĪˆāĪŪāĨ‡āĪē Bulk Email records.,āĪĨāĨ‹āĪ• āĪˆāĪŪāĨ‡āĪē āĪ°āĪŋāĪ•āĨ‰āĪ°āĨāĪĄ. Bundle items at time of sale.,āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ•āĨ‡ āĪļāĪŪāĪŊ āĪŪāĨ‡āĪ‚ āĪ†āĪ‡āĪŸāĪŪ āĪŽāĪ‚āĪĄāĪē. @@ -465,6 +461,7 @@ Calculate Tax,āĪ•āĪ° āĪ•āĨ€ āĪ—āĪĢāĪĻāĪū Calculate Taxes and Charges,āĪ•āĪ° āĪ”āĪ° āĪķāĨāĪēāĨāĪ• āĪ•āĨ€ āĪ—āĪĢāĪĻāĪū Calculate Total Score,āĪ•āĨāĪē āĪļāĨāĪ•āĨ‹āĪ° āĪ•āĨ€ āĪ—āĪĢāĪĻāĪū Calendar,āĪ•āĨˆāĪēāĨ‡āĪ‚āĪĄāĪ° +Calendar Events,āĪ•āĨˆāĪēāĨ‡āĪ‚āĪĄāĪ° āĪ˜āĪŸāĪĻāĪūāĪ“āĪ‚ Call,āĪ•āĨ‰āĪē Campaign,āĪ…āĪ­āĪŋāĪŊāĪūāĪĻ Campaign Name,āĪ…āĪ­āĪŋāĪŊāĪūāĪĻ āĪ•āĪū āĪĻāĪūāĪŪ @@ -601,6 +598,7 @@ Contact Name,āĪļāĪ‚āĪŠāĪ°āĨāĪ• āĪ•āĪū āĪĻāĪūāĪŪ Contact No,āĪ•āĨ‹āĪˆ āĪļāĪ‚āĪŠāĪ°āĨāĪ• āĪĻāĪđāĨ€āĪ‚ Contact No.,āĪļāĪ‚ āĪļāĪ‚āĪŠāĪ°āĨāĪ• Contact Person,āĪļāĪ‚āĪŠāĪ°āĨāĪ• āĪĩāĨāĪŊāĪ•āĨāĪĪāĪŋ +Contact Type,āĪļāĪ‚āĪŠāĪ°āĨāĪ• āĪŠāĨāĪ°āĪ•āĪūāĪ° Contact Us Settings,āĪđāĪŪāĪļāĨ‡ āĪļāĨ‡āĪŸāĪŋāĪ‚āĪ—āĨāĪļ āĪļāĪ‚āĪŠāĪ°āĨāĪ• Contact in Future,āĪ­āĪĩāĪŋāĪ·āĨāĪŊ āĪŪāĨ‡āĪ‚ āĪļāĪ‚āĪŠāĪ°āĨāĪ• "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","āĪļāĪ‚āĪŠāĪ°āĨāĪ• āĪĩāĪŋāĪ•āĪēāĨāĪŠ, āĪ†āĪĶāĪŋ āĪāĪ• āĪĻāĪˆ āĪēāĪūāĪ‡āĪĻ āĪŠāĪ° āĪŠāĨāĪ°āĪĪāĨāĪŊāĨ‡āĪ• "āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪŠāĨāĪ°āĪķāĨāĪĻ, āĪŠāĨāĪ°āĪķāĨāĪĻ āĪļāĪŪāĪ°āĨāĪĨāĪĻ" āĪ•āĨ‹āĪŪāĪū āĪļāĨ‡ āĪĩāĪŋāĪ­āĪūāĪœāĪŋāĪĪ." @@ -664,6 +662,7 @@ Current Value,āĪĩāĪ°āĨāĪĪāĪŪāĪūāĪĻ āĪŪāĪūāĪĻ Current status,āĪĩāĪ°āĨāĪĪāĪŪāĪūāĪĻ āĪļāĨāĪĨāĪŋāĪĪāĪŋ Cust/Supp Address,Cust / Supp āĪŠāĪĪāĪū Cust/Supp Name,Cust / Supp āĪĻāĪūāĪŪ +Custom,āĪ°āĪŋāĪĩāĪūāĪœ Custom Autoreply Message,āĪ•āĪļāĨāĪŸāĪŪ āĪļāĨāĪĩāĪĪāĪƒ āĪļāĪ‚āĪĶāĨ‡āĪķ Custom CSS,āĪ•āĪļāĨāĪŸāĪŪ āĪļāĨ€āĪāĪļāĪāĪļ Custom Field,āĪ•āĪļāĨāĪŸāĪŪ āĪŦāĪžāĨ€āĪēāĨāĪĄ @@ -879,6 +878,7 @@ Editable,āĪļāĪ‚āĪŠāĪūāĪĶāĪĻ Educational Qualification,āĪķāĨˆāĪ•āĨāĪ·āĪŋāĪ• āĪŊāĨ‹āĪ—āĨāĪŊāĪĪāĪū Educational Qualification Details,āĪķāĨˆāĪ•āĨāĪ·āĪŋāĪ• āĪŊāĨ‹āĪ—āĨāĪŊāĪĪāĪū āĪĩāĪŋāĪĩāĪ°āĪĢ Eg. smsgateway.com/api/send_sms.cgi,āĪ‰āĪĶāĪū. āĪāĪŠāĨ€āĪ†āĪˆ smsgateway.com / / send_sms.cgi +Eligible Amount,āĪŠāĪūāĪĪāĨāĪ°āĪĪāĪū āĪ°āĪūāĪķāĪŋ Email,āĪˆāĪŪāĨ‡āĪē Email (By company),āĪˆāĪŪāĨ‡āĪē (āĪ•āĪ‚āĪŠāĪĻāĨ€ āĪ•āĨ‡ āĪĶāĨāĪĩāĪūāĪ°āĪū) Email Digest,āĪˆāĪŪāĨ‡āĪē āĪĄāĪūāĪ‡āĪœāĨ‡āĪļāĨāĪŸ @@ -927,6 +927,7 @@ Encashment Date,āĪĻāĪ•āĪĶāĨ€āĪ•āĪ°āĪĢ āĪĪāĪŋāĪĨāĪŋ End Date,āĪļāĪŪāĪūāĪŠāĨāĪĪāĪŋ āĪĪāĪŋāĪĨāĪŋ End date of current invoice's period,āĪĩāĪ°āĨāĪĪāĪŪāĪūāĪĻ āĪšāĪūāĪēāĪūāĪĻ āĪ•āĨ€ āĪ…āĪĩāĪ§āĪŋ āĪ•āĨ€ āĪļāĪŪāĪūāĪŠāĨāĪĪāĪŋ āĪ•āĨ€ āĪĪāĪūāĪ°āĨ€āĪ– End of Life,āĪœāĨ€āĪĩāĪĻ āĪ•āĪū āĪ…āĪ‚āĪĪ +Ends on,āĪŠāĪ° āĪļāĪŪāĪūāĪŠāĨāĪĪ āĪđāĨ‹āĪĪāĪū āĪđāĨˆ Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,āĪˆāĪŪāĨ‡āĪē āĪ†āĪˆāĪĄāĨ€ āĪĶāĪ°āĨāĪœ āĪ•āĪ°āĨ‡āĪ‚ āĪĪāĨāĪ°āĨāĪŸāĪŋ users.Eg āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ­āĨ‡āĪœāĪū āĪŠāĨāĪ°āĪūāĪŠāĨāĪĪ āĪ°āĪŋāĪŠāĨ‹āĪ°āĨāĪŸ: support@iwebnotes.com Enter Form Type,āĪŠāĨāĪ°āĪŠāĪĪāĨāĪ° āĪŠāĨāĪ°āĪ•āĪūāĪ° āĪĶāĪ°āĨāĪœ āĪ•āĪ°āĨ‡āĪ‚ Enter Row,āĪŠāĪ‚āĪ•āĨāĪĪāĪŋ āĪĶāĪ°āĨāĪœ @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,"āĪŠāĨ Error,āĪĪāĨāĪ°āĨāĪŸāĪŋ Estimated Material Cost,āĪ…āĪĻāĨāĪŪāĪūāĪĻāĪŋāĪĪ āĪŪāĪŸāĨ‡āĪ°āĪŋāĪŊāĪē āĪ•āĨ‰āĪļāĨāĪŸ Event,āĪ˜āĪŸāĪĻāĪū -Event Date,āĪ˜āĪŸāĪĻāĪū āĪĪāĪŋāĪĨāĪŋ Event Individuals,āĪ˜āĪŸāĪĻāĪū āĪĩāĨāĪŊāĪ•āĨāĪĪāĪŋāĪŊāĨ‹āĪ‚ -Event Name,āĪ˜āĪŸāĪĻāĪū āĪĻāĪūāĪŪ Event Role,āĪ˜āĪŸāĪĻāĪū āĪ°āĨ‹āĪē Event Roles,āĪ˜āĪŸāĪĻāĪū āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ -Event Time,āĪˆāĪĩāĨ‡āĪ‚āĪŸ āĪļāĪŪāĪŊ Event Type,āĪ‡āĪĩāĨ‡āĪ‚āĪŸ āĪŠāĨāĪ°āĪ•āĪūāĪ° Event Updates,āĪ˜āĪŸāĪĻāĪū āĪ…āĪĶāĨāĪŊāĪĪāĪĻ Event User,āĪ‡āĪĩāĨ‡āĪ‚āĪŸ āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪ•āĨ‡ @@ -1046,6 +1044,7 @@ Fixed Asset Account,āĪŦāĪŋāĪ•āĨāĪļāĨāĪĄ āĪ†āĪļāĨāĪĪāĪŋ āĪ–āĪūāĪĪāĪū Float,āĪĻāĪūāĪĩ Float Precision,āĪŠāĨāĪ°āĨ‡āĪļāĪŋāĪœāĪĻ āĪŦāĨāĪēāĨ‹āĪŸ Floral,āĪŠāĨāĪ·āĨāĪŠ +Following dates are blocked for Leave,āĪĻāĪŋāĪŪāĨāĪĻ āĪĶāĪŋāĪĻāĪūāĪ‚āĪ• āĪ›āĨ‹āĪĄāĪžāĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ…āĪĩāĪ°āĨāĪĶāĨāĪ§ āĪ•āĪ° āĪ°āĪđāĨ‡ āĪđāĨˆāĪ‚ "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",āĪĪāĪūāĪēāĪŋāĪ•āĪū āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪŪāĨ‚āĪēāĨāĪŊāĨ‹āĪ‚ āĪ•āĨ‹ āĪĶāĪŋāĪ–āĪūāĪĻāĨ‡ āĪ…āĪ—āĪ° āĪ†āĪ‡āĪŸāĪŪ āĪ‰āĪŠ - āĪ…āĪĻāĨāĪŽāĪ‚āĪ§. āĪ…āĪĻāĨāĪŽāĪ‚āĪ§āĪŋāĪĪ āĪ†āĪ‡āĪŸāĪŪ - āĪ‡āĪĻ āĪŪāĨ‚āĪēāĨāĪŊāĨ‹āĪ‚ āĪ•āĨ‹ āĪ‰āĪŠ "āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ•āĨ‡ āĪĩāĪŋāĪ§āĨ‡āĪŊāĪ•" āĪ•āĨ‡ āĪŪāĪūāĪēāĪŋāĪ• āĪļāĨ‡ āĪĶāĪŋāĪēāĪĩāĪūāĪŊāĪū āĪœāĪūāĪāĪ—āĪū. Font,āĪŦāĨ‰āĪĻāĨāĪŸ Font Size,āĪŦāĪžāĨ‰āĪĻāĨāĪŸ āĪ•āĪū āĪ†āĪ•āĪūāĪ° @@ -1073,6 +1072,7 @@ For ranges,āĪķāĨāĪ°āĨ‡āĪĢāĪŋāĪŊāĨ‹āĪ‚ āĪ•āĨ‡ āĪēāĪŋāĪ For reference,āĪļāĪ‚āĪĶāĪ°āĨāĪ­ āĪ•āĨ‡ āĪēāĪŋāĪ For reference only.,āĪļāĪ‚āĪĶāĪ°āĨāĪ­ āĪ•āĨ‡ āĪēāĪŋāĪ āĪđāĨ€ āĪđāĨˆ. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",āĪ—āĨāĪ°āĪūāĪđāĪ•āĨ‹āĪ‚ āĪ•āĨ€ āĪļāĨāĪĩāĪŋāĪ§āĪū āĪ•āĨ‡ āĪēāĪŋāĪ āĪ‡āĪĻ āĪ•āĨ‹āĪĄ āĪŠāĨāĪ°āĪŋāĪ‚āĪŸ āĪļāĨāĪĩāĪ°āĨ‚āĪŠāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚ āĪšāĪūāĪēāĪūāĪĻ āĪ”āĪ° āĪĩāĪŋāĪĪāĪ°āĪĢ āĪĻāĨ‹āĪŸ āĪ•āĨ€ āĪĪāĪ°āĪđ āĪ‡āĪļāĨāĪĪāĨ‡āĪŪāĪūāĪē āĪ•āĪŋāĪŊāĪū āĪœāĪū āĪļāĪ•āĪĪāĪū āĪđāĨˆ +Form,āĪŠāĨāĪ°āĪŠāĪĪāĨāĪ° Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,āĪŠāĨāĪ°āĪūāĪ°āĨ‚āĪŠ: hh: āĪŪāĪŋāĪŪāĨ€ āĪāĪ• āĪ˜āĪ‚āĪŸāĨ‡ 01:00 āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ āĪļāĨ‡āĪŸ āĪļāĪŪāĪūāĪŠāĨāĪĪāĪŋ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ‰āĪĶāĪūāĪđāĪ°āĪĢ. āĪ…āĪ§āĪŋāĪ•āĪĪāĪŪ āĪļāĪŪāĪūāĪŠāĨāĪĪāĪŋ 72 āĪ˜āĪ‚āĪŸāĨ‡ āĪ•āĪū āĪđāĨ‹āĪ—āĪū. āĪĄāĪŋāĪŦāĪžāĨ‰āĪēāĨāĪŸ āĪ°āĨ‚āĪŠ āĪļāĨ‡ 24 āĪ˜āĪ‚āĪŸāĨ‡ Forum,āĪŦāĨ‹āĪ°āĪŪ Fraction,āĪ…āĪ‚āĪķ @@ -1089,7 +1089,9 @@ From PR Date,āĪŠāĨ€āĪ†āĪ° āĪĪāĪūāĪ°āĨ€āĪ– āĪļāĨ‡ From Package No.,āĪŠāĨˆāĪ•āĨ‡āĪœ āĪļāĪ‚ āĪļāĨ‡ From Table,āĪŪāĨ‡āĪœ āĪļāĨ‡ Frozen,āĪŦāĨāĪ°āĨ‹āĪœāĪĻ +Full Image,āĪŠāĨ‚āĪ°āĨāĪĢ āĪ›āĪĩāĪŋ Full Name,āĪŠāĨ‚āĪ°āĪū āĪĻāĪūāĪŪ +Full description (formatted as markdown),āĪŠāĨ‚āĪ°āĨāĪĢ āĪĩāĪŋāĪĩāĪ°āĪĢ (markdown āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ āĪļāĨāĪĩāĪ°āĨ‚āĪŠāĪŋāĪĪ) Fully Billed,āĪŠāĨ‚āĪ°āĨ€ āĪĪāĪ°āĪđ āĪļāĨ‡ āĪŽāĪŋāĪē Fully Completed,āĪŠāĨ‚āĪ°āĨ€ āĪĪāĪ°āĪđ āĪļāĨ‡ āĪŠāĨ‚āĪ°āĪū GL Control,āĪœāĨ€āĪāĪē āĪĻāĪŋāĪŊāĪ‚āĪĪāĨāĪ°āĪĢ @@ -1104,7 +1106,7 @@ Gender,āĪēāĪŋāĪ‚āĪ— General,āĪļāĪūāĪŪāĪūāĪĻāĨāĪŊ General Ledger,āĪļāĪūāĪŪāĪūāĪĻāĨāĪŊ āĪ–āĪūāĪĪāĪū Generate Description HTML,āĪĩāĪŋāĪĩāĪ°āĪĢ HTML āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ āĪ•āĪ°āĨ‡āĪ‚ -Generate Purchase Requests (MRP) and Production Orders.,āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ (āĪāĪŪāĪ†āĪ°āĪŠāĨ€) āĪ”āĪ° āĪ‰āĪĪāĨāĪŠāĪūāĪĶāĪĻ āĪ•āĨ‡ āĪ†āĪĶāĨ‡āĪķ āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ. +Generate Material Requests (MRP) and Production Orders.,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ (āĪāĪŪāĪ†āĪ°āĪŠāĨ€) āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ”āĪ° āĪ‰āĪĪāĨāĪŠāĪūāĪĶāĪĻ āĪ•āĨ‡ āĪ†āĪĶāĨ‡āĪķ āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ. Generate Salary Slips,āĪĩāĨ‡āĪĪāĪĻ āĪļāĨāĪēāĪŋāĪŠāĨāĪļ āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ Generate Schedule,āĪ•āĪūāĪ°āĨāĪŊāĪ•āĨāĪ°āĪŪ āĪĪāĪŊ āĪ•āĪ°āĨ‡āĪ‚ āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","āĪĶāĪŋāĪŊāĪū āĪœāĪū āĪļāĪ‚āĪ•āĨāĪē āĪ•āĨ‡ āĪēāĪŋāĪ āĪĻāĪŋāĪ•āĪē āĪœāĪūāĪĪāĪū āĪđāĨˆ āĪŠāĨˆāĪ•āĪŋāĪ‚āĪ— āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ āĪ•āĪ°āĪĪāĪū āĪđāĨˆ. āĪŠāĨˆāĪ•āĨ‡āĪœ āĪļāĪ‚āĪ–āĨāĪŊāĪū, āĪŠāĨˆāĪ•āĨ‡āĪœ āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ”āĪ° āĪ…āĪŠāĪĻāĨ‡ āĪĩāĪœāĪĻ āĪ•āĨ‹ āĪļāĨ‚āĪšāĪŋāĪĪ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ•āĪŋāĪŊāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ." @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,āĪ‰āĪŠāĨ‡āĪ•āĨāĪ·āĪū Image,āĪ›āĪĩāĪŋ Image View,āĪ›āĪĩāĪŋ āĪĶāĨ‡āĪ–āĨ‡āĪ‚ +Image for listing (Width: 100px) (Attach First),āĪēāĪŋāĪļāĨāĪŸāĪŋāĪ‚āĪ— āĪ•āĨ‡ āĪēāĪŋāĪ āĪ›āĪĩāĪŋ (āĪšāĨŒāĪĄāĪžāĪūāĪˆ: 100px) (āĪŠāĪđāĪēāĨ‡ āĪļāĪ‚āĪēāĪ—āĨāĪĻ) +Image for listing (Width: 300px) (Attach First),āĪēāĪŋāĪļāĨāĪŸāĪŋāĪ‚āĪ— āĪ•āĨ‡ āĪēāĪŋāĪ āĪ›āĪĩāĪŋ (āĪšāĨŒāĪĄāĪžāĪūāĪˆ: 300px) (āĪŠāĪđāĪēāĨ‡ āĪļāĪ‚āĪēāĪ—āĨāĪĻ) Implementation Partner,āĪ•āĪūāĪ°āĨāĪŊāĪūāĪĻāĨāĪĩāĪŊāĪĻ āĪļāĪūāĪĨāĨ€ Import,āĪ†āĪŊāĪūāĪĪ Import Date Format ,āĪ†āĪŊāĪūāĪĪ āĪĶāĪŋāĪĻāĪūāĪ‚āĪ• āĪļāĨāĪĩāĪ°āĨ‚āĪŠ @@ -1391,6 +1395,7 @@ Item Name,āĪŪāĪĶ āĪ•āĪū āĪĻāĪūāĪŪ Item Price,āĪŪāĪĶ āĪŪāĨ‚āĪēāĨāĪŊ Item Prices,āĪ†āĪ‡āĪŸāĪŪ āĪŪāĨ‚āĪēāĨāĪŊ Item Quality Inspection Parameter,āĪ†āĪ‡āĪŸāĪŪ āĪ—āĨāĪĢāĪĩāĪĪāĨāĪĪāĪū āĪĻāĪŋāĪ°āĨ€āĪ•āĨāĪ·āĪĢ āĪŠāĨˆāĪ°āĪūāĪŪāĨ€āĪŸāĪ° +Item Reorder,āĪ†āĪ‡āĪŸāĪŪ āĪŠāĨāĪĻāĪƒ āĪ•āĨāĪ°āĪŪāĪŋāĪĪ āĪ•āĪ°āĨ‡āĪ‚ Item Serial No,āĪ†āĪ‡āĪŸāĪŪ āĪ•āĨ‹āĪˆ āĪ§āĪūāĪ°āĪūāĪĩāĪūāĪđāĪŋāĪ• Item Serial Nos,āĪ†āĪ‡āĪŸāĪŪ āĪļāĨ€āĪ°āĪŋāĪŊāĪē āĪĻāĪ‚ Item Supplier,āĪ†āĪ‡āĪŸāĪŪ āĪŠāĨāĪ°āĪĶāĪūāĪŊāĪ• @@ -1470,15 +1475,24 @@ Lead Lost,āĪ–āĨ‹āĪŊāĪū āĪēāĨ€āĪĄ Lead Name,āĪĻāĪūāĪŪ āĪēāĨ€āĪĄ Lead Owner,āĪŪāĪūāĪēāĪŋāĪ• āĪēāĨ€āĪĄ Lead Ref,āĪ°āĨ‡āĪŦāĪ°āĨ€ āĪēāĨ€āĪĄ +Lead Source,āĪļāĨāĪ°āĨ‹āĪĪ āĪēāĨ€āĪĄ +Lead Status,āĪļāĨāĪĨāĪŋāĪĪāĪŋ āĪēāĨ€āĪĄ Lead Time Date,āĪēāĨ€āĪĄ āĪĶāĪŋāĪĻāĪūāĪ‚āĪ• āĪ”āĪ° āĪļāĪŪāĪŊ Lead Time Days,āĪēāĨ€āĪĄ āĪļāĪŪāĪŊ āĪĶāĪŋāĪĻ -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,āĪēāĨ€āĪĄ āĪļāĪŪāĪŊ āĪĶāĪŋāĪĻāĨ‹āĪ‚ āĪĶāĪŋāĪĻ āĪœāĪŋāĪļāĪ•āĨ‡ āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ‡āĪļ āĪ†āĪ‡āĪŸāĪŪ āĪ…āĪŠāĪĻāĨ‡ āĪ—āĨ‹āĪĶāĪūāĪŪ āĪŪāĨ‡āĪ‚ āĪ‰āĪŪāĨāĪŪāĨ€āĪĶ āĪđāĨˆ āĪ•āĨ€ āĪļāĪ‚āĪ–āĨāĪŊāĪū āĪđāĨˆ. āĪ‡āĪļ āĪĶāĪŋāĪĻ āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪŪāĨ‡āĪ‚ āĪĶāĪŋāĪēāĪĩāĪūāĪŊāĪū āĪđāĨˆ āĪœāĪŽ āĪ†āĪŠ āĪ‡āĪļ āĪŪāĪĶ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,āĪēāĨ€āĪĄ āĪļāĪŪāĪŊ āĪĶāĪŋāĪĻāĨ‹āĪ‚ āĪĶāĪŋāĪĻ āĪœāĪŋāĪļāĪ•āĨ‡ āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ‡āĪļ āĪ†āĪ‡āĪŸāĪŪ āĪ…āĪŠāĪĻāĨ‡ āĪ—āĨ‹āĪĶāĪūāĪŪ āĪŪāĨ‡āĪ‚ āĪ‰āĪŪāĨāĪŪāĨ€āĪĶ āĪđāĨˆ āĪ•āĨ€ āĪļāĪ‚āĪ–āĨāĪŊāĪū āĪđāĨˆ. āĪ‡āĪļ āĪĶāĪŋāĪĻ āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪŪāĨ‡āĪ‚ āĪĶāĪŋāĪēāĪĩāĪūāĪŊāĪū āĪđāĨˆ āĪœāĪŽ āĪ†āĪŠ āĪ‡āĪļ āĪŪāĪĶ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. Lead Type,āĪŠāĨāĪ°āĪ•āĪūāĪ° āĪēāĨ€āĪĄ Leave Allocation,āĪ†āĪŽāĪ‚āĪŸāĪĻ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ Leave Allocation Tool,āĪ†āĪŽāĪ‚āĪŸāĪĻ āĪ‰āĪŠāĪ•āĪ°āĪĢ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ Leave Application,āĪ›āĨāĪŸāĨāĪŸāĨ€ āĪ•āĨ€ āĪ…āĪ°āĨāĪœāĪžāĨ€ Leave Approver,āĪ…āĪĻāĨāĪŪāĨ‹āĪĶāĪ• āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ Leave Balance Before Application,āĪ†āĪĩāĨ‡āĪĶāĪĻ āĪļāĨ‡ āĪŠāĪđāĪēāĨ‡ āĪķāĨ‡āĪ· āĪ›āĨ‹āĪĄāĪžāĨ‹ +Leave Block List,āĪŽāĨāĪēāĨ‰āĪ• āĪļāĨ‚āĪšāĨ€ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ +Leave Block List Allow,āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ āĪŽāĨāĪēāĨ‰āĪ• āĪļāĨ‚āĪšāĨ€ āĪ•āĨ€ āĪ…āĪĻāĨāĪŪāĪĪāĪŋ āĪĶāĨ‡āĪ‚ +Leave Block List Allowed,āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ āĪŽāĨāĪēāĨ‰āĪ• āĪļāĨ‚āĪšāĨ€ āĪ°āĪ– āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆ +Leave Block List Date,āĪŽāĨāĪēāĨ‰āĪ• āĪļāĨ‚āĪšāĨ€ āĪĪāĪŋāĪĨāĪŋ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ +Leave Block List Dates,āĪŽāĨāĪēāĨ‰āĪ• āĪļāĨ‚āĪšāĨ€ āĪĪāĪŋāĪĨāĪŋāĪŊāĪūāĪ‚ āĪ›āĨ‹āĪĄāĪžāĨ‹ +Leave Block List Name,āĪŽāĨāĪēāĨ‰āĪ• āĪļāĨ‚āĪšāĨ€ āĪĻāĪūāĪŪ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ +Leave Blocked,āĪ…āĪĩāĪ°āĨāĪĶāĨāĪ§ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ Leave Control Panel,āĪĻāĪŋāĪŊāĪ‚āĪĪāĨāĪ°āĪĢ āĪ•āĪ•āĨāĪ· āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ Leave Encashed?,āĪ­āĨāĪĻāĪūāĪŊāĪū āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹? Leave Encashment Amount,āĪĻāĪ•āĪĶāĨ€āĪ•āĪ°āĪĢ āĪ°āĪūāĪķāĪŋ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,āĪ°āĪŋāĪ•āĨāĪĪ āĪ›āĨ‹āĪĄāĪž āĪ… Leave blank if considered for all designations,āĪ°āĪŋāĪ•āĨāĪĪ āĪ›āĨ‹āĪĄāĪž āĪ…āĪ—āĪ° āĪļāĪ­āĨ€ āĪŠāĪĶāĪĻāĪūāĪŪ āĪ•āĨ‡ āĪēāĪŋāĪ āĪĩāĪŋāĪšāĪūāĪ° Leave blank if considered for all employee types,āĪ°āĪŋāĪ•āĨāĪĪ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ āĪ…āĪ—āĪ° āĪļāĪ­āĨ€ āĪ•āĪ°āĨāĪŪāĪšāĪūāĪ°āĨ€ āĪŠāĨāĪ°āĪ•āĪūāĪ° āĪ•āĨ‡ āĪēāĪŋāĪ āĪĩāĪŋāĪšāĪūāĪ° Leave blank if considered for all grades,āĪ°āĪŋāĪ•āĨāĪĪ āĪ›āĨ‹āĪĄāĪž āĪ…āĪ—āĪ° āĪļāĪ­āĨ€ āĪ—āĨāĪ°āĨ‡āĪĄ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŪāĪūāĪĻāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ +Leave by,āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‹ "Leave can be approved by users with Role, ""Leave Approver""",", "āĪ…āĪĻāĨāĪŪāĨ‹āĪĶāĪ•" āĪ›āĨ‹āĪĄāĪž āĪ›āĨ‹āĪĄāĪž āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū āĪ•āĨ‡ āĪļāĪūāĪĨ āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪūāĪ“āĪ‚ āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ…āĪĻāĨāĪŪāĨ‹āĪĶāĪŋāĪĪ āĪ•āĪŋāĪŊāĪū āĪœāĪū āĪļāĪ•āĪĪāĪū āĪđāĨˆ" Ledger,āĪ–āĪūāĪĪāĪū Left,āĪĩāĪūāĪŪ @@ -1525,12 +1540,14 @@ Login Before,āĪ‡āĪļāĪļāĨ‡ āĪŠāĪđāĪēāĨ‡ āĪ•āĨ€āĪœāĪŋāĪŊāĨ‡ Login Id,āĪ†āĪˆāĪĄāĨ€ āĪēāĨ‰āĪ—āĪŋāĪĻ Login Page,āĪēāĨ‰āĪ— Logout,āĪēāĨ‰āĪ—āĪ†āĪ‰āĪŸ +Long Description,āĪēāĪūāĪ‚āĪ— āĪĩāĪŋāĪĩāĪ°āĪĢ Long Text,āĪēāĪ‚āĪŽāĨ€ āĪŠāĪūāĪ  Lost Reason,āĪ–āĨ‹āĪŊāĪū āĪ•āĪūāĪ°āĪĢ Low,āĪĻāĪŋāĪŪāĨāĪĻ Lower Income,āĪ•āĪŪ āĪ†āĪŊ Lucida Grande,āĪēāĨāĪŊāĨāĪļāĪŋāĪĄāĪū Grande MIS Control,āĪāĪŪāĪ†āĪˆāĪāĪļ āĪĻāĪŋāĪŊāĪ‚āĪĪāĨāĪ°āĪĢ +MREQ,MREQ MTN Details,āĪāĪŪāĪŸāĨ€āĪāĪĻ āĪĩāĪŋāĪĩāĪ°āĪĢ Mail Footer,āĪŪāĨ‡āĪē āĪŦāĨ‚āĪŸāĪ° Mail Password,āĪŪāĨ‡āĪē āĪŠāĪūāĪļāĪĩāĪ°āĨāĪĄ @@ -1591,6 +1608,14 @@ Match Id,āĪ†āĪˆāĪĄāĨ€ āĪļāĨ‡ āĪŪāĨ‡āĪē Match non-linked Invoices and Payments.,āĪ—āĨˆāĪ° āĪœāĨāĪĄāĪžāĨ‡ āĪšāĪūāĪēāĪūāĪĻ āĪ”āĪ° āĪ­āĨāĪ—āĪĪāĪūāĪĻ āĪ•āĪū āĪŪāĪŋāĪēāĪūāĪĻ. Material Issue,āĪŪāĪđāĪĪāĨāĪĪāĨāĪĩāĪŠāĨ‚āĪ°āĨāĪĢ āĪĩāĪŋāĪ·āĪŊ Material Receipt,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪŠāĨāĪ°āĪūāĪŠāĨāĪĪāĪŋ +Material Request,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ +Material Request Date,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪĪāĪŋāĪĨāĪŋ +Material Request Detail No,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪĩāĪŋāĪļāĨāĪĪāĪūāĪ° āĪĻāĪđāĨ€āĪ‚ +Material Request For Warehouse,āĪĩāĨ‡āĪŊāĪ°āĪđāĪūāĪ‰āĪļ āĪ•āĨ‡ āĪēāĪŋāĪ āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ•āĪū āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ +Material Request Item,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ†āĪ‡āĪŸāĪŪ +Material Request Items,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ†āĪ‡āĪŸāĪŪ +Material Request No,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪĻāĪđāĨ€āĪ‚ +Material Request Type,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪŠāĨāĪ°āĪ•āĪūāĪ° Material Transfer,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪļāĨāĪĨāĪūāĪĻāĪūāĪ‚āĪĪāĪ°āĪĢ Materials,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ Materials Required (Exploded),āĪŪāĪūāĪē āĪ†āĪĩāĪķāĨāĪŊāĪ• (āĪĩāĪŋāĪļāĨāĪŦāĨ‹āĪŸ) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ†āĪĩāĪķāĨāĪŊāĪ•āĪĪ Max Attachments,āĪ…āĪ§āĪŋāĪ•āĪĪāĪŪ āĪ•āĪŋāĪ āĪ—āĪ āĪ…āĪĻāĨāĪēāĪ—āĨāĪĻāĪ•āĨ‹āĪ‚ āĪ•āĨ‡ Max Days Leave Allowed,āĪ…āĪ§āĪŋāĪ•āĪĪāĪŪ āĪĶāĪŋāĪĻ āĪ›āĨ‹āĪĄāĪžāĪĻāĨ‡ āĪ•āĨ€ āĪ…āĪĻāĨāĪŪāĪĪāĪŋ āĪĶāĨ€ Max Discount (%),āĪ…āĪ§āĪŋāĪ•āĪĪāĪŪ āĪĄāĪŋāĪļāĨāĪ•āĪūāĪ‰āĪ‚āĪŸ (%) +Max. Limit,āĪ…āĪ§āĪŋāĪ•āĪĪāĪŪ āĪļāĨ€āĪŪāĪū "Meaning of Submit, Cancel, Amend","āĪ…āĪ°āĨāĪĨ āĪ•āĨ€ āĪļāĪŽāĪŪāĪŋāĪŸ āĪ°āĪĶāĨāĪĶ, āĪļāĪ‚āĪķāĨ‹āĪ§āĪĻ" Medium,āĪŪāĪ§āĨāĪŊāĪŪ Merge,āĪŪāĪ°āĨāĪœ @@ -1676,14 +1702,15 @@ New Communications,āĪĻāĪˆ āĪļāĪ‚āĪšāĪūāĪ° New Delivery Notes,āĪĻāĪˆ āĪĩāĪŋāĪĪāĪ°āĪĢ āĪĻāĨ‹āĪŸ New Enquiries,āĪĻāĪˆ āĪŠāĨ‚āĪ›āĪĪāĪūāĪ› New Leads,āĪĻāĪ āĪļāĨāĪ°āĪūāĪ— +New Leave Application,āĪĻāĪˆ āĪ›āĨāĪŸāĨāĪŸāĨ€ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ…āĪ°āĨāĪœāĨ€ New Leaves Allocated,āĪĻāĪˆ āĪ†āĪĩāĪ‚āĪŸāĪŋāĪĪ āĪŠāĪĪāĨāĪĪāĪŋāĪŊāĪūāĪ‚ New Leaves Allocated (In Days),āĪĻāĪˆ āĪŠāĪĪāĨāĪĪāĪŋāĪŊāĨ‹āĪ‚ āĪ†āĪĩāĪ‚āĪŸāĪŋāĪĪ (āĪĶāĪŋāĪĻāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚) +New Material Requests,āĪĻāĪˆ āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ New Name,āĪĻāĪŊāĪū āĪĻāĪūāĪŪ New Password,āĪĻāĪŊāĪū āĪŠāĪūāĪļāĪĩāĪ°āĨāĪĄ New Projects,āĪĻāĪˆ āĪŠāĪ°āĪŋāĪŊāĨ‹āĪœāĪĻāĪūāĪāĪ‚ New Purchase Orders,āĪĻāĪˆ āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ New Purchase Receipts,āĪĻāĪˆ āĪ–āĪ°āĨ€āĪĶ āĪ°āĪļāĨ€āĪĶ -New Purchase Requests,āĪĻāĪˆ āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ New Quotations,āĪĻāĪˆ āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ New Record,āĪĻāĪŊāĪū āĪ°āĪŋāĪ•āĨ‰āĪ°āĨāĪĄ New Sales Orders,āĪĻāĪˆ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ†āĪĶāĨ‡āĪķ @@ -1863,6 +1890,7 @@ Parent Territory,āĪŪāĪūāĪĪāĪū - āĪŠāĪŋāĪĪāĪū āĪŸāĨ‡āĪ°āĪŋāĪŸāĪ°āĨ€ Parenttype,Parenttype Partially Completed,āĪ†āĪ‚āĪķāĪŋāĪ• āĪ°āĨ‚āĪŠ āĪļāĨ‡ āĪŠāĨ‚āĪ°āĪū Participants,āĪŠāĨāĪ°āĪĪāĪŋāĪ­āĪūāĪ—āĪŋāĪŊāĨ‹āĪ‚ +Particulars,āĪŽāĨāĪŊāĨŒāĪ°āĨ‡ Partly Billed,āĪ†āĪ‚āĪķāĪŋāĪ• āĪ°āĨ‚āĪŠ āĪļāĨ‡ āĪŽāĪŋāĪē Partly Delivered,āĪ†āĪ‚āĪķāĪŋāĪ• āĪ°āĨ‚āĪŠ āĪļāĨ‡ āĪĩāĪŋāĪĪāĪ°āĪŋāĪĪ Partner,āĪļāĪūāĪĨāĨ€ @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc doctype Prevdoc Doctype,Prevdoc Doctype Preview,āĪŠāĨ‚āĪ°āĨāĪĩāĪūāĪĩāĪēāĨ‹āĪ•āĪĻ Previous Work Experience,āĪŠāĪŋāĪ›āĪēāĨ‡ āĪ•āĪūāĪ°āĨāĪŊ āĪ…āĪĻāĨāĪ­āĪĩ +Price,āĪ•āĨ€āĪŪāĪĪ Price List,āĪ•āĨ€āĪŪāĪĪ āĪļāĨ‚āĪšāĨ€ Price List Currency,āĪŪāĨ‚āĪēāĨāĪŊ āĪļāĨ‚āĪšāĨ€ āĪŪāĨāĪĶāĨāĪ°āĪū Price List Currency Conversion Rate,āĪŪāĨ‚āĪēāĨāĪŊ āĪļāĨ‚āĪšāĨ€ āĪŪāĨāĪĶāĨāĪ°āĪū āĪ°āĨ‚āĪŠāĪūāĪ‚āĪĪāĪ°āĪĢ āĪĶāĪ° @@ -2067,14 +2096,6 @@ Purchase Receipt Items,āĪ°āĪļāĨ€āĪĶ āĪĩāĪļāĨāĪĪāĨāĪ“āĪ‚ āĪ•āĨ€ āĪ–āĪ°āĨ€āĪĶ Purchase Receipt Message,āĪ–āĪ°āĨ€āĪĶ āĪ°āĪļāĨ€āĪĶ āĪļāĪ‚āĪĶāĨ‡āĪķ Purchase Receipt No,āĪ°āĪļāĨ€āĪĶ āĪ–āĪ°āĨ€āĪĶ āĪĻāĪđāĨ€āĪ‚ Purchase Receipt Required,āĪ–āĪ°āĨ€āĪĶ āĪ°āĪļāĨ€āĪĶ āĪ†āĪĩāĪķāĨāĪŊāĪ• -Purchase Request,āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ–āĪ°āĨ€āĪĶ -Purchase Request Date,āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪĪāĪŋāĪĨāĪŋ -Purchase Request Detail No,āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪĩāĪŋāĪļāĨāĪĪāĪūāĪ° āĪļāĨ‡ āĪĻāĪđāĨ€āĪ‚ āĪ–āĪ°āĨ€āĪĶ -Purchase Request For Warehouse,āĪ–āĪ°āĨ€āĪĶ āĪ—āĨ‹āĪĶāĪūāĪŪ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ -Purchase Request Item,āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ†āĪ‡āĪŸāĪŪ āĪ–āĪ°āĨ€āĪĶ -Purchase Request No,āĪ•āĨ‹āĪˆ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ–āĪ°āĨ€āĪĶ -Purchase Requisition Details,āĪ–āĪ°āĨ€āĪĶ āĪŪāĪūāĪāĪ— āĪĩāĪŋāĪĩāĪ°āĪĢ -Purchase Requisition No,āĪŪāĪūāĪāĪ— āĪ–āĪ°āĨ€āĪĶ āĪĻāĪđāĨ€āĪ‚ Purchase Return,āĪ•āĨāĪ°āĪŊ āĪĩāĪūāĪŠāĪļāĨ€ Purchase Returned,āĪ–āĪ°āĨ€āĪĶ āĪĩāĪūāĪŠāĪļ āĪ† āĪ—āĪ Purchase Returns,āĪ–āĪ°āĨ€āĪĶ āĪ°āĪŋāĪŸāĪ°āĨāĪĻ @@ -2122,9 +2143,9 @@ Quotation To,āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ Quotation no against which this Sales Order is made ,āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ āĪ•āĨ‡ āĪ–āĪŋāĪēāĪūāĪŦ āĪœāĨ‹ āĪ•āĨ‹āĪˆ āĪ‡āĪļ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ†āĪĶāĨ‡āĪķ āĪ•āĪŋāĪŊāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ Quotes to Leads or Customers.,āĪļāĨāĪ°āĪūāĪ— āĪŊāĪū āĪ—āĨāĪ°āĪūāĪđāĪ• āĪ•āĨ‡ āĪēāĪŋāĪ āĪ‰āĪĶāĨāĪ§āĪ°āĪĢ. Raise Exception,āĪ…āĪŠāĪĩāĪūāĪĶ āĪ‰āĪ āĪūāĪāĪ +Raise Material Request,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ‰āĪ āĪūāĪāĪ +Raise Material Request when stock reaches re-order level,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ‰āĪ āĪūāĪāĪ āĪœāĪŽ āĪķāĨ‡āĪŊāĪ° āĪŠāĨāĪĻāĪƒ āĪ†āĪĶāĨ‡āĪķ āĪ•āĨ‡ āĪļāĨāĪĪāĪ° āĪĪāĪ• āĪŠāĪđāĨāĪāĪš Raise Production Order,āĪ‰āĪĪāĨāĪŠāĪūāĪĶāĪĻ āĪ•āĪū āĪ†āĪĶāĨ‡āĪķ āĪ‰āĪ āĪūāĪāĪ -Raise Purchase Request,āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ‰āĪ āĪūāĪāĪ -Raise Purchase Request when stock reaches re-order level,āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪœāĪŽ āĪķāĨ‡āĪŊāĪ° āĪŠāĨāĪĻāĪƒ āĪ†āĪĶāĨ‡āĪķ āĪ•āĨ‡ āĪļāĨāĪĪāĪ° āĪĪāĪ• āĪŠāĪđāĨāĪāĪš āĪ‰āĪ āĪūāĪāĪ Raised By,āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ‰āĪ āĪūāĪ āĪ—āĪ Raised By (Email),(āĪˆ) āĪĶāĨāĪĩāĪūāĪ°āĪū āĪ‰āĪ āĪūāĪ āĪ—āĪ Random,āĪŊāĪūāĪĶāĨƒāĪšāĨāĪ›āĪŋāĪ• @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,āĪ•āĪšāĨāĪšāĨ‡ āĪŪāĪūāĪē āĪ•āĨ€ āĪēāĪūāĪ—āĪĪ āĪ•āĨ€ Re-Calculate Values,āĪŠāĨāĪĻāĪƒ āĪ—āĪĢāĪĻāĪū āĪŪāĪūāĪĻ Re-Order Level,āĪŠāĨāĪĻ āĪ†āĪĶāĨ‡āĪķ āĪļāĨāĪĪāĪ° Re-Order Qty,āĪŠāĨāĪĻ āĪ†āĪĶāĨ‡āĪķ āĪŪāĪūāĪĪāĨāĪ°āĪū +Re-order,āĪŠāĨāĪĻāĪƒ āĪ†āĪĶāĨ‡āĪķ +Re-order Level,āĪŠāĨāĪĻ āĪ†āĪĶāĨ‡āĪķ āĪļāĨāĪĪāĪ° +Re-order Qty,āĪŠāĨāĪĻāĪƒ āĪ†āĪĶāĨ‡āĪķ āĪŪāĪūāĪĪāĨāĪ°āĪū Read,āĪŠāĪĒāĪžāĪĻāĪū Read Only,āĪ•āĨ‡āĪĩāĪē āĪŠāĪ āĪĻāĨ€āĪŊ Reading 1,1 āĪŠāĪĒāĪžāĪĻāĪū @@ -2261,6 +2285,8 @@ Right,āĪļāĪđāĨ€ Role,āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū Role Name,āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū āĪ•āĪū āĪĻāĪūāĪŪ Roles,āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ +Roles Assigned,āĪĻāĪŋāĪ°āĨāĪŠāĪŋāĪĪ āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ +Roles Assigned To User,āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪ•āĨ‹ āĪ…āĪļāĪūāĪ‡āĪĻ āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ Roles HTML,āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ HTML Rounded Total,āĪ—āĨ‹āĪē āĪ•āĨāĪē Rounded Total (Export),āĪ—āĨ‹āĪē āĪ•āĨāĪē (āĪĻāĪŋāĪ°āĨāĪŊāĪūāĪĪ) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,āĪĄāĪŋāĪēāĪŋāĪĩāĪ°āĨ€ āĪĻāĨ‹āĪŸ āĪļāĨ‡ āĪ†āĪ‡āĪŸ Select Items from Purchase Order,āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ āĪļāĨ‡ āĪ†āĪ‡āĪŸāĪŪ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select Items from Purchase Receipt,āĪ–āĪ°āĨ€āĪĶ āĪ°āĪļāĨ€āĪĶ āĪļāĨ‡ āĪ†āĪ‡āĪŸāĪŪ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select Items from Sales Order,āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ†āĪĶāĨ‡āĪķ āĪļāĨ‡ āĪ†āĪ‡āĪŸāĪŪ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ +Select Material Request,āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select PR,āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪŠāĨ€āĪ†āĪ° +Select Price List for the web. Leave blank to hide price.,āĪĩāĨ‡āĪŽ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŪāĨ‚āĪēāĨāĪŊ āĪļāĨ‚āĪšāĨ€ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. āĪ•āĨ‡ āĪēāĪŋāĪ āĪ•āĨ€āĪŪāĪĪ āĪ›āĪŋāĪŠāĪūāĪĻāĨ‡ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ–āĪūāĪēāĨ€ āĪ›āĨ‹āĪĄāĪž āĪĶāĨ‡āĪ‚. Select Print Format,āĪŠāĨāĪ°āĪŋāĪ‚āĪŸ āĪŠāĨāĪ°āĪūāĪ°āĨ‚āĪŠ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select Print Heading,āĪšāĪŊāĪĻ āĪķāĨ€āĪ°āĨāĪ·āĪ• āĪŠāĨāĪ°āĪŋāĪ‚āĪŸ -Select Purchase Request,āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select Report Name,āĪ°āĪŋāĪŠāĨ‹āĪ°āĨāĪŸ āĪĻāĪūāĪŪ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select Role,āĪ°āĨ‹āĪē āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select Sales Orders,āĪĩāĪŋāĪ•āĨāĪ°āĪŊ āĪ†āĪĶāĨ‡āĪķ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ @@ -2423,7 +2450,10 @@ Select Type,āĪŠāĨāĪ°āĪ•āĪūāĪ° āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select User or Property to start.,āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪŊāĪū āĪķāĨāĪ°āĨ‚ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪļāĪ‚āĪŠāĪĪāĨāĪĪāĪŋ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. Select account head of the bank where cheque was deposited.,āĪŽāĨˆāĪ‚āĪ• āĪ•āĨ‡ āĪ–āĪūāĪĪāĨ‡ āĪŪāĨ‡āĪ‚ āĪœāĪđāĪūāĪ‚ āĪšāĨ‡āĪ• āĪœāĪŪāĪū āĪ•āĪŋāĪŊāĪū āĪ—āĪŊāĪū āĪĨāĪū āĪļāĪŋāĪ° āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. Select company name first.,āĪ•āĪ‚āĪŠāĪĻāĨ€ 1 āĪĻāĪūāĪŪ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. +Select dates to create a new ,āĪāĪ• āĪĻāĪŊāĪū āĪŽāĪĻāĪūāĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪĶāĪŋāĪĻāĪūāĪ‚āĪ• āĪšāĨāĪĻāĨ‡ Select name of Customer to whom project belongs,āĪŠāĪ°āĪŋāĪŊāĨ‹āĪœāĪĻāĪū āĪœāĪŋāĪļāĨ‡ āĪ…āĪ‚āĪĪāĪ°āĨāĪ—āĪĪ āĪ†āĪĪāĪū āĪđāĨˆ āĪ—āĨāĪ°āĪūāĪđāĪ• āĪ•āĨ‡ āĪĻāĪūāĪŪ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ +Select or drag across dates to create a new event.,āĪšāĨāĪĻāĨ‡āĪ‚ āĪŊāĪū āĪĪāĪŋāĪĨāĪŋāĪŊāĪūāĪ āĪ­āĪ° āĪŪāĨ‡āĪ‚ āĪ–āĨ€āĪ‚āĪšāĨ‡āĪ‚ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪāĪ• āĪĻāĪˆ āĪ˜āĪŸāĪĻāĪū āĪŽāĪĻāĪūāĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank","āĪķāĪŋāĪŠāĪŋāĪ‚āĪ— āĪ—āĨ‹āĪĶāĪūāĪŪ āĪšāĨāĪĻāĨ‡āĪ‚ āĪŊāĪū "āĪļāĨāĪŸāĨ‰āĪ• āĪļāĨ‡ āĪŽāĪūāĪđāĪ°" "āĪļāĨāĪŸāĨ‰āĪ• āĪŪāĨ‡āĪ‚" āĪĶāĪŋāĪ–āĪūāĪĻāĨ‡. āĪ›āĨāĪŠāĪūāĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ, āĪ°āĪŋāĪ•āĨāĪĪ āĪ›āĨ‹āĪĄāĪž" Select template from which you want to get the Goals,āĪœāĨ‹ āĪŸāĨ‡āĪŪāĨāĪŠāĪēāĨ‡āĪŸ āĪļāĨ‡ āĪ†āĪŠ āĪēāĪ•āĨāĪ·āĨāĪŊāĨ‹āĪ‚ āĪ•āĨ‹ āĪŠāĨāĪ°āĪūāĪŠāĨāĪĪ āĪ•āĪ°āĪĻāĪū āĪšāĪūāĪđāĪĪāĨ‡ āĪđāĨˆāĪ‚ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ Select the Employee for whom you are creating the Appraisal.,āĪœāĪŋāĪļāĨ‡ āĪĪāĨāĪŪ āĪŠāĨˆāĪĶāĪū āĪ•āĪ° āĪ°āĪđāĨ‡ āĪđāĨˆāĪ‚ āĪŪāĨ‚āĪēāĨāĪŊāĪūāĪ‚āĪ•āĪĻ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ•āĪ°āĨāĪŪāĪšāĪūāĪ°āĨ€ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚. Select the currency in which price list is maintained,āĪœāĪŋāĪļ āĪŪāĨāĪĶāĨāĪ°āĪū āĪŪāĨ‡āĪ‚ āĪŪāĨ‚āĪēāĨāĪŊ āĪļāĨ‚āĪšāĨ€ āĪŽāĪĻāĪūāĪ āĪ°āĪ–āĪū āĪđāĨˆ āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ @@ -2445,10 +2475,12 @@ Send,āĪ­āĨ‡āĪœāĨ‡āĪ‚ Send Autoreply,āĪļāĨāĪĩāĪĪāĪƒ āĪ­āĨ‡āĪœāĨ‡āĪ‚ Send Email,āĪˆāĪŪāĨ‡āĪē āĪ­āĨ‡āĪœāĨ‡āĪ‚ Send From,āĪļāĨ‡ āĪ­āĨ‡āĪœāĨ‡āĪ‚ +Send Invite Email,āĪĻāĪŋāĪŪāĪ‚āĪĪāĨāĪ°āĪĢ āĪˆāĪŪāĨ‡āĪē āĪ­āĨ‡āĪœāĨ‡āĪ‚ Send Me A Copy,āĪŪāĨāĪāĨ‡ āĪāĪ• āĪ•āĨ‰āĪŠāĨ€ āĪ­āĨ‡āĪœ "Send Newsletters to your contacts, leads.",āĪ…āĪŠāĪĻāĨ‡ āĪļāĪ‚āĪŠāĪ°āĨāĪ•āĨ‹āĪ‚ āĪ•āĨ‹ āĪļāĪŪāĪūāĪšāĪūāĪ°āĪŠāĪĪāĨāĪ°āĪŋāĪ•āĪūāĪāĪ āĪ­āĨ‡āĪœāĨ‡āĪ‚ āĪœāĪūāĪĪāĪū āĪđāĨˆ. Send SMS,āĪāĪļāĪāĪŪāĪāĪļ āĪ­āĨ‡āĪœāĨ‡āĪ‚ Send To,āĪ‡āĪĻāĨāĪđāĨ‡āĪ‚ āĪ­āĨ‡āĪœāĨ‡āĪ‚ +Send To Type,āĪŸāĪūāĪ‡āĪŠ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ­āĨ‡āĪœāĨ‡āĪ‚ "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.",āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū "āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪŠāĨāĪ°āĪŽāĪ‚āĪ§āĪ•" āĪ”āĪ° "āĪ–āĪ°āĨ€āĪĶ āĪŠāĨāĪ°āĪŽāĪ‚āĪ§āĪ•" āĪœāĪŽ āĪŠāĨāĪĻāĪƒ āĪ†āĪĶāĨ‡āĪķ āĪ•āĨ‡ āĪļāĨāĪĪāĪ° āĪ•āĨ‹ āĪŠāĪūāĪ° āĪ•āĪ° āĪœāĪūāĪĪāĪū āĪđāĨˆ āĪ•āĨ‡ āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪūāĪ“āĪ‚ āĪ•āĨ‡ āĪēāĪŋāĪ āĪāĪ• āĪˆāĪŪāĨ‡āĪē āĪ­āĨ‡āĪœāĨ‡āĪ‚. Send automatic emails to Contacts on Submitting transactions.,āĪēāĨ‡āĪĻāĪĶāĨ‡āĪĻ āĪ­āĨ‡āĪœāĪĻāĨ‡ āĪŠāĪ° āĪļāĪ‚āĪŠāĪ°āĨāĪ• āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪļāĨāĪĩāĪĪ: āĪˆāĪŪāĨ‡āĪē āĪ­āĨ‡āĪœāĨ‡āĪ‚. "Send bulk SMS to leads, customers, contacts","āĪœāĪūāĪĪāĪū āĪđāĨˆ, āĪ—āĨāĪ°āĪūāĪđāĪ•āĨ‹āĪ‚, āĪļāĪ‚āĪŠāĪ°āĨāĪ•, āĪĨāĨ‹āĪ• āĪāĪļāĪāĪŪāĪāĪļ āĪ­āĨ‡āĪœāĨ‡āĪ‚" @@ -2515,6 +2547,7 @@ Ship To,āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪķāĪŋāĪŠ Shipping Address,āĪķāĪŋāĪŠāĪŋāĪ‚āĪ— āĪŠāĪĪāĪū Shipping Address Name,āĪķāĪŋāĪŠāĪŋāĪ‚āĪ— āĪŠāĪĪāĪū āĪĻāĪūāĪŪ Shipping Details,āĪķāĪŋāĪŠāĪŋāĪ‚āĪ— āĪĩāĪŋāĪĩāĪ°āĪĢ +Short Description,āĪļāĪ‚āĪ•āĨāĪ·āĪŋāĪŠāĨāĪĪ āĪĩāĪ°āĨāĪĢāĪĻ Short biography for website and other publications.,āĪĩāĨ‡āĪŽāĪļāĪūāĪ‡āĪŸ āĪ”āĪ° āĪ…āĪĻāĨāĪŊ āĪŠāĨāĪ°āĪ•āĪūāĪķāĪĻāĨ‹āĪ‚ āĪ•āĨ‡ āĪēāĪŋāĪ āĪēāĪ˜āĨ āĪœāĨ€āĪĩāĪĻāĨ€. Shortcut,āĪķāĨ‰āĪ°āĨāĪŸāĪ•āĪŸ "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",āĪļāĨāĪŸāĨ‰āĪ• āĪŪāĨ‡āĪ‚ āĪĶāĪŋāĪ–āĪūāĪāĪ "" āĪŊāĪū "āĪĻāĪđāĨ€āĪ‚" āĪļāĨāĪŸāĨ‰āĪ• āĪŪāĨ‡āĪ‚ āĪ‡āĪļ āĪ—āĨ‹āĪĶāĪūāĪŪ āĪŪāĨ‡āĪ‚ āĪ‰āĪŠāĪēāĪŽāĨāĪ§ āĪļāĨāĪŸāĨ‰āĪ• āĪ•āĨ‡ āĪ†āĪ§āĪūāĪ° āĪŠāĪ°. @@ -2563,6 +2596,7 @@ Standard Rate,āĪŪāĪūāĪĻāĪ• āĪĶāĪ° Start Date,āĪŠāĨāĪ°āĪūāĪ°āĪ‚āĪ­ āĪĶāĪŋāĪĻāĪūāĪ‚āĪ• Start Report For,āĪŠāĨāĪ°āĪūāĪ°āĪ‚āĪ­ āĪēāĪŋāĪ āĪ°āĪŋāĪŠāĨ‹āĪ°āĨāĪŸ Start date of current invoice's period,āĪĩāĪ°āĨāĪĪāĪŪāĪūāĪĻ āĪšāĪūāĪēāĪūāĪĻ āĪ•āĨ€ āĪ…āĪĩāĪ§āĪŋ āĪ•āĨ‡ āĪ†āĪ°āĪ‚āĪ­ āĪĪāĪŋāĪĨāĪŋ +Starts on,āĪŠāĪ° āĪķāĨāĪ°āĨ‚ āĪđāĨ‹āĪĪāĪū āĪđāĨˆ Startup,āĪļāĨāĪŸāĪūāĪ°āĨāĪŸāĪ…āĪŠ State,āĪ°āĪūāĪœāĨāĪŊ State Name,āĪ°āĪūāĪœāĨāĪŊ āĪ•āĪū āĪĻāĪūāĪŪ @@ -2712,6 +2746,7 @@ Test Data,āĪŠāĪ°āĨ€āĪ•āĨāĪ·āĪĢ āĪ‘āĪ•āĪĄāĪžāĪū Test Date,āĪŠāĪ°āĨ€āĪ•āĨāĪ·āĪū āĪ•āĨ€ āĪĪāĪūāĪ°āĨ€āĪ– Test Email Id,āĪŸāĨ‡āĪļāĨāĪŸ āĪˆāĪŪāĨ‡āĪē āĪ†āĪˆāĪĄāĨ€ Test Link,āĪŸāĨ‡āĪļāĨāĪŸ āĪēāĪŋāĪ‚āĪ• +Test Runner,āĪŠāĪ°āĨ€āĪ•āĨāĪ·āĪĢ āĪ§āĪūāĪĩāĪ• Test Select,āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪŸāĨ‡āĪļāĨāĪŸ Test Text,āĪŠāĪ°āĨ€āĪ•āĨāĪ·āĪĢ āĪŠāĪūāĪ  Test the Newsletter,āĪĻāĨāĪŊāĨ‚āĪœāĪžāĪēāĨˆāĪŸāĪ° āĪŸāĨ‡āĪļāĨāĪŸ @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,/ āĪ…āĪŠāĪĻāĨ€ āĪ•āĪ‚āĪŠāĪĻāĨ€ āĪ•āĨ€ āĪĩāĨ‡āĪŽāĪļāĪūāĪ‡āĪŸ āĪ•āĨ‡ āĪĻāĪūāĪŪ āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ āĪ†āĪŠ āĪŽāĨāĪ°āĪūāĪ‰āĪœāĪžāĪ° āĪķāĨ€āĪ°āĨāĪ·āĪ• āĪŠāĪŸāĨāĪŸāĨ€ āĪŠāĪ° āĪŠāĨāĪ°āĪ•āĪŸ āĪ•āĪ°āĪĻāĪū āĪšāĪūāĪđāĪĪāĨ‡ āĪđāĨˆāĪ‚. āĪļāĪ­āĨ€ āĪŠāĨƒāĪ·āĨāĪ āĨ‹āĪ‚ āĪķāĨ€āĪ°āĨāĪ·āĪ• āĪ‰āĪŠāĪļāĪ°āĨāĪ— āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ āĪđāĨ‹āĪ—āĪū. The net weight of this package. (calculated automatically as sum of net weight of items),āĪ‡āĪļ āĪŠāĨˆāĪ•āĨ‡āĪœ āĪ•āĨ‡ āĪķāĨāĪĶāĨāĪ§ āĪĩāĪœāĪĻ. (āĪĩāĪļāĨāĪĪāĨāĪ“āĪ‚ āĪ•āĪū āĪķāĨāĪĶāĨāĪ§ āĪĩāĪœāĪĻ āĪ•āĨ€ āĪ°āĪūāĪķāĪŋ āĪ•āĨ‡ āĪ°āĨ‚āĪŠ āĪŪāĨ‡āĪ‚ āĪļāĨāĪĩāĪĪāĪƒ āĪ—āĪĢāĪĻāĪū) The new BOM after replacement,āĪŽāĪĶāĪēāĪĻāĨ‡ āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪĻāĪ āĪŽāĨ€āĪ“āĪāĪŪ -The quantity for the Purchase Request when the stock goes below re-order level.,āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŪāĪūāĪĪāĨāĪ°āĪū āĪœāĪŽ āĪķāĨ‡āĪŊāĪ° āĪŠāĨāĪĻāĪƒ āĪ†āĪĶāĨ‡āĪķ āĪ•āĨ‡ āĪļāĨāĪĪāĪ° āĪļāĨ‡ āĪĻāĨ€āĪšāĨ‡ āĪšāĪēāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ. The rate at which Bill Currency is converted into company's base currency,āĪœāĪŋāĪļ āĪĶāĪ° āĪŠāĪ° āĪĩāĪŋāĪ§āĨ‡āĪŊāĪ• āĪŪāĨāĪĶāĨāĪ°āĪū āĪ•āĪ‚āĪŠāĪĻāĨ€ āĪ•āĨ‡ āĪŽāĨ‡āĪļ āĪŪāĨāĪĶāĨāĪ°āĪū āĪŪāĨ‡āĪ‚ āĪŠāĪ°āĪŋāĪĩāĪ°āĨāĪĪāĪŋāĪĪ āĪ•āĪŋāĪŊāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ "The system provides pre-defined roles, but you can add new roles to set finer permissions","āĪŠāĨāĪ°āĪĢāĪūāĪēāĨ€ āĪŠāĨ‚āĪ°āĨāĪĩ āĪĻāĪŋāĪ°āĨāĪ§āĪūāĪ°āĪŋāĪĪ āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū āĪŠāĨāĪ°āĪĶāĪūāĪĻ āĪ•āĪ°āĪĪāĪū āĪđāĨˆ, āĪēāĨ‡āĪ•āĪŋāĪĻ āĪ†āĪŠ āĪŊāĪđ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚ āĪĻāĪˆ āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ āĪ•āĨ‹ āĪœāĨ‹āĪĄāĪžāĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŽāĨ‡āĪđāĪĪāĪ° āĪ…āĪĻāĨāĪŪāĪĪāĪŋāĪŊāĪūāĪ āĪļāĨ‡āĪŸ" -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",āĪŠāĨāĪ°āĪĢāĪūāĪēāĨ€ āĪāĪ• āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪļāĨāĪĩāĪĪāĪƒ āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ āĪœāĪŽ āĪļāĨāĪŸāĨ‰āĪ• āĪŪāĪūāĪĪāĨāĪ°āĪū āĪĻāĨ€āĪšāĨ‡ āĪŠāĨāĪ°āĪ•āĪūāĪ° "āĪļāĨāĪŸāĨ‹āĪ°" āĪŊāĪū "āĪ†āĪ°āĪ•āĨāĪ·āĪŋāĪĪ āĪĩāĨ‡āĪŊāĪ°āĪđāĪūāĪ‰āĪļ āĪ•āĨ‡ āĪ—āĨ‹āĪĶāĪūāĪŪ āĪŪāĨ‡āĪ‚ āĪŦāĪŋāĪ° āĪļāĨ‡ āĪ†āĪĶāĨ‡āĪķ āĪļāĨāĪĪāĪ° āĪšāĪēāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ. The unique id for tracking all recurring invoices. It is generated on submit.,āĪļāĪ­āĨ€ āĪ†āĪĩāĪ°āĨāĪĪāĨ€ āĪšāĪūāĪēāĪūāĪĻ āĪŠāĪ° āĪĻāĪœāĪžāĪ° āĪ°āĪ–āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ…āĪĶāĨāĪĩāĪŋāĪĪāĨ€āĪŊ āĪ†āĪˆāĪĄāĨ€. āĪŊāĪđ āĪŠāĨāĪ°āĪļāĨāĪĪāĨāĪĪ āĪ•āĪ°āĪĻāĨ‡ āĪŠāĪ° āĪ‰āĪĪāĨāĪŠāĪĻāĨāĪĻ āĪđāĨ‹āĪĪāĪū āĪđāĨˆ. Theme,āĪĩāĪŋāĪ·āĪŊ Then By (optional),āĪĪāĪŽ āĪĪāĪ• (āĪĩāĨˆāĪ•āĪēāĨāĪŠāĪŋāĪ•) @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,āĪŊāĪđ āĪ‡ This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,āĪŊāĪđ āĪ‰āĪŠāĪ•āĪ°āĪĢ āĪ†āĪŠāĪ•āĨ‹ āĪŊāĪū āĪ…āĪĶāĨāĪŊāĪĪāĪĻ āĪ•āĪ°āĪĻāĨ‡ āĪ”āĪ° āĪŠāĨāĪ°āĪĢāĪūāĪēāĨ€ āĪŪāĨ‡āĪ‚ āĪķāĨ‡āĪŊāĪ° āĪ•āĨ€ āĪĩāĨˆāĪēāĨāĪŊāĨ‚āĪāĪķāĪĻ āĪŪāĪūāĪĪāĨāĪ°āĪū āĪ•āĨ‹ āĪ āĨ€āĪ• āĪ•āĪ°āĪĻāĨ‡ āĪŪāĨ‡āĪ‚ āĪŪāĪĶāĪĶ āĪ•āĪ°āĪĪāĪū āĪđāĨˆ. āĪŊāĪđ āĪ†āĪŪāĪĪāĨŒāĪ° āĪŠāĪ° āĪŠāĨāĪ°āĪĢāĪūāĪēāĨ€ āĪŪāĨ‚āĪēāĨāĪŊāĨ‹āĪ‚ āĪļāĪŋāĪ‚āĪ•āĨāĪ°āĪĻāĪūāĪ‡āĪœāĪž āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŠāĨāĪ°āĪŊāĨ‹āĪ— āĪ•āĪŋāĪŊāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ āĪ”āĪ° āĪ•āĨāĪŊāĪū āĪĩāĪūāĪļāĨāĪĪāĪĩ āĪŪāĨ‡āĪ‚ āĪ…āĪŠāĪĻāĨ‡ āĪ—āĨ‹āĪĶāĪūāĪŪāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚ āĪŪāĨŒāĪœāĨ‚āĪĶ āĪđāĨˆ. This will be used for setting rule in HR module,āĪ‡āĪļ āĪŪāĨ‰āĪĄāĨāĪŊāĨ‚āĪē āĪŪāĨ‡āĪ‚ āĪŪāĪūāĪĻāĪĩ āĪļāĪ‚āĪļāĪūāĪ§āĪĻ āĪļāĨ‡āĪŸāĪŋāĪ‚āĪ— āĪķāĪūāĪļāĪĻ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ‡āĪļāĨāĪĪāĨ‡āĪŪāĪūāĪē āĪ•āĪŋāĪŊāĪū āĪœāĪūāĪāĪ—āĪū Thread HTML,āĪ§āĪūāĪ—āĪū HTML +Thumbnail Image,āĪĨāĪ‚āĪŽāĪĻāĨ‡āĪē āĪ›āĪĩāĪŋ Thursday,āĪŽāĨƒāĪđāĪļāĨāĪŠāĪĪāĪŋāĪĩāĪūāĪ° Time,āĪļāĪŪāĪŊ Time Zone,āĪļāĪŪāĪŊ āĪ•āĨāĪ·āĨ‡āĪĪāĨāĪ° @@ -2777,6 +2811,7 @@ To,āĪļāĨ‡ To Date,āĪĪāĪŋāĪĨāĪŋ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ To Discuss,āĪšāĪ°āĨāĪšāĪū āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ To Do,āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ•āĨāĪŊāĪū +To Do List,āĪļāĨ‚āĪšāĨ€ To DocType,āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ doctype To Field,āĪ•āĨāĪ·āĨ‡āĪĪāĨāĪ° āĪ•āĨ‡ āĪēāĪŋāĪ To PR Date,āĪŠāĨ€āĪ†āĪ° āĪĪāĪŋāĪĨāĪŋ @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,āĪĶāĪļāĨāĪĪāĪūāĪĩāĨ‡āĪœāĨ‹āĪ‚ āĪ•āĪŋ āĪ•āĨ‡āĪĩāĪē āĪļāĨāĪĩāĪŊāĪ‚ āĪŽāĪĻāĪūāĪŊāĪū āĪđāĨˆāĪ‚ āĪāĪ• āĪĩāĪŋāĪķāĨ‡āĪ· āĪ­āĨ‚āĪŪāĪŋāĪ•āĪū āĪ•āĨ‡ āĪāĪ• āĪŠāĨāĪ°āĪŊāĨ‹āĪ•āĨāĪĪāĪū āĪ•āĨ‹ āĪŠāĨāĪ°āĪĪāĪŋāĪŽāĪ‚āĪ§āĪŋāĪĪ. "To set user roles, just go to Setup > Users and click on the user to assign roles.","āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪ“āĪ‚ āĪļāĨ‡āĪŸ, āĪŽāĪļ āĪœāĪūāĪĻāĨ‡ āĪ•āĨ‡ āĪļāĨ‡āĪŸāĪ…āĪŠ> āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪ”āĪ° āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪŠāĪ° āĪ•āĨāĪēāĪŋāĪ• āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ­āĨ‚āĪŪāĪŋāĪ•āĪūāĪāĪ āĪ…āĪļāĪūāĪ‡āĪĻ." To track any installation or commissioning related work after sales,āĪ•āĪŋāĪļāĨ€ āĪ­āĨ€ āĪļāĨāĪĨāĪūāĪŠāĪĻāĪū āĪŊāĪū āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪ•āĪŪāĨ€āĪķāĪĻ āĪļāĨ‡ āĪļāĪ‚āĪŽāĪ‚āĪ§āĪŋāĪĪ āĪ•āĪūāĪŪ āĪ•āĨ‹ āĪŸāĨāĪ°āĨˆāĪ• -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","āĪĻāĪŋāĪŪāĨāĪĻāĪēāĪŋāĪ–āĪŋāĪĪ āĪĶāĪļāĨāĪĪāĪūāĪĩāĨ‡āĪœāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚ āĪŽāĨāĪ°āĪūāĪ‚āĪĄ āĪĻāĪūāĪŪ āĪŸāĨāĪ°āĨˆāĪ•
āĪĄāĪŋāĪēāĪŋāĪĩāĪ°āĨ€ āĪĻāĨ‹āĪŸ, enuiry, āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§, āĪŪāĪĶ, āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ, āĪ–āĪ°āĨ€āĪĶ āĪĩāĪūāĪ‰āĪšāĪ°, āĪ•āĨāĪ°āĨ‡āĪĪāĪū āĪ°āĪļāĨ€āĪĶ, āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ, āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪšāĪūāĪēāĪūāĪĻ, āĪŽāĪŋāĪ•āĨāĪ°āĨ€ BOM, āĪĩāĪŋāĪ•āĨāĪ°āĪŊ āĪ†āĪĶāĨ‡āĪķ, āĪĻāĪđāĨ€āĪ‚ āĪļāĨ€āĪ°āĪŋāĪŊāĪē" +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","āĪĻāĪŋāĪŪāĨāĪĻāĪēāĪŋāĪ–āĪŋāĪĪ āĪĶāĪļāĨāĪĪāĪūāĪĩāĨ‡āĪœāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚ āĪŽāĨāĪ°āĪūāĪ‚āĪĄ āĪĻāĪūāĪŪ āĪŸāĨāĪ°āĨˆāĪ•
āĪĄāĪŋāĪēāĪŋāĪĩāĪ°āĨ€ āĪĻāĨ‹āĪŸ, enuiry, āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§, āĪ†āĪ‡āĪŸāĪŪ, āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ, āĪ–āĪ°āĨ€āĪĶ āĪĩāĪūāĪ‰āĪšāĪ°, āĪ•āĨāĪ°āĨ‡āĪĪāĪū āĪ°āĪļāĨ€āĪĶ, āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ, āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪšāĪūāĪēāĪūāĪĻ, āĪŽāĪŋāĪ•āĨāĪ°āĨ€ BOM, āĪĩāĪŋāĪ•āĨāĪ°āĪŊ āĪ†āĪĶāĨ‡āĪķ, āĪĻāĪđāĨ€āĪ‚ āĪļāĨ€āĪ°āĪŋāĪŊāĪē" To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ”āĪ° āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪĶāĪļāĨāĪĪāĪūāĪĩāĨ‡āĪœāĨ‹āĪ‚ āĪ•āĨ‡ āĪ†āĪ§āĪūāĪ° āĪŠāĪ° āĪ‰āĪĻāĪ•āĨ‡ āĪ§āĪūāĪ°āĪūāĪĩāĪūāĪđāĪŋāĪ• āĪĻāĪ— āĪŪāĨ‡āĪ‚ āĪ†āĪ‡āĪŸāĪŪ āĪŠāĪ° āĪĻāĪœāĪžāĪ° āĪ°āĪ–āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ. āĪŊāĪđ āĪ­āĨ€ āĪ‰āĪĪāĨāĪŠāĪūāĪĶ āĪ•āĨ€ āĪĩāĪūāĪ°āĪ‚āĪŸāĨ€ āĪ•āĨ‡ āĪĩāĪŋāĪĩāĪ°āĪĢ āĪ•āĨ‹ āĪŸāĨāĪ°āĨˆāĪ• āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŠāĨāĪ°āĪŊāĨ‹āĪ— āĪ•āĪŋāĪŊāĪū āĪœāĪūāĪĪāĪū āĪđāĨˆ. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,āĪŽāĨˆāĪš āĪ“āĪŠāĪĻ āĪļāĨāĪ•āĨ‚āĪē āĪ•āĨ‡ āĪļāĪūāĪĨ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ”āĪ° āĪ–āĪ°āĨ€āĪĶ āĪĶāĪļāĨāĪĪāĪūāĪĩāĨ‡āĪœāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚ āĪ†āĪ‡āĪŸāĪŪāĨāĪļ āĪŸāĨāĪ°āĨˆāĪ•
āĪŠāĪļāĪ‚āĪĶāĨ€āĪĶāĪū āĪ‰āĪĶāĨāĪŊāĨ‹āĪ—: āĪ†āĪĶāĪŋ āĪ°āĪļāĪūāĪŊāĪĻ To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,āĪŽāĪūāĪ°āĪ•āĨ‹āĪĄ āĪ•āĪū āĪ‰āĪŠāĪŊāĨ‹āĪ— āĪ•āĪ°āĪ•āĨ‡ āĪ†āĪ‡āĪŸāĪŪāĨāĪļ āĪŸāĨāĪ°āĨˆāĪ•. āĪ†āĪŠ āĪ†āĪ‡āĪŸāĪŪ āĪ•āĨ‡ āĪŽāĪūāĪ°āĪ•āĨ‹āĪĄ āĪļāĨāĪ•āĨˆāĪĻāĪŋāĪ‚āĪ— āĪĶāĨāĪĩāĪūāĪ°āĪū āĪĄāĪŋāĪēāĪŋāĪĩāĪ°āĨ€ āĪĻāĨ‹āĪŸ āĪ”āĪ° āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪšāĪūāĪēāĪūāĪĻ āĪŪāĨ‡āĪ‚ āĪ†āĪ‡āĪŸāĪŪ āĪĶāĪ°āĨāĪœ āĪ•āĪ°āĪĻāĨ‡ āĪŪāĨ‡āĪ‚ āĪļāĪ•āĨāĪ·āĪŪ āĪđāĨ‹ āĪœāĪūāĪāĪ—āĪū. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,āĪ•āĪŋāĪļāĨ€ āĪ­āĨ€ āĪŠāĪ°āĪŋāĪŊāĨ‹ Track this Sales Order against any Project,āĪ•āĪŋāĪļāĨ€ āĪ­āĨ€ āĪŠāĪ°āĪŋāĪŊāĨ‹āĪœāĪĻāĪū āĪ•āĨ‡ āĪ–āĪŋāĪēāĪūāĪŦ āĪđāĨāĪ āĪ‡āĪļ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ†āĪĶāĨ‡āĪķ Transaction,āĪēāĨ‡āĪĻ - āĪĶāĨ‡āĪĻ Transaction Date,āĪēāĨ‡āĪĻāĪĶāĨ‡āĪĻ āĪ•āĨ€ āĪĪāĪūāĪ°āĨ€āĪ– +Transfer,āĪđāĪļāĨāĪĪāĪūāĪ‚āĪĪāĪ°āĪĢ Transfer stock from one warehouse to another.,āĪāĪ• āĪ—āĨ‹āĪĶāĪūāĪŪ āĪļāĨ‡ āĪĶāĨ‚āĪļāĪ°āĨ‡ āĪķāĨ‡āĪŊāĪ° āĪđāĪļāĨāĪĪāĪūāĪ‚āĪĪāĪ°āĪĢ. Transition Rules,āĪļāĪ‚āĪ•āĨāĪ°āĪŪāĪĢ āĪĻāĪŋāĪŊāĪŪ Transporter Info,āĪŸāĨāĪ°āĪūāĪ‚āĪļāĪŠāĨ‹āĪ°āĨāĪŸāĪ° āĪœāĪūāĪĻāĪ•āĪūāĪ°āĨ€ @@ -2882,6 +2918,7 @@ URL,āĪŊāĨ‚āĪ†āĪ°āĪāĪē Unable to complete request: ,āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪ•āĨ‹ āĪŠāĨ‚āĪ°āĪū āĪ•āĪ°āĪĻāĨ‡ āĪŪāĨ‡āĪ‚ āĪ…āĪļāĪŪāĪ°āĨāĪĨ: Under AMC,āĪāĪāĪŪāĪļāĨ€ āĪ•āĨ‡ āĪĪāĪđāĪĪ Under Graduate,āĪŠāĨ‚āĪ°āĨāĪĩ - āĪļāĨāĪĻāĪūāĪĪāĪ• +Under Section,āĪ§āĪūāĪ°āĪū āĪ•āĨ‡ āĪĪāĪđāĪĪ Under Warranty,āĪĩāĪūāĪ°āĪ‚āĪŸāĨ€ āĪ•āĨ‡ āĪ…āĪ‚āĪĪāĪ°āĨāĪ—āĪĪ Unit of Measure,āĪŪāĪūāĪŠ āĪ•āĨ€ āĪ‡āĪ•āĪūāĪˆ "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","āĪ‡āĪļ āĪŪāĪĶ āĪ•āĨ‡ āĪŪāĪūāĪŠ āĪ•āĨ€ āĪ‡āĪ•āĪūāĪˆ (āĪœāĨˆāĪļāĨ‡ āĪ•āĪŋāĪēāĨ‹āĪ—āĨāĪ°āĪūāĪŪ, āĪŊāĨ‚āĪĻāĪŋāĪŸ, āĪĻāĪđāĨ€āĪ‚, āĪœāĨ‹āĪĄāĪžāĨ€)." @@ -2966,6 +3003,7 @@ Warehouse Type,āĪĩāĨ‡āĪ…āĪ°āĪđāĪūāĪ‰āĪļ āĪŠāĨāĪ°āĪ•āĪūāĪ° Warehouse User,āĪĩāĨ‡āĪ…āĪ°āĪđāĪūāĪ‰āĪļ āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪū āĪ•āĨ‡ Warehouse Users,āĪĩāĨ‡āĪŊāĪ°āĪđāĪūāĪ‰āĪļ āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪūāĪ“āĪ‚ Warehouse where you are maintaining stock of rejected items,āĪĩāĨ‡āĪ…āĪ°āĪđāĪūāĪ‰āĪļ āĪœāĪđāĪūāĪ āĪ†āĪŠ āĪ•āĨ‹ āĪ…āĪļāĨāĪĩāĨ€āĪ•āĪūāĪ° āĪ•āĪ° āĪĶāĪŋāĪŊāĪū āĪ†āĪ‡āĪŸāĪŪ āĪ•āĨ‡ āĪķāĨ‡āĪŊāĪ° āĪ•āĨ‹ āĪŽāĪĻāĪūāĪ āĪ°āĪ–āĪĻāĨ‡ āĪ°āĪđāĨ‡ āĪđāĨˆāĪ‚ +Warehouse-wise Item Reorder,āĪ—āĨ‹āĪĶāĪūāĪŪ āĪĩāĪūāĪ° āĪ†āĪ‡āĪŸāĪŪ āĪŠāĨāĪĻāĪƒ āĪ•āĨāĪ°āĪŪāĪŋāĪĪ āĪ•āĪ°āĨ‡āĪ‚ Warn,āĪšāĨ‡āĪĪāĪūāĪĩāĪĻāĨ€ āĪĶāĨ‡āĪĻāĪū Warning,āĪšāĨ‡āĪĪāĪūāĪĩāĪĻāĨ€ Warranty / AMC Details,āĪĩāĪūāĪ°āĪ‚āĪŸāĨ€ / āĪāĪāĪŪāĪļāĨ€ āĪĩāĪŋāĪĩāĪ°āĪĢ @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,āĪ†āĪŠ āĪ…āĪ§ You can enter any date manually,āĪ†āĪŠ āĪ•āĪŋāĪļāĨ€ āĪ­āĨ€ āĪĪāĪūāĪ°āĨ€āĪ– āĪ•āĨ‹ āĪŪāĨˆāĪĻāĨāĪŊāĨāĪ…āĪē āĪ°āĨ‚āĪŠ āĪļāĨ‡ āĪĶāĪ°āĨāĪœ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚ You can enter the minimum quantity of this item to be ordered.,āĪ†āĪŠ āĪ‡āĪļ āĪŪāĪĶ āĪ•āĨ€ āĪĻāĨāĪŊāĨ‚āĪĻāĪĪāĪŪ āĪŪāĪūāĪĪāĨāĪ°āĪū āĪŪāĨ‡āĪ‚ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ†āĪĶāĨ‡āĪķ āĪĶāĪŋāĪŊāĪū āĪœāĪū āĪŪāĨ‡āĪ‚ āĪŠāĨāĪ°āĪĩāĨ‡āĪķ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,āĪ†āĪŠ āĪ•āĪˆ āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ•āĨ‡ āĪ†āĪĶāĨ‡āĪķ āĪļāĨ‡ āĪāĪ• āĪŠāĨāĪ°āĪļāĪĩ āĪĻāĨ‹āĪŸ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. āĪŽāĪŋāĪ•āĨāĪ°āĨ€ āĪ†āĪĶāĨ‡āĪķ āĪāĪ• āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪāĪ• āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪ”āĪ° āĪĻāĨ€āĪšāĨ‡ āĪ•āĨ‡ āĪŽāĪŸāĪĻ āĪŠāĪ° āĪ•āĨāĪēāĪŋāĪ• āĪ•āĪ°āĨ‡āĪ‚. -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,āĪ†āĪŠ āĪ•āĪˆ āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪļāĨ‡ āĪāĪ• āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. āĪ–āĪ°āĨ€āĪĶ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪāĪ• āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪāĪ• āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪ”āĪ° āĪĻāĨ€āĪšāĨ‡ āĪ•āĨ‡ āĪŽāĪŸāĪĻ āĪŠāĪ° āĪ•āĨāĪēāĪŋāĪ• āĪ•āĪ°āĨ‡āĪ‚. +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,āĪ†āĪŠ āĪ•āĪˆ āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪļāĨ‡ āĪāĪ• āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€ āĪ…āĪĻāĨāĪ°āĨ‹āĪ§ āĪāĪ• āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪāĪ• āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪ”āĪ° āĪĻāĨ€āĪšāĨ‡ āĪ•āĨ‡ āĪŽāĪŸāĪĻ āĪŠāĪ° āĪ•āĨāĪēāĪŋāĪ• āĪ•āĪ°āĨ‡āĪ‚. You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,āĪ†āĪŠ āĪ•āĪˆ āĪŠāĨāĪ°āĪĶāĪūāĪŊāĪ• āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ āĪļāĨ‡ āĪāĪ• āĪ–āĪ°āĨ€āĪĶ āĪ†āĪĶāĨ‡āĪķ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. āĪŠāĨāĪ°āĪĶāĪūāĪŊāĪ• āĪ•āĨ‹āĪŸāĨ‡āĪķāĪĻ āĪāĪ• āĪ•āĨ‡ āĪŽāĪūāĪĶ āĪāĪ• āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪ”āĪ° āĪĻāĨ€āĪšāĨ‡ āĪ•āĨ‡ āĪŽāĪŸāĪĻ āĪŠāĪ° āĪ•āĨāĪēāĪŋāĪ• āĪ•āĪ°āĨ‡āĪ‚. You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,āĪ†āĪŠ āĪ•āĪˆ āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ†āĪĶāĨ‡āĪķ āĪļāĨ‡ āĪāĪ• āĪ–āĪ°āĨ€āĪĶ āĪ°āĪļāĨ€āĪĶ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. āĪ–āĪ°āĨ€āĪĶ āĪ•āĨ‡ āĪ†āĪĶāĨ‡āĪķ āĪ•āĨ‡ āĪāĪ• āĪļāĨ‡ āĪāĪ• āĪ•āĪū āĪšāĪŊāĪĻ āĪ•āĪ°āĨ‡āĪ‚ āĪ”āĪ° āĪĻāĨ€āĪšāĨ‡ āĪ•āĨ‡ āĪŽāĪŸāĪĻ āĪŠāĪ° āĪ•āĨāĪēāĪŋāĪ• āĪ•āĪ°āĨ‡āĪ‚. You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,āĪ†āĪŠ āĪĩāĪŋāĪ­āĪŋāĪĻāĨāĪĻ 'āĪ—āĨāĪĢ' āĪ‰āĪŠāĪŊāĨ‹āĪ—āĪ•āĪ°āĨāĪĪāĪūāĪ“āĪ‚ āĪ•āĨ‹ āĪļāĨāĪĨāĪūāĪŠāĪŋāĪĪ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪŪāĨ‚āĪēāĪ­āĨ‚āĪĪ āĪŪāĨ‚āĪēāĨāĪŊāĨ‹āĪ‚ āĪ•āĨ‹ āĪĻāĪŋāĪ°āĨāĪ§āĪūāĪ°āĪŋāĪĪ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ”āĪ° āĪ…āĪĻāĨāĪŪāĪĪāĪŋ āĪĩāĪŋāĪ­āĪŋāĪĻāĨāĪĻ āĪ°āĨ‚āĪŠāĨ‹āĪ‚ āĪŪāĨ‡āĪ‚ āĪ‡āĪĻ āĪ—āĨāĪĢāĨ‹āĪ‚ āĪ•āĨ‡ āĪŪāĨ‚āĪēāĨāĪŊ āĪ•āĨ‡ āĪ†āĪ§āĪūāĪ° āĪŠāĪ° āĪĻāĪŋāĪŊāĪŪāĨ‹āĪ‚ āĪ•āĨ‹ āĪēāĪūāĪ—āĨ‚ āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚. You can use Customize Form to set levels on fields.,āĪ†āĪŠ āĪŠāĨāĪ°āĪŠāĪĪāĨāĪ° āĪ•āĨ‹ āĪ…āĪĻāĨāĪ•āĨ‚āĪēāĪŋāĪĪ āĪ•āĪ°āĪĻāĨ‡ āĪ•āĨ‡ āĪēāĪŋāĪ āĪ–āĨ‡āĪĪāĨ‹āĪ‚ āĪŠāĪ° āĪļāĨāĪĪāĪ° āĪļāĨ‡āĪŸ āĪ•āĪū āĪ‰āĪŠāĪŊāĨ‹āĪ— āĪ•āĪ° āĪļāĪ•āĪĪāĨ‡ āĪđāĨˆāĪ‚ . -You cannot apply for a leave on the following date because it is blocked,āĪ†āĪŠ āĪĻāĪŋāĪŪāĨāĪĻ āĪĶāĪŋāĪĻāĪūāĪ‚āĪ• āĪŠāĪ° āĪ›āĨāĪŸāĨāĪŸāĨ€ āĪ•āĨ‡ āĪēāĪŋāĪ āĪēāĪūāĪ—āĨ‚ āĪĻāĪđāĨ€āĪ‚ āĪđāĨˆ āĪ•āĨāĪŊāĨ‹āĪ‚āĪ•āĪŋ āĪŊāĪđ āĪŽāĪ‚āĪĶ āĪđāĨˆ Your Customer's TAX registration numbers (if applicable) or any general information,āĪ…āĪŠāĪĻāĨ‡ āĪ—āĨāĪ°āĪūāĪđāĪ• āĪ•āĪ° āĪŠāĪ‚āĪœāĨ€āĪ•āĪ°āĪĢ āĪļāĪ‚āĪ–āĨāĪŊāĪū (āĪŊāĪĶāĪŋ āĪēāĪūāĪ—āĨ‚ āĪđāĨ‹) āĪŊāĪū āĪ•āĪŋāĪļāĨ€ āĪ­āĨ€ āĪļāĪūāĪŪāĪūāĪĻāĨāĪŊ āĪœāĪūāĪĻāĪ•āĪūāĪ°āĨ€ "Your download is being built, this may take a few moments...","āĪ†āĪŠāĪ•āĪū āĪĄāĪūāĪ‰āĪĻāĪēāĨ‹āĪĄ āĪ•āĪū āĪĻāĪŋāĪ°āĨāĪŪāĪūāĪĢ āĪ•āĪŋāĪŊāĪū āĪœāĪū āĪ°āĪđāĪū āĪđāĨˆ, āĪ‡āĪļāĪŪāĨ‡āĪ‚ āĪ•āĨāĪ› āĪļāĪŪāĪŊ āĪēāĪ— āĪļāĪ•āĪĪāĪū āĪđāĨˆ ..." Your letter head content in HTML.,HTML āĪŪāĨ‡āĪ‚ āĪ†āĪŠāĪ•āĪū āĪŠāĪĪāĨāĪ° āĪļāĪŋāĪ° āĪļāĪūāĪŪāĪ—āĨāĪ°āĨ€. @@ -3231,6 +3268,7 @@ tag,āĪŸāĨˆāĪ— tags,āĪŸāĨˆāĪ— "target = ""_blank""",āĪēāĪ•āĨāĪ·āĨāĪŊ = "_blank" tasks,āĪ•āĪūāĪ°āĨāĪŊāĨ‹āĪ‚ +test,āĪŠāĪ°āĨ€āĪ•āĨāĪ·āĪĢ text-height,āĪŠāĪūāĪ  āĪŠāĪ‚āĪšāĪūāĪˆ text-width,āĪŠāĪūāĪ  āĪšāĨŒāĪĄāĪžāĪūāĪˆ th,āĪĩāĨ‡āĪ‚ diff --git a/translations/hr.csv b/translations/hr.csv index 7a0fd7db4af..1c069f3977c 100644 --- a/translations/hr.csv +++ b/translations/hr.csv @@ -1,5 +1,5 @@ , - Reason: ,Razlog: + (Half Day),(Poludnevni) against same operation,protiv istog radu by Role ,prema ulozi cannot be 0,ne moÅūe biti 0 @@ -157,6 +157,7 @@ Activity Log,Aktivnost Prijava Activity Name,Djelatnost Naziv Activity Type,Aktivnost Tip Actual,Stvaran +Actual Amount,Stvarni iznos Actual Budget,Stvarni proračun Actual Completion Date,Stvarni datum dovrÅĄenja Actual Date,Stvarni datum @@ -236,17 +237,13 @@ Against Voucher Type,Protiv voucher vrsti Agent,Agent "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Agregat skupina ** stavki ** u drugoj točki ** **. To je korisno ako ste vezanje određene artikle ** ** u paketu i odrÅūavanje zalihe pakiran ** stavki ** a ne agregata ** artikla **. Paket ** artikla ** će "Je kataloÅĄki Stavka" kao "Ne" i "Je li prodaja artikla" kao "Da", na primjer:. Ako prodajete Prijenosna računala i Ruksaci odvojeno i imaju posebnu cijenu ako kupac kupuje oboje , onda laptop + ruksak će biti novi Prodaja BOM Item.Note: BOM = Bill materijala" Aging Date,Starenje Datum -All Active Leads,Svi Aktivne Vodi All Addresses.,Sve adrese. -All Blog Subscribers,Svi Blog Pretplatnici All Contact,Sve Kontakt -All Contacts,Svi kontakti All Contacts.,Svi kontakti. All Customer Contact,Sve Kupac Kontakt -All Customer Contacts,Svi kupaca Kontakti +All Day,All Day All Employee (Active),Sve zaposlenika (aktivna) All Lead (Open),Sve Olovo (Otvoreno) -All Leads,Sve vodi All Products or Services.,Svi proizvodi i usluge. All Sales Partner Contact,Sve Kontakt Prodaja partner All Sales Person,Sve Prodaje Osoba @@ -436,7 +433,6 @@ Budget Details,Proračunski Detalji Budget Distribution,Proračun Distribucija Budget Distribution Detail,Proračun Distribucija Detalj Budget Distribution Details,Proračun raspodjele Detalji -Build Report,Izgradite izvjeÅĄÄ‡e Bulk Email,Bulk Email Bulk Email records.,Bulk Email Records. Bundle items at time of sale.,Bala stavke na vrijeme prodaje. @@ -465,6 +461,7 @@ Calculate Tax,Izračun poreza Calculate Taxes and Charges,Izračun poreza i pristojbi Calculate Total Score,Izračunajte ukupni rezultat Calendar,Kalendar +Calendar Events,Kalendar događanja Call,Nazvati Campaign,Kampanja Campaign Name,Naziv kampanje @@ -601,6 +598,7 @@ Contact Name,Kontakt Naziv Contact No,Kontaktirajte Ne Contact No.,Kontakt broj Contact Person,Kontakt osoba +Contact Type,Vrsta kontakta Contact Us Settings,Kontaktirajte nas Settings Contact in Future,Kontakt u budućnosti "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","Kontakt opcije, poput "Sales Query, PodrÅĄka upit" itd jedni na novoj liniji ili odvojene zarezima." @@ -664,6 +662,7 @@ Current Value,Trenutna vrijednost Current status,Trenutni status Cust/Supp Address,Cust / Supp Adresa Cust/Supp Name,Cust / Supp Ime +Custom,Običaj Custom Autoreply Message,Prilagođena Automatski Poruka Custom CSS,Prilagođena CSS Custom Field,Prilagođena polja @@ -879,6 +878,7 @@ Editable,Uređivati Educational Qualification,Obrazovne kvalifikacije Educational Qualification Details,Obrazovni Pojedinosti kvalifikacije Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi +Eligible Amount,Prihvatljivo Iznos Email,E-mail Email (By company),E-mail (Po mjestu) Email Digest,E-poÅĄta @@ -927,6 +927,7 @@ Encashment Date,Encashment Datum End Date,Datum zavrÅĄetka End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice End of Life,Kraj Åūivota +Ends on,ZavrÅĄava Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,Unesite Email ID primiti izvjeÅĄÄ‡e o pogreÅĄci poslao users.Eg: support@iwebnotes.com Enter Form Type,Unesite Obrazac Vid Enter Row,Unesite Row @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,"Prijave Error,PogreÅĄka Estimated Material Cost,Procjena troÅĄkova materijala Event,Događaj -Event Date,Događaj Datum Event Individuals,Događaj Pojedinci -Event Name,Naziv događaja Event Role,Događaj Uloga Event Roles,Događaj Uloge -Event Time,Vrijeme događaja Event Type,Vrsta događaja Event Updates,Događaj aÅūuriranja Event User,Događaj Upute @@ -1046,6 +1044,7 @@ Fixed Asset Account,Dugotrajne imovine račun Float,Plutati Float Precision,Float Precision Floral,Cvijetan +Following dates are blocked for Leave,Nakon datumi su blokirani dopusta "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",Nakon stol će pokazati vrijednosti ako su stavke pod - ugovoreno. Ove vrijednosti će biti preuzeta od zapovjednika "Bill of Materials" pod - ugovoreni stavke. Font,Krstionica Font Size,Veličina fonta @@ -1073,6 +1072,7 @@ For ranges,Za raspone For reference,Za referencu For reference only.,Za samo kao referenca. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao ÅĄto su fakture i otpremnice" +Form,Oblik Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,Format: hh: mm primjer za jedan sat isteka postavljen kao 01:00. Maks isteka će biti 72 sati. Default je 24 sati Forum,Forum Fraction,Frakcija @@ -1089,7 +1089,9 @@ From PR Date,Iz PR Datum From Package No.,Iz paketa broj From Table,Iz tablice Frozen,Zaleđeni +Full Image,Cijeli slike Full Name,Ime i prezime +Full description (formatted as markdown),Cijeli opis (formatiran kao smanjenje) Fully Billed,Potpuno Naplaćeno Fully Completed,Potpuno ZavrÅĄeni GL Control,GL kontrola @@ -1104,7 +1106,7 @@ Gender,Rod General,Opći General Ledger,Glavna knjiga Generate Description HTML,Generiranje Opis HTML -Generate Purchase Requests (MRP) and Production Orders.,Generirajte Kupnja Upiti (MRP) i radne naloge. +Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge. Generate Salary Slips,Generiranje plaće gaćice Generate Schedule,Generiranje Raspored "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakiranje gaćice za pakete koji će biti isporučen. Rabljeni obavijestiti paket broj, sadrÅūaj paketa i njegovu teÅūinu." @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,Ignorirati Image,Slika Image View,Slika Pogledaj +Image for listing (Width: 100px) (Attach First),Slika za uvrÅĄtenje (Å irina: 100px) (PriloÅūiti Prvo) +Image for listing (Width: 300px) (Attach First),Slika za uvrÅĄtenje (Å irina: 300 x) (PriloÅūiti Prvo) Implementation Partner,Provedba partner Import,Uvoz Import Date Format ,Uvoz Datum Format @@ -1391,6 +1395,7 @@ Item Name,Stavka Ime Item Price,Stavka Cijena Item Prices,Stavka Cijene Item Quality Inspection Parameter,Stavka Provera kvaliteta parametara +Item Reorder,Stavka redoslijeda Item Serial No,Stavka rednim brojem Item Serial Nos,Stavka Serijski br Item Supplier,Stavka Dobavljač @@ -1470,15 +1475,24 @@ Lead Lost,Olovo Lost Lead Name,Olovo Ime Lead Owner,Olovo Vlasnik Lead Ref,Olovo Ref. +Lead Source,Olovo Source +Lead Status,Olovo Status Lead Time Date,Olovo Time Date Lead Time Days,Olovo vrijeme Dane -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,Olovo vrijeme dana je broj dana koji ovaj predmet se očekuje u skladiÅĄtu. Ovih dana je preuzeta u zahtjev za kupnju kada odaberete ovu stavku. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Olovo vrijeme dana je broj dana koji ovaj predmet se očekuje u skladiÅĄtu. Ovih dana je preuzeta u Materijal Zahtjev kada odaberete ovu stavku. Lead Type,Olovo Vid Leave Allocation,Ostavite Raspodjela Leave Allocation Tool,Ostavite raspodjele alat Leave Application,Ostavite aplikaciju Leave Approver,Ostavite odobravatelju Leave Balance Before Application,Ostavite Balance Prije primjene +Leave Block List,Ostavite Block List +Leave Block List Allow,Ostavite Blok Popis Dopustite +Leave Block List Allowed,Ostavite Block List dopuÅĄtenih +Leave Block List Date,Ostavite Date Popis Block +Leave Block List Dates,Ostavite datumi lista blokiranih +Leave Block List Name,Ostavite popis imena Block +Leave Blocked,Ostavite blokirani Leave Control Panel,Ostavite Upravljačka ploča Leave Encashed?,Ostavite Encashed? Leave Encashment Amount,Ostavite Encashment Iznos @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,Ostavite prazno ako smatra za sve Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake Leave blank if considered for all employee types,Ostavite prazno ako smatra za sve tipove zaposlenika Leave blank if considered for all grades,Ostavite prazno ako smatra za sve razrede +Leave by,Ostavite po "Leave can be approved by users with Role, ""Leave Approver""","Ostavite moÅūe biti odobren od strane korisnika s uloge, "Ostavite odobravatelju"" Ledger,Glavna knjiga Left,Lijevo @@ -1525,12 +1540,14 @@ Login Before,Prijavite Prije Login Id,Prijavite Id Login Page,Prijavite stranicu Logout,Odjava +Long Description,Dugi opis Long Text,Dugo Tekst Lost Reason,Izgubili Razlog Low,Nisko Lower Income,Donja Prihodi Lucida Grande,Lucidi Grande MIS Control,MIS kontrola +MREQ,MREQ MTN Details,MTN Detalji Mail Footer,Mail Footer Mail Password,Mail Lozinka @@ -1591,6 +1608,14 @@ Match Id,Match ID Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja. Material Issue,Materijal Issue Material Receipt,Materijal Potvrda +Material Request,Materijal zahtjev +Material Request Date,Materijal Zahtjev Datum +Material Request Detail No,Materijal Zahtjev Detalj Ne +Material Request For Warehouse,Materijal Zahtjev za galeriju +Material Request Item,Materijal Zahtjev artikla +Material Request Items,Materijalni Zahtjev Proizvodi +Material Request No,Materijal Zahtjev Ne +Material Request Type,Materijal Zahtjev Tip Material Transfer,Materijal transfera Materials,Materijali Materials Required (Exploded),Materijali Obavezno (eksplodirala) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),Materijali Zahtjev za planiranje (MRP) Max Attachments,Max Privitci Max Days Leave Allowed,Max Dani Ostavite dopuÅĄtenih Max Discount (%),Maks Popust (%) +Max. Limit,Maks. Ograničiti "Meaning of Submit, Cancel, Amend","Značenje Podnijeti, Odustani, Izmijeniti" Medium,Srednji Merge,Spojiti @@ -1676,14 +1702,15 @@ New Communications,Novi komunikacije New Delivery Notes,Novi otpremnice New Enquiries,Novi Upiti New Leads,Nova vodi +New Leave Application,Novi dopust Primjena New Leaves Allocated,Novi Leaves Dodijeljeni New Leaves Allocated (In Days),Novi LiÅĄÄ‡e alociran (u danima) +New Material Requests,Novi materijal Zahtjevi New Name,Novo ime New Password,Novi Lozinka New Projects,Novi projekti New Purchase Orders,Novi narudÅūbenice New Purchase Receipts,Novi Kupnja Primici -New Purchase Requests,Novi Kupnja Upiti New Quotations,Novi Citati New Record,Novi rekord New Sales Orders,Nove narudÅūbe @@ -1863,6 +1890,7 @@ Parent Territory,Roditelj Regija Parenttype,Parenttype Partially Completed,Djelomično ZavrÅĄeni Participants,Sudionici +Particulars,Pojedinosti Partly Billed,Djelomično Naplaćeno Partly Delivered,Djelomično Isporučeno Partner,Partner @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc DOCTYPE Prevdoc Doctype,Prevdoc DOCTYPE Preview,Prikaz Previous Work Experience,Radnog iskustva +Price,Cijena Price List,Cjenik Price List Currency,Cjenik valuta Price List Currency Conversion Rate,Cjenik valuta pretvorbe Stopa @@ -2067,14 +2096,6 @@ Purchase Receipt Items,Kupnja primitka artikle Purchase Receipt Message,Kupnja Potvrda poruku Purchase Receipt No,Račun kupnje Ne Purchase Receipt Required,Kupnja Potvrda Obvezno -Purchase Request,Zahtjev za kupnju -Purchase Request Date,Zahtjev za kupnju Datum -Purchase Request Detail No,Zahtjev za kupnju detaljno Ne -Purchase Request For Warehouse,Kupnja Zahtjev za galeriju -Purchase Request Item,Zahtjev za kupnju predmeta -Purchase Request No,Kupnja Zahtjev Ne -Purchase Requisition Details,Kupnja rekvizicije Detalji -Purchase Requisition No,Kupnja rekvizicije Ne Purchase Return,Kupnja Povratak Purchase Returned,Kupnja Vraćeno Purchase Returns,Kupnja Povratak @@ -2122,9 +2143,9 @@ Quotation To,Ponuda za Quotation no against which this Sales Order is made ,Ponuda ne protiv koje ovaj prodajnog naloga se vrÅĄi Quotes to Leads or Customers.,Citati na vodi ili kupaca. Raise Exception,Podignite Iznimka +Raise Material Request,Podignite Materijal Zahtjev +Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu Raise Production Order,Podignite proizvodnom nalogu -Raise Purchase Request,Podignite zahtjev za kupnju -Raise Purchase Request when stock reaches re-order level,Podignite zahtjev za kupnju dionica kada dosegne ponovno poredak razinu Raised By,PoviÅĄena Do Raised By (Email),PoviÅĄena Do (e) Random,Slučajan @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,Sirovine Isporuka TroÅĄkovi Re-Calculate Values,Ponovno izračunati vrijednosti Re-Order Level,Re-Order Razina Re-Order Qty,Re-Order Kol +Re-order,Ponovno bi +Re-order Level,Ponovno bi Razina +Re-order Qty,Ponovno bi Kol Read,Čitati Read Only,Read Only Reading 1,Čitanje 1 @@ -2261,6 +2285,8 @@ Right,Desno Role,Uloga Role Name,Uloga Ime Roles,Uloge +Roles Assigned,Uloge Dodijeljeni +Roles Assigned To User,Uloge dodijeljena Korisniku Roles HTML,Uloge HTML Rounded Total,Zaobljeni Ukupno Rounded Total (Export),Zaobljeni Ukupno (izvoz) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,Odaberite artikle iz otpremnici Select Items from Purchase Order,Odaberite artikle iz narudÅūbenice Select Items from Purchase Receipt,Odaberite artikle iz kupnje primitka Select Items from Sales Order,Odaberite artikle iz prodajnog naloga +Select Material Request,Odaberite Materijal Zahtjev Select PR,Odaberite PR +Select Price List for the web. Leave blank to hide price.,Odaberite cjenik za webu. Ostavite prazno za skrivanje cijenu. Select Print Format,Odaberite Print Format Select Print Heading,Odaberite Ispis Naslov -Select Purchase Request,Odaberite zahtjev za kupnju Select Report Name,Odaberite Naziv izvjeÅĄÄ‡a Select Role,Odaberite Uloga Select Sales Orders,Odaberite narudÅūbe @@ -2423,7 +2450,10 @@ Select Type,Odaberite Vid Select User or Property to start.,Odaberite korisnika ili imovina za početak. Select account head of the bank where cheque was deposited.,Odaberite račun ÅĄefa banke gdje je ček bio pohranjen. Select company name first.,Odaberite naziv tvrtke prvi. +Select dates to create a new ,Odaberite datume za stvaranje nove Select name of Customer to whom project belongs,Odaberite ime kupca kojem projekt pripada +Select or drag across dates to create a new event.,Odaberite ili povucite preko datuma stvoriti novi događaj. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank","Odaberite brodska skladiÅĄta pokazati "na lageru" ili "out of stock". Za skrivanje, ostavite prazno" Select template from which you want to get the Goals,Odaberite predloÅūak s kojeg Åūelite dobiti ciljeva Select the Employee for whom you are creating the Appraisal.,Odaberite zaposlenika za koga se stvara procjene. Select the currency in which price list is maintained,Odaberite valutu u kojoj cjenik odrÅūava @@ -2445,10 +2475,12 @@ Send,Poslati Send Autoreply,PoÅĄalji Automatski Send Email,PoÅĄaljite e-poÅĄtu Send From,PoÅĄalji Iz +Send Invite Email,PoÅĄalji pozivnicu e Send Me A Copy,PoÅĄaljite mi kopiju "Send Newsletters to your contacts, leads.","PoÅĄaljite newslettere svojim kontaktima, vodi." Send SMS,PoÅĄalji SMS Send To,PoÅĄalji +Send To Type,PoÅĄalji UpiÅĄite "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.","PoÅĄaljite e-mail za korisnike ulogu "Material Manager" i "Kupnja Manager", kada ponovno bi se razina preÅĄli." Send automatic emails to Contacts on Submitting transactions.,PoÅĄalji automatske poruke u Kontakte o podnoÅĄenju transakcije. "Send bulk SMS to leads, customers, contacts","PoÅĄalji bulk SMS vodi, klijentima, kontaktima" @@ -2515,6 +2547,7 @@ Ship To,Brod za Shipping Address,Dostava Adresa Shipping Address Name,Dostava Adresa Ime Shipping Details,Dostava Detalji +Short Description,Kratak opis Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija. Shortcut,Prečac "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Show "na lageru" ili "Nije u skladiÅĄtu" temelji se na skladiÅĄtu dostupna u tom skladiÅĄtu. @@ -2563,6 +2596,7 @@ Standard Rate,Standardna stopa Start Date,Datum početka Start Report For,Početak izvjeÅĄÄ‡e za Start date of current invoice's period,Početak datum tekućeg razdoblja dostavnice +Starts on,Počinje na Startup,Stavljanje u pogon State,DrÅūava State Name,DrÅūava Ime @@ -2712,6 +2746,7 @@ Test Data,Test podataka Test Date,Test Datum Test Email Id,Test E-mail ID Test Link,Test linkova +Test Runner,Test Runner Test Select,Test Odaberite Test Text,Test Tekst Test the Newsletter,Test Newsletter @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,Naziv tvrtke / web stranice kao ÅĄto Åūelite da se pojavi na naslovnoj traci preglednika. Sve stranice će imati to kao prefiks na naslov. The net weight of this package. (calculated automatically as sum of net weight of items),Neto teÅūina tog paketa. (Automatski izračunava kao zbroj neto teÅūini predmeta) The new BOM after replacement,Novi BOM nakon zamjene -The quantity for the Purchase Request when the stock goes below re-order level.,Količina za zahtjev za kupnju kad dionica ide ispod ponovno bi razina. The rate at which Bill Currency is converted into company's base currency,Stopa po kojoj Bill valuta pretvara u tvrtke bazne valute "The system provides pre-defined roles, but you can add new roles to set finer permissions","Sustav pruÅūa unaprijed definiranim ulogama, ali moÅūete dodati nove uloge postaviti finije dozvole" -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",Sustav će generirati zahtjev Kupnja automatski kada dioničko količina ide ispod ponovno bi razina u skladiÅĄtu tipa "prodavaonice" ili "Reserved skladiÅĄtu". The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je generiran na podnijeti. Theme,Tema Then By (optional),Zatim Do (opcionalno) @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,To je broj z This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ovaj alat pomaÅūe vam da aÅūurirate ili popraviti količinu i vrednovanja zaliha u sustavu. To se obično koristi za sinkronizaciju sustava vrijednosti i ÅĄto zapravo postoji u svojim skladiÅĄtima. This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula Thread HTML,Temu HTML +Thumbnail Image,Thumbnail slika Thursday,Četvrtak Time,Vrijeme Time Zone,Time Zone @@ -2777,6 +2811,7 @@ To,Na To Date,Za datum To Discuss,Za Raspravljajte To Do,Da li +To Do List,Da li popis To DocType,Za DOCTYPE To Field,Za Field To PR Date,Za PR Datum @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,Da biste ograničili korisnik određenu ulogu dokumentima koji su samo self-kreirana. "To set user roles, just go to Setup > Users and click on the user to assign roles.","Da biste postavili korisničke uloge, samo idite na Postavke> Korisnici i kliknite na korisnika dodijeliti uloge." To track any installation or commissioning related work after sales,Za praćenje bilo koju instalaciju ili puÅĄtanje vezane raditi nakon prodaje -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Za praćenje branda u sljedećim dokumentima
Otpremnica, Enuiry, zahtjev za kupnju, točka, NarudÅūbenica, Otkup bon, Kupac Potvrda, citat, prodaja Račun, prodaja BOM, prodajnog naloga, Serijski br" +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Za praćenje branda u sljedećim dokumentima
Otpremnica, Enuiry, Materijal zahtjev, točka, NarudÅūbenica, Otkup bon, Kupac Potvrda, citat, prodaja Račun, prodaja BOM, prodajnog naloga, Serijski br" To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također moÅūe koristiti za praćenje jamstvene podatke o proizvodu. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,Za praćenje stavke u prodaji i kupnji dokumenata s batch br
ProÅĄle Industrija: Kemikalije itd To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,Prati ovu Sales fakture protiv bilo Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta Transaction,Transakcija Transaction Date,Transakcija Datum +Transfer,Prijenos Transfer stock from one warehouse to another.,Prijenos dionica iz jednog skladiÅĄta na drugo. Transition Rules,Prijelazna pravila Transporter Info,Transporter Info @@ -2882,6 +2918,7 @@ URL,URL Unable to complete request: ,Nije moguće ispuniti zahtjev: Under AMC,Pod AMC Under Graduate,Pod diplomski +Under Section,Pod Odjela Under Warranty,Pod jamstvo Unit of Measure,Jedinica mjere "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Jedinica za mjerenje ove točke (npr. kg, Jedinica Ne, Par)." @@ -2966,6 +3003,7 @@ Warehouse Type,SkladiÅĄte Tip Warehouse User,SkladiÅĄte Upute Warehouse Users,SkladiÅĄte Korisnika Warehouse where you are maintaining stock of rejected items,SkladiÅĄte gdje ste odrÅūavanju zaliha odbijenih stavki +Warehouse-wise Item Reorder,Warehouse-mudar Stavka redoslijeda Warn,Upozoriti Warning,Upozorenje Warranty / AMC Details,Jamstveni / AMC Brodu @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,MoÅūete stvorit You can enter any date manually,MoÅūete unijeti bilo koji datum ručno You can enter the minimum quantity of this item to be ordered.,MoÅūete unijeti minimalnu količinu ove točke biti naređeno. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,"MoÅūete napraviti biljeÅĄku isporuke iz viÅĄe prodajnih naloga. Odaberite narudÅūbe, jednu po jednu i kliknite na gumb ispod." -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,MoÅūete napraviti redoslijed kupnje iz viÅĄe Kupiti zahtjeva. Odaberite kupnje Zahtjevi jednu po jednu i kliknite na gumb ispod. +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,MoÅūete napraviti redoslijed kupnje od viÅĄe materijala zahtjeva. Odaberite materijalni zahtijevi jedan po jedan i kliknite na gumb ispod. You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,MoÅūete napraviti redoslijed kupnje iz viÅĄe dobavljačima Citati. Odaberite dobavljač Citati jedan po jedan i kliknite na gumb ispod. You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,"MoÅūete napraviti kupnju potvrdu iz viÅĄe narudÅūbenice. Odaberite narudÅūbe, jednu po jednu i kliknite na gumb ispod." You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,MoÅūete postaviti različite 'Properties' za korisnike postaviti zadane vrijednosti i primjenjivati ​​pravila dozvola na temelju vrijednosti tih svojstava u različitim oblicima. You can use Customize Form to set levels on fields.,MoÅūete koristiti Prilagodite obrazac za postavljanje razine na poljima. -You cannot apply for a leave on the following date because it is blocked,"Ne moÅūete podnijeti zahtjev za dopust na sljedeći dan, jer je blokirana" Your Customer's TAX registration numbers (if applicable) or any general information,VaÅĄ klijent je poreznoj registraciji brojevi (ako je primjenjivo) ili bilo opće informacije "Your download is being built, this may take a few moments...","VaÅĄ preuzimanje se gradi, to moÅūe potrajati nekoliko trenutaka ..." Your letter head content in HTML.,VaÅĄe pismo glava sadrÅūaj u HTML. @@ -3231,6 +3268,7 @@ tag,privjesak tags,oznake "target = ""_blank""",target = "_blank" tasks,zadaci +test,test text-height,tekst-visina text-width,tekst ÅĄirine th,og diff --git a/translations/nl.csv b/translations/nl.csv index dc4f8996e9e..6011690588c 100644 --- a/translations/nl.csv +++ b/translations/nl.csv @@ -1,5 +1,5 @@ , - Reason: ,Reden: + (Half Day),(Halve dag) against same operation,tegen dezelfde handeling by Role ,door Rol cannot be 0,mag niet 0 @@ -157,6 +157,7 @@ Activity Log,Activiteitenlogboek Activity Name,Activiteit Naam Activity Type,Activiteit Type Actual,Daadwerkelijk +Actual Amount,Werkelijke bedrag Actual Budget,Werkelijk Begroting Actual Completion Date,Werkelijke Voltooiingsdatum Actual Date,Werkelijke Datum @@ -236,17 +237,13 @@ Against Voucher Type,Tegen Voucher Type Agent,Agent "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","De totale groep van ** Items ** in een andere ** Item **. Dit is handig als u de bundeling van een bepaalde ** Items ** in een pakket en u onderhoudt voorraad van de verpakte ** Items ** en niet de totale ** Item **. Het pakket ** Item ** zal hebben "Is Stock Item" als "No" en "Is Sales Item" als "Ja" Bijvoorbeeld:. Als je verkoopt laptops en Rugzakken apart en hebben een speciale prijs als de klant koopt zowel , dan is de laptop + Rugzak zal een nieuwe Sales BOM Item.Note: BOM = Bill of Materials" Aging Date,Aging Datum -All Active Leads,Alle actieve Leads All Addresses.,Alle adressen. -All Blog Subscribers,Alles Blog Abonnees All Contact,Alle Contact -All Contacts,Alle contactpersonen All Contacts.,Alle contactpersonen. All Customer Contact,Alle Customer Contact -All Customer Contacts,Alle klantcontacten +All Day,All Day All Employee (Active),Alle medewerkers (Actief) All Lead (Open),Alle Lood (Open) -All Leads,Alle Leads All Products or Services.,Alle producten of diensten. All Sales Partner Contact,Alle Sales Partner Contact All Sales Person,Alle Sales Person @@ -436,7 +433,6 @@ Budget Details,Budget Details Budget Distribution,Budget Distributie Budget Distribution Detail,Budget Distributie Detail Budget Distribution Details,Budget Distributie Details -Build Report,Build Report Bulk Email,Bulk Email Bulk Email records.,Bulk Email records. Bundle items at time of sale.,Bundel artikelen op moment van verkoop. @@ -465,6 +461,7 @@ Calculate Tax,Bereken BTW Calculate Taxes and Charges,Bereken en-heffingen Calculate Total Score,Bereken Totaal Score Calendar,Kalender +Calendar Events,Kalender Evenementen Call,Noemen Campaign,Campagne Campaign Name,Campagnenaam @@ -601,6 +598,7 @@ Contact Name,Contact Naam Contact No,Contact Geen Contact No.,Contact No Contact Person,Contactpersoon +Contact Type,Contact Type Contact Us Settings,Neem contact met ons op Instellingen Contact in Future,Contact in de toekomst "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","Contact opties, zoals "Sales Query, ondersteuning Query" etc elk op een nieuwe regel of gescheiden door komma's." @@ -664,6 +662,7 @@ Current Value,Huidige waarde Current status,Actuele status Cust/Supp Address,Cust / Supp Adres Cust/Supp Name,Cust / Supp Naam +Custom,Gewoonte Custom Autoreply Message,Aangepaste Autoreply Bericht Custom CSS,Custom CSS Custom Field,Aangepast veld @@ -879,6 +878,7 @@ Editable,Bewerkbare Educational Qualification,Educatieve Kwalificatie Educational Qualification Details,Educatieve Kwalificatie Details Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi +Eligible Amount,In aanmerking komende bedrag Email,E-mail Email (By company),E-mail (Door bedrijf) Email Digest,E-mail Digest @@ -927,6 +927,7 @@ Encashment Date,Inning Datum End Date,Einddatum End date of current invoice's period,Einddatum van de periode huidige factuur's End of Life,End of Life +Ends on,Eindigt op Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,Voer E-mail Identiteitskaart naar foutrapport verstuurd door users.Eg ontvangen: support@iwebnotes.com Enter Form Type,Voer Form Type Enter Row,Voer Row @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,Inzendin Error,Fout Estimated Material Cost,Geschatte Materiaal Kosten Event,Evenement -Event Date,Evenement Datum Event Individuals,Event Personen -Event Name,Naam van gebeurtenis Event Role,Event Rol Event Roles,Event Rollen -Event Time,Event Time Event Type,Type gebeurtenis Event Updates,Event Updates Event User,Evenement Gebruiker @@ -1046,6 +1044,7 @@ Fixed Asset Account,Fixed Asset account Float,Zweven Float Precision,Float Precision Floral,Bloemen +Following dates are blocked for Leave,Volgende data zijn geblokkeerd voor Verlof "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",Na tafel zal waarden als items zijn sub - gecontracteerde. Deze waarden zullen worden opgehaald van de meester van de "Bill of Materials" van sub - gecontracteerde items. Font,Doopvont Font Size,Lettergrootte @@ -1073,6 +1072,7 @@ For ranges,Voor bereiken For reference,Ter referentie For reference only.,Alleen ter referentie. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen" +Form,Vorm Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,Formaat: uu: mm voorbeeld voor een uur verstrijken ingesteld als 01:00 uur. Max afloop zal 72 uur. Standaard is 24 uur Forum,Forum Fraction,Fractie @@ -1089,7 +1089,9 @@ From PR Date,Van PR Datum From Package No.,Van Pakket No From Table,Uit tabel Frozen,Bevroren +Full Image,Full Image Full Name,Volledige naam +Full description (formatted as markdown),Volledige beschrijving (geformatteerd als afwaardering) Fully Billed,Volledig Gefactureerd Fully Completed,Volledig ingevulde GL Control,GL Controle @@ -1104,7 +1106,7 @@ Gender,Geslacht General,Algemeen General Ledger,Grootboek Generate Description HTML,Genereer Beschrijving HTML -Generate Purchase Requests (MRP) and Production Orders.,Genereer inkoopaanvragen (MRP) en productieorders. +Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Requests (MRP) en productieorders. Generate Salary Slips,Genereer Salaris Slips Generate Schedule,Genereer Plan "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereer pakbonnen voor pakketten te leveren. Gebruikt voor het verpakken aantal, inhoud van de verpakking en het gewicht mee te delen." @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,Negeren Image,Beeld Image View,Afbeelding View +Image for listing (Width: 100px) (Attach First),Afbeelding voor lijst (Breedte: 100px) (Bevestig eerst) +Image for listing (Width: 300px) (Attach First),Afbeelding voor lijst (Breedte: 300px) (Bevestig eerst) Implementation Partner,Implementatie Partner Import,Importeren Import Date Format ,Import Datumnotatie @@ -1391,6 +1395,7 @@ Item Name,Naam van het punt Item Price,Item Prijs Item Prices,Item Prijzen Item Quality Inspection Parameter,Item Kwaliteitscontrole Parameter +Item Reorder,Item opnieuw ordenen Item Serial No,Item Volgnr Item Serial Nos,Item serienummers Item Supplier,Item Leverancier @@ -1470,15 +1475,24 @@ Lead Lost,Lood Verloren Lead Name,Lead Naam Lead Owner,Lood Owner Lead Ref,Lood Ref +Lead Source,Lood Bron +Lead Status,Lead Status Lead Time Date,Lead Tijd Datum Lead Time Days,Lead Time Dagen -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,Levertijd dagen is het aantal dagen waarmee dit artikel wordt verwacht in uw magazijn. Deze dag wordt opgehaald in Purchase Request als u dit item. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Levertijd dagen is het aantal dagen waarmee dit artikel wordt verwacht in uw magazijn. Deze dag wordt opgehaald in Laden en aanvragen als u dit item. Lead Type,Lood Type Leave Allocation,Laat Toewijzing Leave Allocation Tool,Laat Toewijzing Tool Leave Application,Verlofaanvraag Leave Approver,Laat Fiatteur Leave Balance Before Application,Laat Balance Voor het aanbrengen +Leave Block List,Laat Block List +Leave Block List Allow,Laat Block List Laat +Leave Block List Allowed,Laat toegestaan ​​Block List +Leave Block List Date,Laat Block List Datum +Leave Block List Dates,Laat Block List Data +Leave Block List Name,Laat Block List Name +Leave Blocked,Laat Geblokkeerde Leave Control Panel,Laat het Configuratiescherm Leave Encashed?,Laat verzilverd? Leave Encashment Amount,Laat inning Bedrag @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,Laat leeg indien dit voor alle afd Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen Leave blank if considered for all employee types,Laat leeg indien overwogen voor alle werknemer soorten Leave blank if considered for all grades,Laat leeg indien dit voor alle soorten +Leave by,Laat door "Leave can be approved by users with Role, ""Leave Approver""",Laat kan worden goedgekeurd door gebruikers met Role: "Laat Fiatteur" Ledger,Grootboek Left,Links @@ -1525,12 +1540,14 @@ Login Before,Login Voor Login Id,Login Id Login Page,Login Pagina Logout,Afmelden +Long Description,Lange omschrijving Long Text,Lange tekst Lost Reason,Verloren Reden Low,Laag Lower Income,Lager inkomen Lucida Grande,Lucida Grande MIS Control,MIS Controle +MREQ,MREQ MTN Details,MTN Details Mail Footer,Mail Footer Mail Password,Mail Wachtwoord @@ -1591,6 +1608,14 @@ Match Id,Match Id Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen. Material Issue,Materiaal Probleem Material Receipt,Materiaal Ontvangst +Material Request,Materiaal aanvragen +Material Request Date,Materiaal Aanvraagdatum +Material Request Detail No,Materiaal Aanvraag Detail Geen +Material Request For Warehouse,Materiaal Request For Warehouse +Material Request Item,Materiaal aanvragen Item +Material Request Items,Materiaal aanvragen Items +Material Request No,Materiaal aanvragen Geen +Material Request Type,Materiaal Soort aanvraag Material Transfer,Materiaaloverdracht Materials,Materieel Materials Required (Exploded),Benodigde materialen (Exploded) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),Materials Requirement Planning (MRP) Max Attachments,Max Bijlagen Max Days Leave Allowed,Max Dagen Laat toegestaan Max Discount (%),Max Korting (%) +Max. Limit,Max. Beperken "Meaning of Submit, Cancel, Amend","Betekenis van Indienen, Annuleren, wijzigen" Medium,Medium Merge,Samensmelten @@ -1676,14 +1702,15 @@ New Communications,Nieuwe Communications New Delivery Notes,Nieuwe Delivery Notes New Enquiries,Nieuwe Inlichtingen New Leads,Nieuwe leads +New Leave Application,Nieuwe verlofaanvraag New Leaves Allocated,Nieuwe bladeren Toegewezen New Leaves Allocated (In Days),Nieuwe Bladeren Toegewezen (in dagen) +New Material Requests,Nieuw Materiaal Verzoeken New Name,Nieuwe naam New Password,Nieuw wachtwoord New Projects,Nieuwe projecten New Purchase Orders,Nieuwe bestellingen New Purchase Receipts,Nieuwe aankoopbonnen -New Purchase Requests,Nieuwe inkoopaanvragen New Quotations,Nieuwe Citaten New Record,Nieuwe record New Sales Orders,Nieuwe Verkooporders @@ -1863,6 +1890,7 @@ Parent Territory,Parent Territory Parenttype,Parenttype Partially Completed,Gedeeltelijk afgesloten Participants,Deelnemers +Particulars,Bijzonderheden Partly Billed,Deels Gefactureerd Partly Delivered,Deels geleverd Partner,Partner @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc DocType Prevdoc Doctype,Prevdoc Doctype Preview,Voorbeeld Previous Work Experience,Vorige Werkervaring +Price,Prijs Price List,Prijslijst Price List Currency,Prijslijst Valuta Price List Currency Conversion Rate,Prijslijst Currency Conversion Rate @@ -2067,14 +2096,6 @@ Purchase Receipt Items,Aankoopbewijs Items Purchase Receipt Message,Aankoopbewijs Bericht Purchase Receipt No,Aankoopbewijs Geen Purchase Receipt Required,Aankoopbewijs Verplicht -Purchase Request,Aankoop Request -Purchase Request Date,Aankoop Aanvraagdatum -Purchase Request Detail No,Aankoop Aanvraag Detail Geen -Purchase Request For Warehouse,Koop Request For Warehouse -Purchase Request Item,Aankoop Request Item -Purchase Request No,Aankoop Verzoek Geen -Purchase Requisition Details,Inkoopaanvraag Details -Purchase Requisition No,Inkoopaanvraag Geen Purchase Return,Aankoop Return Purchase Returned,Aankoop Returned Purchase Returns,Aankoop retourneren @@ -2122,9 +2143,9 @@ Quotation To,Offerte Voor Quotation no against which this Sales Order is made ,Offerte geen waartegen deze verkooporder wordt gemaakt Quotes to Leads or Customers.,Quotes om leads of klanten. Raise Exception,Raise Uitzondering +Raise Material Request,Raise Materiaal aanvragen +Raise Material Request when stock reaches re-order level,Raise Materiaal aanvragen bij voorraad strekt re-order niveau Raise Production Order,Raise Productieorder -Raise Purchase Request,Raise Purchase Request -Raise Purchase Request when stock reaches re-order level,Raise aankoop verzoek bij voorraad strekt re-order niveau Raised By,Opgevoed door Raised By (Email),Verhoogde Door (E-mail) Random,Toeval @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,Grondstoffen ingevoerd Kosten Re-Calculate Values,Re-waarden berekenen Re-Order Level,Re-Order Level Re-Order Qty,Re-Order Aantal +Re-order,Re-order +Re-order Level,Re-order Level +Re-order Qty,Re-order Aantal Read,Lezen Read Only,Alleen lezen Reading 1,Reading 1 @@ -2261,6 +2285,8 @@ Right,Rechts Role,Rol Role Name,Rolnaam Roles,Rollen +Roles Assigned,Toegewezen Rollen +Roles Assigned To User,Rollen Toegewezen aan gebruiker Roles HTML,Rollen HTML Rounded Total,Afgeronde Totaal Rounded Total (Export),Afgeronde Totaal (Export) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,Selecteer Items uit Delivery Note Select Items from Purchase Order,Selecteer Items uit Purchase Order Select Items from Purchase Receipt,Selecteer Items uit Aankoop Bon Select Items from Sales Order,Selecteer Items uit verkooporder +Select Material Request,Selecteer Materiaal aanvragen Select PR,Selecteer PR +Select Price List for the web. Leave blank to hide price.,Selecteer Prijslijst voor het web. Laat dit veld leeg om de prijs te verbergen. Select Print Format,Selecteer Print Format Select Print Heading,Selecteer Print rubriek -Select Purchase Request,Selecteer Purchase Request Select Report Name,Selecteer Rapportnaam Select Role,Selecteer Rol Select Sales Orders,Selecteer Verkooporders @@ -2423,7 +2450,10 @@ Select Type,Selecteer Type Select User or Property to start.,Selecteer Gebruiker of eigendom te beginnen. Select account head of the bank where cheque was deposited.,Selecteer met het hoofd van de bank waar cheque werd afgezet. Select company name first.,Kies eerst een bedrijfsnaam. +Select dates to create a new ,Kies een datum om een ​​nieuwe te maken Select name of Customer to whom project belongs,Selecteer de naam van de klant aan wie het project behoort +Select or drag across dates to create a new event.,Selecteer of sleep over de data van een nieuwe gebeurtenis te maken. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank","Selecteer verzendkosten magazijn om te laten zien "Op voorraad" of "Niet op voorraad". Te verbergen, laat leeg" Select template from which you want to get the Goals,Selecteer template van waaruit u de Doelen te krijgen Select the Employee for whom you are creating the Appraisal.,Selecteer de werknemer voor wie u het maken van de Beoordeling. Select the currency in which price list is maintained,Selecteer de valuta waarin prijslijst wordt aangehouden @@ -2445,10 +2475,12 @@ Send,Sturen Send Autoreply,Stuur Autoreply Send Email,E-mail verzenden Send From,Stuur Van +Send Invite Email,Uitnodiging verzenden E-mail Send Me A Copy,Stuur mij een kopie "Send Newsletters to your contacts, leads.","Stuur nieuwsbrieven naar uw contacten, leidt." Send SMS,SMS versturen Send To,Verzenden naar +Send To Type,Verzenden naar type "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.",Stuur een e-mail naar de gebruikers van de rol "Materiaal Manager" en "Purchase Manager" als re-order niveau wordt overschreden. Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contacten op Indienen van transacties. "Send bulk SMS to leads, customers, contacts","Stuur bulk SMS naar leads, klanten, contacten" @@ -2515,6 +2547,7 @@ Ship To,Verzendadres Shipping Address,Verzendadres Shipping Address Name,Verzenden Adres Naam Shipping Details,Verzendgegevens +Short Description,Korte beschrijving Short biography for website and other publications.,Korte biografie voor website en andere publicaties. Shortcut,Kortere weg "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Toon "Op voorraad" of "Niet op voorraad" op basis van de beschikbare voorraad in dit magazijn. @@ -2563,6 +2596,7 @@ Standard Rate,Standaard Tarief Start Date,Startdatum Start Report For,Start Rapport Voor Start date of current invoice's period,Begindatum van de periode huidige factuur's +Starts on,Begint op Startup,Startup State,Staat State Name,Staat Naam @@ -2712,6 +2746,7 @@ Test Data,Test Data Test Date,Test Datum Test Email Id,Test E-mail Identiteitskaart Test Link,Test Link +Test Runner,Test Runner Test Select,Test Selecteer Test Text,Test Tekst Test the Newsletter,Test de nieuwsbrief @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,De naam van uw bedrijf / website als u wilt weergeven op de browser titelbalk. Alle pagina's hebben dit als het voorvoegsel om de titel. The net weight of this package. (calculated automatically as sum of net weight of items),Het nettogewicht van dit pakket. (Wordt automatisch berekend als de som van de netto-gewicht van items) The new BOM after replacement,De nieuwe BOM na vervanging -The quantity for the Purchase Request when the stock goes below re-order level.,De hoeveelheid voor de Purchase Request wanneer de voorraad lager is dan re-order niveau. The rate at which Bill Currency is converted into company's base currency,De snelheid waarmee Bill valuta worden omgezet in basis bedrijf munt "The system provides pre-defined roles, but you can add new roles to set finer permissions","Het systeem biedt vooraf gedefinieerde rollen, maar u kunt toevoegen van nieuwe functies aan fijnere machtigingen in te stellen" -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",Het systeem genereert een Purchase Request automatisch wanneer voorraadhoeveelheid gaat onder re-order niveau in entrepot van het type "Stores" of "Gereserveerd Warehouse". The unique id for tracking all recurring invoices. It is generated on submit.,De unieke id voor het bijhouden van alle terugkerende facturen. Het wordt gegenereerd op te dienen. Theme,Thema Then By (optional),Vervolgens op (optioneel) @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,Dit is het n This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Deze tool helpt u bij te werken of vast te stellen de hoeveelheid en waardering van de voorraad in het systeem. Het wordt meestal gebruikt om het systeem waarden te synchroniseren en wat werkelijk bestaat in uw magazijnen. This will be used for setting rule in HR module,Deze wordt gebruikt voor instelling regel HR module Thread HTML,Thread HTML +Thumbnail Image,Kleine afbeelding Thursday,Donderdag Time,Tijd Time Zone,Time Zone @@ -2777,6 +2811,7 @@ To,Naar To Date,To-date houden To Discuss,Om Bespreek To Do,To Do +To Do List,To Do List To DocType,Om Doctype To Field,Om Field To PR Date,Om PR Datum @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,Om een ​​gebruiker van een bepaalde rol te beperken tot documenten die alleen zelfgeschapen. "To set user roles, just go to Setup > Users and click on the user to assign roles.","Om gebruikersrollen in te stellen, ga je gewoon naar > Gebruikers Setup en op de gebruiker Klik om rollen toe te wijzen." To track any installation or commissioning related work after sales,Om een ​​installatie of inbedrijfstelling gerelateerde werk na verkoop bij te houden -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Om merknaam te volgen in de volgende documenten
Levering Let op, Enuiry, Purchase Request, punt, Inkooporder, Aankoopbon, Koper Ontvangst, Offerte, Sales Invoice, Sales BOM, Sales Order, Serienummer" +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Om merknaam te volgen in de volgende documenten
Levering Let op, Enuiry, Materiaal Request, punt, Inkooporder, Aankoopbon, Koper Ontvangst, Offerte, Sales Invoice, Sales BOM, Sales Order, Serienummer" To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Om object in verkoop-en inkoopdocumenten op basis van hun seriÃŦle nos. Dit wordt ook gebruikt om informatie over de garantie van het product volgen. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,"Als u items in verkoop-en inkoopdocumenten volgen met batch nos
Voorkeur Industrie: Chemische stoffen, enz." To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Om items met behulp van barcode te volgen. Je zult in staat zijn om items in leveringsbon en Sales Invoice voer door het scannen van barcodes van item. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,Volg dit Sales Invoice tegen elke P Track this Sales Order against any Project,Volg dit Verkooporder tegen elke Project Transaction,Transactie Transaction Date,Transactie Datum +Transfer,Overdracht Transfer stock from one warehouse to another.,Overdracht bestand van het ene magazijn naar het andere. Transition Rules,Overgang Regels Transporter Info,Transporter Info @@ -2882,6 +2918,7 @@ URL,URL Unable to complete request: ,Kan verzoek niet voltooien: Under AMC,Onder AMC Under Graduate,Onder Graduate +Under Section,Op grond van artikel Under Warranty,Onder de garantie Unit of Measure,Meeteenheid "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Meeteenheid van dit artikel (bijvoorbeeld kg, eenheid, Nee, Pair)." @@ -2966,6 +3003,7 @@ Warehouse Type,Warehouse Type Warehouse User,Magazijn Gebruiker Warehouse Users,Magazijn Gebruikers Warehouse where you are maintaining stock of rejected items,Warehouse waar u het handhaven voorraad van afgewezen artikelen +Warehouse-wise Item Reorder,Warehouse-wise Item opnieuw ordenen Warn,Waarschuwen Warning,Waarschuwing Warranty / AMC Details,Garantie / AMC Details @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,U kunt meer ver You can enter any date manually,U kunt elke datum handmatig You can enter the minimum quantity of this item to be ordered.,U kunt de minimale hoeveelheid van dit product te bestellen. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,U kunt een pakbon van meerdere verkooporders. Selecteer verkooporders een voor een en klikt u op de knop. -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,U kunt een bestelling van meerdere aankoopverzoeken. Selecteer inkoopaanvragen een voor een en klikt u op de knop. +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,U kunt een bestelling van meerdere Materiaal aanvragen. Selecteer Materiaal Verzoeken een voor een en klikt u op de knop. You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,U kunt een bestelling van meerdere Leverancier Quotations. Selecteer Leverancier Offertes een voor een en klikt u op de knop. You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,U kunt een aankoopbewijs van meerdere inkooporders. Selecteer inkooporders een voor een en klikt u op de knop. You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,U kunt verschillende 'eigenschappen' om gebruikers op de standaardwaarden in te stellen en toestemming regels op basis van de waarde van deze eigenschappen in verschillende vormen toe te passen. You can use Customize Form to set levels on fields.,U kunt gebruik maken Customize Form om in te stellen op velden. -You cannot apply for a leave on the following date because it is blocked,"Je kan niet van toepassing zijn voor een verlof op de volgende datum, omdat het is geblokkeerd" Your Customer's TAX registration numbers (if applicable) or any general information,Uw klant fiscale nummers (indien van toepassing) of een algemene informatie "Your download is being built, this may take a few moments...","Uw download wordt gebouwd, kan dit enige tijd duren ..." Your letter head content in HTML.,Uw brief hoofd-inhoud in HTML. @@ -3231,6 +3268,7 @@ tag,label tags,-tags "target = ""_blank""",target = "_blank" tasks,taken +test,test text-height,text-height text-width,text breedte th,e diff --git a/translations/pt.csv b/translations/pt.csv index 2e076bda666..bad33a9ce0f 100644 --- a/translations/pt.csv +++ b/translations/pt.csv @@ -1,5 +1,5 @@ , - Reason: ,Motivo: + (Half Day),(Meio Dia) against same operation,contra a mesma operaçÃĢo by Role ,por FunçÃĢo cannot be 0,nÃĢo pode ser 0 @@ -157,6 +157,7 @@ Activity Log,Registro de Atividade Activity Name,Nome atividade Activity Type,Tipo de Atividade Actual,Real +Actual Amount,Valor Real Actual Budget,Orçamento real Actual Completion Date,Data de conclusÃĢo real Actual Date,Data Real @@ -236,17 +237,13 @@ Against Voucher Type,Tipo contra Vale Agent,Agente "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Grupo agregado de Itens ** ** em outro item **. ** Isso ÃĐ Ãštil se vocÊ estÃĄ empacotando um certo ** ** Itens em um pacote e vocÊ manter o estoque dos itens embalados ** ** e nÃĢo agregar o item **. ** O pacote ** ** item terÃĄ "ÃĐ o item da" como "NÃĢo" e "ÃĐ o item de vendas" como "Sim", por exemplo:. Se vocÊ estÃĄ vendendo laptops e mochilas separadamente e tÊm um preço especial se o cliente compra tanto , entÃĢo o Laptop Backpack + serÃĄ uma nova Vendas BOM Item.Note: BOM = Bill of Materials" Aging Date,Envelhecimento Data -All Active Leads,Todos os eletrodos ativos All Addresses.,Todos os endereços. -All Blog Subscribers,Todos os Assinantes Blog All Contact,Todos Contato -All Contacts,Todos os contatos All Contacts.,Todos os contatos. All Customer Contact,Todos contato do cliente -All Customer Contacts,Todos os contatos de clientes +All Day,Dia de Todos os All Employee (Active),Todos Empregado (Ativo) All Lead (Open),Todos chumbo (Aberto) -All Leads,Todos Leads All Products or Services.,Todos os produtos ou serviços. All Sales Partner Contact,Todos Contato parceiro de vendas All Sales Person,Todos Vendas Pessoa @@ -436,7 +433,6 @@ Budget Details,Detalhes Orçamento Budget Distribution,DistribuiçÃĢo orçamento Budget Distribution Detail,Detalhe DistribuiçÃĢo orçamento Budget Distribution Details,DistribuiçÃĢo Detalhes Orçamento -Build Report,RelatÃģrio de construir Bulk Email,E-mail em massa Bulk Email records.,Volume de registros e-mail. Bundle items at time of sale.,Bundle itens no momento da venda. @@ -465,6 +461,7 @@ Calculate Tax,Calcular o imposto Calculate Taxes and Charges,Calcular Impostos e Taxas Calculate Total Score,Calcular a pontuaçÃĢo total Calendar,CalendÃĄrio +Calendar Events,CalendÃĄrio de Eventos Call,Chamar Campaign,Campanha Campaign Name,Nome da campanha @@ -601,6 +598,7 @@ Contact Name,Nome de Contato Contact No,Contato No Contact No.,Fale NÃĢo. Contact Person,Pessoa de contato +Contact Type,Tipo de Contato Contact Us Settings,Contato ConfiguraçÃĩes Contact in Future,Fale no Futuro "Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","OpçÃĩes de contato, como "consulta de vendas, suporte de consulta" etc cada um em uma nova linha ou separados por vírgulas." @@ -664,6 +662,7 @@ Current Value,Valor Atual Current status,Estado atual Cust/Supp Address,Cust / Supp Endereço Cust/Supp Name,Cust / Supp Nome +Custom,Personalizado Custom Autoreply Message,Mensagem de resposta automÃĄtica personalizada Custom CSS,CSS personalizado Custom Field,Campo personalizado @@ -879,6 +878,7 @@ Editable,EditÃĄvel Educational Qualification,QualificaçÃĢo Educacional Educational Qualification Details,Detalhes educacionais de qualificaçÃĢo Eg. smsgateway.com/api/send_sms.cgi,Por exemplo. smsgateway.com / api / send_sms.cgi +Eligible Amount,Montante elegível Email,E-mail Email (By company),E-mail (por empresa) Email Digest,E-mail Digest @@ -927,6 +927,7 @@ Encashment Date,Data cobrança End Date,Data final End date of current invoice's period,Data final do período de fatura atual End of Life,Fim da Vida +Ends on,Termina em Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,Digite o Id-mail para receber RelatÃģrio de erros enviados por users.Eg: support@iwebnotes.com Enter Form Type,Digite o Tipo de formulÃĄrio Enter Row,Digite Row @@ -949,12 +950,9 @@ Entries are not allowed against this Fiscal Year if the year is closed.,Entradas Error,Erro Estimated Material Cost,Custo de Material estimada Event,Evento -Event Date,Data do Evento Event Individuals,Indivíduos de eventos -Event Name,Nome do Evento Event Role,Papel evento Event Roles,PapÃĐis de eventos -Event Time,Hora do Evento Event Type,Tipo de evento Event Updates,AtualizaçÃĩes de eventos Event User,UsuÃĄrio evento @@ -1046,6 +1044,7 @@ Fixed Asset Account,Conta de ativo fixo Float,Flutuar Float Precision,Flutuante de precisÃĢo Floral,Floral +Following dates are blocked for Leave,Seguintes datas estÃĢo bloqueadas para a licença "Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",ApÃģs tabela mostrarÃĄ valores se os itens sÃĢo sub - contratada. Estes valores serÃĢo obtidos a partir do mestre de "Bill of Materials" de sub - itens contratados. Font,Fonte Font Size,Tamanho da Fonte @@ -1073,6 +1072,7 @@ For ranges,Para faixas For reference,Para referÊncia For reference only.,Apenas para referÊncia. "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes cÃģdigos podem ser usados ​​em formatos de impressÃĢo, como facturas e guias de entrega" +Form,Forma Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,Formato: hh: mm para um exemplo de validade definido como hora 01:00. Max termo serÃĄ de 72 horas. PadrÃĢo ÃĐ de 24 horas Forum,FÃģrum Fraction,FraçÃĢo @@ -1089,7 +1089,9 @@ From PR Date,De PR Data From Package No.,De No. Package From Table,A partir da Tabela Frozen,Congelado +Full Image,Imagem completa Full Name,Nome Completo +Full description (formatted as markdown),DescriçÃĢo completa (formatado como markdown) Fully Billed,Totalmente faturado Fully Completed,Totalmente concluída GL Control,GL Controle @@ -1104,7 +1106,7 @@ Gender,Sexo General,Geral General Ledger,General Ledger Generate Description HTML,Gerar DescriçÃĢo HTML -Generate Purchase Requests (MRP) and Production Orders.,Gerar pedidos de compra (MRP) e ordens de produçÃĢo. +Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e ordens de produçÃĢo. Generate Salary Slips,Gerar folhas de salÃĄrios Generate Schedule,Gerar Agende "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar comprovantes de entrega de pacotes a serem entregues. Usado para notificar nÚmero do pacote, o conteÚdo do pacote e seu peso." @@ -1265,6 +1267,8 @@ If you involve in manufacturing activity
Enables item Is Manufactured, Ignore,Ignorar Image,Imagem Image View,Ver imagem +Image for listing (Width: 100px) (Attach First),Imagem para a listagem (Largura: 100px) (Anexar primeiro) +Image for listing (Width: 300px) (Attach First),Imagem para a listagem (Largura: 300px) (Anexar primeiro) Implementation Partner,Parceiro de implementaçÃĢo Import,Importar Import Date Format ,Formato de data de importaçÃĢo @@ -1391,6 +1395,7 @@ Item Name,Nome do item Item Price,Item Preço Item Prices,Preços de itens Item Quality Inspection Parameter,Item ParÃĒmetro de InspeçÃĢo de Qualidade +Item Reorder,Item Reordenar Item Serial No,No item de sÃĐrie Item Serial Nos,Item n š s de sÃĐrie Item Supplier,Fornecedor item @@ -1470,15 +1475,24 @@ Lead Lost,Levar Perdido Lead Name,Nome levar Lead Owner,Levar ProprietÃĄrio Lead Ref,Chumbo Ref. +Lead Source,Chumbo Fonte +Lead Status,Chumbo Estado Lead Time Date,Chumbo Data Hora Lead Time Days,Levar dias Tempo -Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.,Levar dias Tempo ÃĐ o nÚmero de dias em que este item ÃĐ esperado no seu armazÃĐm. Este dia ÃĐ buscada em Pedido de Compra quando vocÊ selecionar este item. +Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Levar dias Tempo ÃĐ o nÚmero de dias em que este item ÃĐ esperado no seu armazÃĐm. Este dia ÃĐ buscada em solicitar material ao selecionar este item. Lead Type,Chumbo Tipo Leave Allocation,Deixe AlocaçÃĢo Leave Allocation Tool,Deixe Ferramenta de AlocaçÃĢo Leave Application,Deixe AplicaçÃĢo Leave Approver,Deixe Aprovador Leave Balance Before Application,Deixe Equilíbrio Antes da aplicaçÃĢo +Leave Block List,Deixe Lista de Bloqueios +Leave Block List Allow,Deixe Lista de Bloqueios Permitir +Leave Block List Allowed,Deixe Lista de Bloqueios admitidos +Leave Block List Date,Deixe Data Lista de Bloqueios +Leave Block List Dates,Deixe as datas Lista de Bloqueios +Leave Block List Name,Deixe o nome Lista de Bloqueios +Leave Blocked,Deixe Bloqueados Leave Control Panel,Deixe Painel de Controle Leave Encashed?,Deixe cobradas? Leave Encashment Amount,Deixe Quantidade cobrança @@ -1492,6 +1506,7 @@ Leave blank if considered for all departments,Deixe em branco se considerado par Leave blank if considered for all designations,Deixe em branco se considerado para todas as designaçÃĩes Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados Leave blank if considered for all grades,Deixe em branco se considerado para todos os graus +Leave by,Deixe por "Leave can be approved by users with Role, ""Leave Approver""","A licença pode ser aprovado por usuÃĄrios com papel, "Deixe Aprovador"" Ledger,Livro-razÃĢo Left,Esquerda @@ -1525,12 +1540,14 @@ Login Before,Login antes Login Id,Login ID Login Page,PÃĄgina de login Logout,Sair +Long Description,DescriçÃĢo longa Long Text,Texto Longo Lost Reason,RazÃĢo perdido Low,Baixo Lower Income,Baixa Renda Lucida Grande,Lucida Grande MIS Control,MIS Controle +MREQ,Mreq MTN Details,Detalhes da MTN Mail Footer,RodapÃĐ correio Mail Password,Mail Senha @@ -1591,6 +1608,14 @@ Match Id,ID da partida Match non-linked Invoices and Payments.,Combinar nÃĢo vinculados faturas e pagamentos. Material Issue,EmissÃĢo de material Material Receipt,Recebimento de materiais +Material Request,Pedido de material +Material Request Date,Data de SolicitaçÃĢo de material +Material Request Detail No,Detalhe materiais Pedido NÃĢo +Material Request For Warehouse,Pedido de material para ArmazÃĐm +Material Request Item,Item de solicitaçÃĢo de material +Material Request Items,Pedido de itens de material +Material Request No,Pedido de material no +Material Request Type,Tipo de solicitaçÃĢo de material Material Transfer,TransferÊncia de Material Materials,Materiais Materials Required (Exploded),Materiais necessÃĄrios (explodida) @@ -1598,6 +1623,7 @@ Materials Requirement Planning (MRP),Materiais Requirement Planning (MRP) Max Attachments,Anexos Max. Max Days Leave Allowed,Dias Max Deixe admitidos Max Discount (%),Max Desconto (%) +Max. Limit,Max. Limitar "Meaning of Submit, Cancel, Amend","Significado do Submit, Cancelar, Alterar" Medium,MÃĐdio Merge,Fundir @@ -1676,14 +1702,15 @@ New Communications,New Communications New Delivery Notes,Novas notas de entrega New Enquiries,Consultas novo New Leads,Nova leva +New Leave Application,AplicaçÃĢo deixar Nova New Leaves Allocated,Nova Folhas alocado New Leaves Allocated (In Days),Folhas novas atribuído (em dias) +New Material Requests,Novos Pedidos Materiais New Name,Novo nome New Password,Nova senha New Projects,Novos Projetos New Purchase Orders,Novas ordens de compra New Purchase Receipts,Novos recibos de compra -New Purchase Requests,Novos pedidos de compra New Quotations,Novas cotaçÃĩes New Record,Novo Registro New Sales Orders,Novos Pedidos de Vendas @@ -1863,6 +1890,7 @@ Parent Territory,TerritÃģrio pai Parenttype,ParentType Partially Completed,Parcialmente concluída Participants,Participantes +Particulars,Características Partly Billed,Parcialmente faturado Partly Delivered,Entregue em parte Partner,Parceiro @@ -1953,6 +1981,7 @@ Prevdoc DocType,Prevdoc DocType Prevdoc Doctype,Prevdoc Doctype Preview,VisualizaçÃĢo Previous Work Experience,ExperiÊncia anterior de trabalho +Price,Preço Price List,Lista de Preços Price List Currency,Hoje Lista de Preços Price List Currency Conversion Rate,O preço de lista taxa de conversÃĢo @@ -2067,14 +2096,6 @@ Purchase Receipt Items,Comprar Itens Recibo Purchase Receipt Message,Mensagem comprar Recebimento Purchase Receipt No,Compra recibo NÃĢo Purchase Receipt Required,Recibo de compra ObrigatÃģrio -Purchase Request,Pedido de Compra -Purchase Request Date,Data da compra Pedido -Purchase Request Detail No,Detalhe comprar Pedido NÃĢo -Purchase Request For Warehouse,Pedidos de compra do ArmazÃĐm -Purchase Request Item,Comprar item de solicitaçÃĢo -Purchase Request No,Compre Pedir NÃĢo -Purchase Requisition Details,Comprar Detalhes RequisiçÃĢo -Purchase Requisition No,RequisiçÃĢo de compra NÃĢo Purchase Return,Voltar comprar Purchase Returned,Compre Devolvido Purchase Returns,Retorna compra @@ -2122,9 +2143,9 @@ Quotation To,Para citaçÃĢo Quotation no against which this Sales Order is made ,Orçamento sem contra que esta Ordem de vendas ÃĐ feita Quotes to Leads or Customers.,CotaçÃĩes para Leads ou Clientes. Raise Exception,Levante ExceçÃĢo +Raise Material Request,Levante solicitar material +Raise Material Request when stock reaches re-order level,Levante solicitar material quando o estoque atinge novo pedido de nível Raise Production Order,Levante Ordem de ProduçÃĢo -Raise Purchase Request,Levante Pedido de Compra -Raise Purchase Request when stock reaches re-order level,Levante Compra Pedido quando o estoque atinge novo pedido de nível Raised By,Levantadas por Raised By (Email),Levantadas por (e-mail) Random,Acaso @@ -2145,6 +2166,9 @@ Raw Materials Supplied Cost,MatÃĐrias-primas fornecidas Custo Re-Calculate Values,Re-calcular valores Re-Order Level,Re Ordem Nível Re-Order Qty,Re-Ordem Qtde +Re-order,Re-vista +Re-order Level,Re fim-Level +Re-order Qty,Re-vista Qtde Read,Ler Read Only,Somente leitura Reading 1,Leitura 1 @@ -2261,6 +2285,8 @@ Right,Direito Role,Papel Role Name,Nome da FunçÃĢo Roles,FunçÃĩes +Roles Assigned,FunçÃĩes atribuídas +Roles Assigned To User,FunçÃĩes atribuídas ao UsuÃĄrio Roles HTML,FunçÃĩes HTML Rounded Total,Total arredondado Rounded Total (Export),Total arredondado (ExportaçÃĢo) @@ -2407,10 +2433,11 @@ Select Items from Delivery Note,Selecione itens da Nota de Entrega Select Items from Purchase Order,Selecione itens da Ordem de Compra Select Items from Purchase Receipt,Selecione itens de Recibo de compra Select Items from Sales Order,Selecione itens da Ordem de Vendas +Select Material Request,Selecione solicitar material Select PR,Selecionar PR +Select Price List for the web. Leave blank to hide price.,Selecione Lista de Preços para a web. Deixe em branco para ocultar preço. Select Print Format,Selecione Formato de ImpressÃĢo Select Print Heading,Selecione Imprimir título -Select Purchase Request,Selecione Pedido de Compra Select Report Name,Selecione Nome do RelatÃģrio Select Role,Selecione Papel Select Sales Orders,Selecione Pedidos de Vendas @@ -2423,7 +2450,10 @@ Select Type,Selecione o Tipo Select User or Property to start.,Selecione UsuÃĄrio ou propriedade para começar. Select account head of the bank where cheque was deposited.,Selecione cabeça conta do banco onde cheque foi depositado. Select company name first.,Selecione o nome da empresa em primeiro lugar. +Select dates to create a new ,Seleccione datas para criar um novo Select name of Customer to whom project belongs,Selecione o nome do cliente a quem pertence projeto +Select or drag across dates to create a new event.,Selecione ou arraste as datas para criar um novo evento. +"Select shipping warehouse to show ""In Stock"" or ""Out of Stock"". To hide, leave blank","Selecione armazÃĐm de expediçÃĢo para mostrar "Em Stock" ou "fora de estoque". Para esconder, deixar em branco" Select template from which you want to get the Goals,Selecione o modelo a partir do qual vocÊ deseja obter as Metas Select the Employee for whom you are creating the Appraisal.,Selecione o funcionÃĄrio para quem vocÊ estÃĄ criando a AvaliaçÃĢo. Select the currency in which price list is maintained,Selecione a moeda na qual a lista de preços ÃĐ mantida @@ -2445,10 +2475,12 @@ Send,Enviar Send Autoreply,Enviar Autoreply Send Email,Enviar E-mail Send From,Enviar de +Send Invite Email,Enviar convite mail Send Me A Copy,Envie-me uma cÃģpia "Send Newsletters to your contacts, leads.","Enviar Newsletters aos seus contatos, leva." Send SMS,Envie SMS Send To,Enviar para +Send To Type,Enviar para Digite "Send an email to users of role ""Material Manager"" and ""Purchase Manager"" when re-order level is crossed.",Enviar um e-mail para os usuÃĄrios do papel "Gerenciador de Material" e "Gerente de Compras" quando reordenar nível ÃĐ cruzado. Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automÃĄticos para Contatos no Submetendo transaçÃĩes. "Send bulk SMS to leads, customers, contacts","Enviar SMS em massa para leads, clientes, contatos" @@ -2515,6 +2547,7 @@ Ship To,Enviar Para Shipping Address,Endereço para envio Shipping Address Name,Nome Endereço para envio Shipping Details,Detalhes de envio +Short Description,DescriçÃĢo curta Short biography for website and other publications.,Breve biografia para o site e outras publicaçÃĩes. Shortcut,Atalho "Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Show "Em Stock" ou "nÃĢo em estoque", baseado em stock disponível neste armazÃĐm." @@ -2563,6 +2596,7 @@ Standard Rate,Taxa normal Start Date,Data de Início Start Report For,Para começar RelatÃģrio Start date of current invoice's period,A data de início do período de fatura atual +Starts on,Inicia em Startup,Startup State,Estado State Name,Nome Estado @@ -2712,6 +2746,7 @@ Test Data,Dados de Teste Test Date,Data do Teste Test Email Id,Email Id teste Test Link,Testar Link +Test Runner,Test Runner Test Select,Teste Selecione Test Text,Texto de teste Test the Newsletter,Teste a Newsletter @@ -2732,10 +2767,8 @@ The gross weight of the package. Usually net weight + packaging material weight. The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,O nome da sua empresa / site como vocÊ quer que apareça na barra de título do navegador. Todas as pÃĄginas vÃĢo ter isso como o prefixo para o título. The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma de peso líquido dos itens) The new BOM after replacement,O BOM novo apÃģs substituiçÃĢo -The quantity for the Purchase Request when the stock goes below re-order level.,A quantidade para a solicitaçÃĢo de compra quando o estoque vai abaixo reordenar nível. The rate at which Bill Currency is converted into company's base currency,A taxa na qual a moeda que Bill ÃĐ convertida em moeda empresa de base "The system provides pre-defined roles, but you can add new roles to set finer permissions","O sistema fornece papÃĐis prÃĐ-definidos, mas vocÊ pode adicionar novas funçÃĩes para definir as permissÃĩes mais finos" -"The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type ""Stores"" or ""Reserved Warehouse"".",O sistema irÃĄ gerar um pedido de compra automaticamente quando a quantidade de açÃĩes vai abaixo reordenar nível no armazÃĐm do tipo "Lojas" ou "ArmazÃĐm Reservado". The unique id for tracking all recurring invoices. It is generated on submit.,O ID Único para acompanhar todas as facturas recorrentes. Ele ÃĐ gerado em enviar. Theme,Tema Then By (optional),"Em seguida, por (opcional)" @@ -2756,6 +2789,7 @@ This is the number of the last created transaction with this prefix,Este ÃĐ o n This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta ferramenta ajuda a atualizar ou corrigir a quantidade ea valorizaçÃĢo do estoque no sistema. Ele ÃĐ geralmente usado para sincronizar os valores do sistema eo que realmente existe em seus armazÃĐns. This will be used for setting rule in HR module,Isso serÃĄ usado para fixaçÃĢo de regras no mÃģdulo HR Thread HTML,TÃģpico HTML +Thumbnail Image,Imagem Miniatura Thursday,Quinta-feira Time,Tempo Time Zone,Fuso horÃĄrio @@ -2777,6 +2811,7 @@ To,Para To Date,Conhecer To Discuss,Para Discutir To Do,Que fazer +To Do List,Para fazer a lista To DocType,Para DOCTYPE To Field,Para Campo To PR Date,Data de PR @@ -2799,7 +2834,7 @@ To restrict a User of a particular Role to documents that are explicitly assigne To restrict a User of a particular Role to documents that are only self-created.,Para restringir um usuÃĄrio de um papel especial a documentos que sÃĢo apenas auto-criado. "To set user roles, just go to Setup > Users and click on the user to assign roles.","Para definir funçÃĩes de usuÃĄrio, basta ir a ConfiguraçÃĢo> UsuÃĄrios e clique sobre o usuÃĄrio para atribuir funçÃĩes." To track any installation or commissioning related work after sales,Para rastrear qualquer instalaçÃĢo ou comissionamento trabalho relacionado apÃģs vendas -"To track brand name in the following documents
Delivery Note, Enuiry, Purchase Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Para acompanhar marca nos seguintes documentos
Nota de Entrega, Enuiry, Pedido de Compra, Item, Ordem de Compra, comprovante de compra, recebimento Comprador, cotaçÃĢo, nota fiscal de venda, BOM Vendas, Ordem de Vendas, N š de SÃĐrie" +"To track brand name in the following documents
Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Para acompanhar marca nos seguintes documentos
Nota de Entrega, Enuiry, solicitar material, Item, Ordem de Compra, comprovante de compra, recebimento Comprador, cotaçÃĢo, nota fiscal de venda, BOM Vendas, Ordem de Vendas, N š de SÃĐrie" To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus nÚmeros de ordem. Este ÃĐ tambÃĐm pode ser usada para rastrear detalhes sobre a garantia do produto. To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc,Para controlar os itens de vendas e documentos de compra com lotes n š s
IndÚstria preferido: etc Chemicals To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando cÃģdigo de barras. VocÊ serÃĄ capaz de inserir itens na nota de entrega e nota fiscal de venda pela digitalizaçÃĢo de cÃģdigo de barras do item. @@ -2850,6 +2885,7 @@ Track this Sales Invoice against any Project,Acompanhar este factura de venda co Track this Sales Order against any Project,Acompanhar este Ordem de vendas contra qualquer projeto Transaction,TransaçÃĢo Transaction Date,Data TransaçÃĢo +Transfer,Transferir Transfer stock from one warehouse to another.,Transferir o estoque de um depÃģsito para outro. Transition Rules,Regras de transiçÃĢo Transporter Info,InformaçÃĩes Transporter @@ -2882,6 +2918,7 @@ URL,URL Unable to complete request: ,NÃĢo foi possível concluir pedido: Under AMC,Sob AMC Under Graduate,Sob graduaçÃĢo +Under Section,Segundo a SeçÃĢo Under Warranty,Sob Garantia Unit of Measure,Unidade de Medida "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unidade de medida do item (por exemplo kg Unidade, nÃĢo, par)." @@ -2966,6 +3003,7 @@ Warehouse Type,Tipo de armazÃĐm Warehouse User,UsuÃĄrio ArmazÃĐm Warehouse Users,UsuÃĄrios do Warehouse Warehouse where you are maintaining stock of rejected items,ArmazÃĐm onde vocÊ estÃĄ mantendo estoque de itens rejeitados +Warehouse-wise Item Reorder,ArmazÃĐm-sÃĄbio item Reordenar Warn,Avisar Warning,Aviso Warranty / AMC Details,Garantia / AMC Detalhes @@ -3053,12 +3091,11 @@ You can create more earning and deduction type from Setup --> HR,VocÊ pode cria You can enter any date manually,VocÊ pode entrar em qualquer data manualmente You can enter the minimum quantity of this item to be ordered.,VocÊ pode inserir a quantidade mínima deste item a ser ordenada. You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.,"VocÊ pode fazer uma nota de entrega de vÃĄrios pedidos de vendas. Selecione ordens de venda, um por um e clique no botÃĢo abaixo." -You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.,"VocÊ pode fazer uma ordem de compra de pedidos de compras mÚltiplas. Selecione pedidos de compra, um por um e clique no botÃĢo abaixo." +You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.,VocÊ pode fazer um pedido de compra de materiais pedidos mÚltiplos. Selecione pedidos se um por um e clique no botÃĢo abaixo. You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.,"VocÊ pode fazer uma ordem de compra de CitaçÃĩes Fornecedor mÚltiplos. Selecione Quotations Fornecedor, um por um e clique no botÃĢo abaixo." You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.,"VocÊ pode fazer um recibo de compra de vÃĄrias ordens de compra. Selecione as ordens de compra, um por um e clique no botÃĢo abaixo." You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,VocÊ pode definir vÃĄrios 'propriedades' para usuÃĄrios para definir os valores padrÃĢo e aplicar regras de permissÃĢo com base no valor dessas propriedades em vÃĄrias formas. You can use Customize Form to set levels on fields.,VocÊ pode usar Personalizar FormulÃĄrio para definir os níveis em campos. -You cannot apply for a leave on the following date because it is blocked,VocÊ nÃĢo pode aplicar para uma licença na seguinte data porque estÃĄ bloqueado Your Customer's TAX registration numbers (if applicable) or any general information,Seu cliente FISCAIS nÚmeros de inscriçÃĢo (se aplicÃĄvel) ou qualquer outra informaçÃĢo geral "Your download is being built, this may take a few moments...","O seu download estÃĄ sendo construída, isso pode demorar alguns instantes ..." Your letter head content in HTML.,Seu conteÚdo cabeça carta em HTML. @@ -3231,6 +3268,7 @@ tag,etiqueta tags,etiquetas "target = ""_blank""",target = "_blank" tasks,tarefas +test,teste text-height,texto de altura text-width,texto de largura th,Š diff --git a/translations/th.csv b/translations/th.csv new file mode 100644 index 00000000000..b8e32526532 --- /dev/null +++ b/translations/th.csv @@ -0,0 +1,1313 @@ +, + (Half Day),(āļ„āļĢāļķāđˆāļ‡āļ§āļąāļ™) + against same operation,āļāļąāļšāļāļēāļĢāļ”āļģāđ€āļ™āļīāļ™āļ‡āļēāļ™āđ€āļ”āļĩāļĒāļ§āļāļąāļ™ + by Role ,āđ‚āļ”āļĒāļšāļ—āļšāļēāļ— + cannot be 0,āđ„āļĄāđˆāļŠāļēāļĄāļēāļĢāļ–āđ€āļ›āđ‡āļ™ 0 + does not belong to the company: ,āđ„āļĄāđˆāđ„āļ”āđ‰āļ­āļĒāļđāđˆāđƒāļ™ āļšāļĢāļīāļĐāļąāļ— : + has been freezed. \ Only Accounts Manager can do transaction against this account,āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢ freezed \ āđ€āļ‰āļžāļēāļ°āļœāļđāđ‰āļˆāļąāļ”āļāļēāļĢāļšāļąāļāļŠāļĩāļœāļđāđ‰āđƒāļŠāđ‰āļŠāļēāļĄāļēāļĢāļ–āļ—āļģāļ˜āļļāļĢāļāļĢāļĢāļĄāļāļąāļšāļšāļąāļāļŠāļĩāļ™āļĩāđ‰ +" is less than equals to zero in the system, \ valuation rate is mandatory for this item",āļĄāļĩāļ„āđˆāļēāļ™āđ‰āļ­āļĒāļāļ§āđˆāļēāđ€āļ—āđˆāļēāļāļąāļšāļĻāļđāļ™āļĒāđŒāđƒāļ™āļĢāļ°āļšāļšāļ­āļąāļ•āļĢāļēāļĄāļđāļĨāļ„āđˆāļē \ āļĄāļĩāļœāļĨāļšāļąāļ‡āļ„āļąāļšāđƒāļŠāđ‰āļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢāļ™āļĩ​​āđ‰ + is mandatory,āļĄāļĩāļœāļĨāļšāļąāļ‡āļ„āļąāļšāđƒāļŠāđ‰ + is mandatory for GL Entry,āļĄāļĩāļœāļĨāļšāļąāļ‡āļ„āļąāļšāđƒāļŠāđ‰āļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢ GL + is not a ledger,āđ„āļĄāđˆāđ„āļ”āđ‰āđ€āļ›āđ‡āļ™āļšāļąāļâ€‹â€‹āļŠāļĩāđāļĒāļāļ›āļĢāļ°āđ€āļ āļ— + is not active,āđ„āļĄāđˆāđ„āļ”āđ‰āđƒāļŠāđ‰āļ‡āļēāļ™ + is now the default Fiscal Year. \ Please refresh your browser for the change to take effect.,āļ„āļ·āļ­āļ•āļ­āļ™āļ™āļĩāđ‰āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ \ āđ‚āļ›āļĢāļ”āļĢāļĩāđ€āļŸāļĢāļŠāđ€āļšāļĢāļēāļ§āđŒāđ€āļ‹āļ­āļĢāđŒāļ‚āļ­āļ‡āļ„āļļāļ“āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđ€āļ›āļĨāļĩāđˆāļĒāļ™āđāļ›āļĨāļ‡āļ—āļĩāđˆāļˆāļ°āļĄāļĩāļœāļĨ + or the BOM is cancelled or inactive,āļŦāļĢāļ·āļ­ BOM āļ–āļđāļāļĒāļāđ€āļĨāļīāļāļŦāļĢāļ·āļ­āđ„āļĄāđˆāđ„āļ”āđ‰āđƒāļŠāđ‰āļ‡āļēāļ™ + should be same as that in ,āļ„āļ§āļĢāļˆāļ°āđ€āļŠāđˆāļ™āđ€āļ”āļĩāļĒāļ§āļāļąāļšāļ—āļĩāđˆāđƒāļ™ + will become ,āļˆāļ°āļāļĨāļēāļĒāđ€āļ›āđ‡āļ™ +"""Company History""","āļ›āļĢāļ°āļ§āļąāļ•āļī āļšāļĢāļīāļĐāļąāļ— " +"""Team Members"" or ""Management""","āļŠāļĄāļēāļŠāļīāļāļ—āļĩāļĄ" āļŦāļĢāļ·āļ­ "āļˆāļąāļ”āļāļēāļĢ" +# ###.##,# # # #. # # +"#,###",# # # # +"#,###.##",# # # #. # # +"#,###.###",# # # #. # # # +"#,##,###.##",# # # # # #. # # +#.###,#. # # # +"#.###,##",#. # # # # # +% Delivered,āļŠāđˆāļ‡% +% Amount Billed,āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™% āļˆāļģāļ™āļ§āļ™ +% Billed,āļˆāļģāļ™āļ§āļ™% +% Installed,% Installed +% Ordered,āļŠāļąāđˆāļ‡% +% Received,āđ„āļ”āđ‰āļĢāļąāļš% +% of materials billed against this Delivery Note,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™āļāļąāļšāļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļ™āļĩāđ‰ +% of materials billed against this Purchase Order.,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™āļāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļ™āļĩāđ‰ +% of materials billed against this Purchase Receipt,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™āļāļąāļšāđƒāļšāđ€āļŠāļĢāđ‡āļˆāļĢāļąāļšāđ€āļ‡āļīāļ™āļ‹āļ·āđ‰āļ­āļ™āļĩāđ‰ +% of materials billed against this Sales Order,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™āļāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļ™āļĩāđ‰āļ‚āļēāļĒ +% of materials delivered against this Delivery Note,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāļŠāđˆāļ‡āļāļąāļšāļŠāđˆāļ‡āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļ™āļĩāđ‰ +% of materials delivered against this Sales Order,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāļŠāđˆāļ‡āļ•āđˆāļ­āļ™āļĩāđ‰āļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļ‚āļēāļĒ +% of materials ordered against this Purchase Requisition,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļąāļšāđƒāļšāđ€āļšāļīāļāļ™āļĩāđ‰ +% of materials received against this Purchase Order,% āļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļ™āļĩāđ‰ +"' can not be managed using Stock Reconciliation.\ You can add/delete Serial No directly, \ to modify stock of this item.",'āđ„āļĄāđˆāļŠāļēāļĄāļēāļĢāļ–āļˆāļąāļ”āļāļēāļĢāđ„āļ”āđ‰āđ‚āļ”āļĒāđƒāļŠāđ‰āļāļēāļĢāļāļĢāļ°āļ—āļšāļĒāļ­āļ”āļŠāļ•āđ‡āļ­āļ. \ āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āđ€āļžāļīāđˆāļĄ / āļĨāļšāļ­āļ™āļļāļāļĢāļĄāđ„āļĄāđˆāļĄāļĩāđ‚āļ”āļĒāļ•āļĢāļ‡ \ āļāļēāļĢāļ›āļĢāļąāļšāđ€āļ›āļĨāļĩāđˆāļĒāļ™āļŦāļļāđ‰āļ™āļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢāļ™āļĩ​​āđ‰ +' does not exists in ,'āđ„āļĄāđˆāđ„āļ”āđ‰āļ­āļĒāļđāđˆāđƒāļ™ +* Will be calculated in the transaction.,* āļˆāļ°āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļ„āļģāļ™āļ§āļ“āđƒāļ™āļāļēāļĢāļ—āļģāļ˜āļļāļĢāļāļĢāļĢāļĄ +"**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**",āļāļēāļĢāđāļžāļĢāđˆāļāļĢāļ°āļˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ ** ** āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļāļĢāļ°āļˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ‚āļ­āļ‡āļ„āļļāļ“āļ—āļąāđˆāļ§āđ€āļ”āļ·āļ­āļ™āļ–āđ‰āļēāļ„āļļāļ“āļĄāļĩāļĪāļ”āļđāļāļēāļĨāđƒāļ™ business.To āļāļĢāļ°āļˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ‚āļ­āļ‡āļ„āļļāļ“āđ‚āļ”āļĒāđƒāļŠāđ‰āļāļēāļĢāļāļĢāļ°āļˆāļēāļĒāļ™āļĩāđ‰āļŠāļļāļ”āļ™āļĩāđ‰āļāļĢāļ°āļˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ ** ** ** āđƒāļ™āļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™ ** +**Currency** Master,āļŠāļāļļāļĨāđ€āļ‡āļīāļ™ ** ** āđ‚āļ— +**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** āļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āđāļŠāļ”āļ‡āļĢāļ­āļšāļ›āļĩāļšāļąāļāļŠāļĩ āļ—āļļāļāļĢāļēāļĒāļāļēāļĢāļšāļąāļāļŠāļĩāđāļĨāļ°āļāļēāļĢāļ—āļģāļ˜āļļāļĢāļāļĢāļĢāļĄāļ—āļĩāđˆāļŠāļģāļ„āļąāļāļ­āļ·āđˆāļ™ āđ† āļˆāļ°āļĄāļĩāļāļēāļĢāļ•āļīāļ”āļ•āļēāļĄāļāļąāļšāļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ ** ** +0,0 +01,01 +02,02 +03,03 +04,04 +05,05 +06,06 +07,07 +08,08 +09,09 +1,1 +1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,1 āļŠāļāļļāļĨāđ€āļ‡āļīāļ™ = [?] FractionFor āđ€āļŠāđˆāļ™ 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 āđ€āļžāļ·āđˆāļ­āļĢāļąāļāļĐāļēāļĢāļŦāļąāļŠāļĢāļēāļĒāļāļēāļĢāļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļ‰āļĨāļēāļ”āđāļĨāļ°āļˆāļ°āļ—āļģāđƒāļŦāđ‰āļžāļ§āļāđ€āļ‚āļēāļ„āđ‰āļ™āļŦāļēāļ•āļēāļĄāļĢāļŦāļąāļŠāļ‚āļ­āļ‡āļžāļ§āļāđ€āļ‚āļēāđƒāļŠāđ‰āļ•āļąāļ§āđ€āļĨāļ·āļ­āļāļ™āļĩāđ‰ +10,10 +100,100 +11,11 +12,12 +12px,12px +13px,13px +14px,14px +15,15 +15px,15px +16px,16px +2,2 +2 days ago,2 āļ§āļąāļ™āļ—āļĩāđˆāļœāđˆāļēāļ™āļĄāļē +20,20 +25,25 +3,3 +30,30 +35,35 +4,4 +40,40 +45,45 +5,5 +50,50 +55,55 +6,6 +60,60 +65,65 +70,70 +75,75 +80,80 +85,85 +90,90 +95,95 +: It is linked to other active BOM(s),: āļĄāļąāļ™āļˆāļ°āđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡āļāļąāļš BOM āđƒāļŠāđ‰āļ‡āļēāļ™āļ­āļ·āđˆāļ™ āđ† (s) +: Mandatory for a Recurring Invoice.,: āļšāļąāļ‡āļ„āļąāļšāļŠāļģāļŦāļĢāļąāļšāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļ›āļĢāļ°āļˆāļģ +<,< +<=,<= +"To manage Customer Groups, click here","āđƒāļ™āļāļēāļĢāļˆāļąāļ”āļāļēāļĢāļāļĨāļļāđˆāļĄāļĨāļđāļāļ„āđ‰āļēāļ„āļĨāļīāļāļ—āļĩāđˆāļ™āļĩāđˆ" +"Manage Item Groups","āļˆāļąāļ”āļāļēāļĢāļāļĨāļļāđˆāļĄāļŠāļīāļ™āļ„āđ‰āļē" +"To manage Territory, click here","āļāļēāļĢāļˆāļąāļ”āļāļēāļĢāļ”āļīāļ™āđāļ”āļ™āļ„āļĨāļīāļāļ—āļĩāđˆāļ™āļĩāđˆ" +"To manage Territory, click here","āļāļēāļĢāļˆāļąāļ”āļāļēāļĢāļ”āļīāļ™āđāļ”āļ™āļ„āļĨāļīāļāļ—āļĩāđˆāļ™āļĩāđˆ" +"To manage Territory, click here","āļāļēāļĢāļˆāļąāļ”āļāļēāļĢāļ”āļīāļ™āđāļ”āļ™āļ„āļĨāļīāļāļ—āļĩāđˆāļ™āļĩāđˆ" +"\
  • field:[fieldname] - By Field\
  • naming_series: - By Naming Series (field called naming_series must be present\
  • eval:[expression] - Evaluate an expression in python (self is doc)\
  • Prompt - Prompt user for a name\
  • [series] - Series by prefix (separated by a dot); for example PRE.#####\')"">Naming Options","\
  • field:[fieldname] - By Field\
  • naming_series: - By Naming Series (field called naming_series must be present\
  • eval:[expression] - Evaluate an expression in python (self is doc)\
  • Prompt - Prompt user for a name\
  • [series] - Series by prefix (separated by a dot); for example PRE.#####\')"">āļ•āļąāļ§āđ€āļĨāļ·āļ­āļāļāļēāļĢāļ•āļąāđ‰āļ‡āļŠāļ·āđˆāļ­" +Cancel allows you change Submitted documents by cancelling them and amending them.,āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļĒāļāđ€āļĨāļīāļāļāļēāļĢāđ€āļ›āļĨāļĩāđˆāļĒāļ™āđāļ›āļĨāļ‡āđ€āļ­āļāļŠāļēāļĢāļ—āļĩāđˆāļĒāļ·āđˆāļ™āđ‚āļ”āļĒāļāļēāļĢāļĒāļāđ€āļĨāļīāļāļžāļ§āļāđ€āļ‚āļēāđāļĨāļ°āļžāļ§āļāđ€āļ‚āļēāđāļāđ‰ +"To setup, please go to Setup > Naming Series","āđƒāļ™āļāļēāļĢāļ•āļīāļ”āļ•āļąāđ‰āļ‡āđ‚āļ›āļĢāļ”āđ„āļ›āļ—āļĩāđˆāļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļē> āļ•āļąāđ‰āļ‡āļŠāļ·āđˆāļ­āļ‹āļĩāļĢāļĩāļŠāđŒ" +=,= +>,> +>=,> = +A,A +A Customer exists with same name,āļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāļ—āļĩāđˆāļĄāļĩāļŠāļ·āđˆāļ­āđ€āļ”āļĩāļĒāļ§āļāļąāļ™ +A Lead with this email id should exist,āļ•āļ°āļāļąāđˆāļ§āļ—āļĩāđˆāļĄāļĩ id āļ­āļĩāđ€āļĄāļĨāļ™āļĩāđ‰āļ„āļ§āļĢāļĄāļĩāļ­āļĒāļđāđˆ +A Product is shown on the website and is linked to an item.,āļŠāļīāļ™āļ„āđ‰āļēāļ—āļĩāđˆāđāļŠāļ”āļ‡āļšāļ™āđ€āļ§āđ‡āļšāđ„āļ‹āļ•āđŒāđāļĨāļ°āļĄāļĩāļāļēāļĢāđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡āđ„āļ›āļĒāļąāļ‡āļĢāļēāļĒāļāļēāļĢ +"A Product or a Service that is bought, sold or kept in stock.",āļŠāļīāļ™āļ„āđ‰āļēāļŦāļĢāļ·āļ­āļšāļĢāļīāļāļēāļĢāļ—āļĩāđˆāļĄāļĩāļāļēāļĢāļ‹āļ·āđ‰āļ­āļ‚āļēāļĒāļŦāļĢāļ·āļ­āđ€āļāđ‡āļšāđ„āļ§āđ‰āđƒāļ™āļŠāļ•āđ‡āļ­āļ +A Supplier exists with same name,āļœāļđāđ‰āļœāļĨāļīāļ•āļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāļ—āļĩāđˆāļĄāļĩāļŠāļ·āđˆāļ­āđ€āļ”āļĩāļĒāļ§āļāļąāļ™ +A logical Warehouse against which stock entries are made.,āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļ•āļĢāļĢāļāļ°āļāļąāļšāļ—āļĩāđˆāļĢāļēāļĒāļāļēāļĢāļŠāļ•āđ‡āļ­āļāļˆāļ°āļ—āļģ +A new popup will open that will ask you to select further conditions.,āļ›āđŠāļ­āļ›āļ­āļąāļžāđƒāļŦāļĄāđˆāļˆāļ°āđ€āļ›āļīāļ”āļ—āļĩāđˆāļˆāļ°āļ‚āļ­āđƒāļŦāđ‰āļ„āļļāļ“āđ€āļĨāļ·āļ­āļāđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +A symbol for this currency. For e.g. $,āļŠāļąāļāļĨāļąāļāļĐāļ“āđŒāļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ™āļĩāđ‰ āļŠāļģāļŦāļĢāļąāļšāđ€āļŠāđˆāļ™ $ +A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,āļ•āļąāļ§āđāļ—āļ™āļˆāļģāļŦāļ™āđˆāļēāļĒāļ‚āļ­āļ‡āļšāļļāļ„āļ„āļĨāļ—āļĩāđˆāļŠāļēāļĄāļ•āļąāļ§āđāļ—āļ™āļˆāļģāļŦāļ™āđˆāļēāļĒ / / āļ„āļ“āļ°āļāļĢāļĢāļĄāļāļēāļĢāļžāļąāļ™āļ˜āļĄāļīāļ•āļĢ / / āļœāļđāđ‰āļ„āđ‰āļēāļ›āļĨāļĩāļāļ—āļĩāđˆāļ‚āļēāļĒāļœāļĨāļīāļ•āļ āļąāļ“āļ‘āđŒāļ‚āļ­āļ‡ āļšāļĢāļīāļĐāļąāļ— āđƒāļŦāđ‰āļ„āļ“āļ°āļāļĢāļĢāļĄāļēāļ˜āļīāļāļēāļĢ +A user can have multiple values for a property.,āļœāļđāđ‰āđƒāļŠāđ‰āļŠāļēāļĄāļēāļĢāļ–āļĄāļĩāļ„āđˆāļēāļŦāļĨāļēāļĒāļ„āđˆāļēāļŠāļģāļŦāļĢāļąāļšāļŠāļ–āļēāļ™āļ—āļĩāđˆāđƒāļŦāđ‰āļšāļĢāļīāļāļēāļĢ +A+,+ +A-,- +AB+,AB + +AB-,AB- +AMC Expiry Date,āļ§āļąāļ™āļ—āļĩāđˆāļŦāļĄāļ”āļ­āļēāļĒāļļ AMC +ATT,ATT +Abbr,abbr +About,āđ€āļāļĩāđˆāļĒāļ§āļāļąāļš +About Us Settings,āđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāđ€āļĢāļē +About Us Team Member,āđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļŠāļĄāļēāļŠāļīāļāđƒāļ™āļ—āļĩāļĄāđ€āļĢāļē +Above Value,āļŠāļđāļ‡āļāļ§āđˆāļēāļ„āđˆāļē +Absent,āđ„āļĄāđˆāļ­āļĒāļđāđˆ +Acceptance Criteria,āđ€āļāļ“āļ‘āđŒāļāļēāļĢāļĒāļ­āļĄāļĢāļąāļš +Accepted,āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļĒāļ­āļĄāļĢāļąāļš +Accepted Quantity,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāļĒāļ­āļĄāļĢāļąāļš +Accepted Warehouse,āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļĒāļ­āļĄāļĢāļąāļš +Account,āļšāļąāļāļŠāļĩ +Account Balance,āļĒāļ­āļ”āđ€āļ‡āļīāļ™āđƒāļ™āļšāļąāļāļŠāļĩ +Account Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļšāļąāļāļŠāļĩ +Account Head,āļŦāļąāļ§āļŦāļ™āđ‰āļēāļšāļąāļāļŠāļĩ +Account Id,āļŦāļĄāļēāļĒāđ€āļĨāļ‚āļšāļąāļāļŠāļĩāļ—āļĩāđˆ +Account Info,āļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļšāļąāļāļŠāļĩ +Account Name,āļŠāļ·āđˆāļ­āļšāļąāļāļŠāļĩ +Account Type,āļ›āļĢāļ°āđ€āļ āļ—āļšāļąāļāļŠāļĩ +Account: ,āļšāļąāļāļŠāļĩ: +"Accounting entry frozen up to this date, nobody can do / modify entry except authorized person",āļĢāļēāļĒāļāļēāļĢāļšāļąāļāļŠāļĩāđāļŠāđˆāđāļ‚āđ‡āļ‡āļ–āļķāļ‡āļ§āļąāļ™āļ™āļĩāđ‰āđ„āļĄāđˆāļĄāļĩāđƒāļ„āļĢāļŠāļēāļĄāļēāļĢāļ–āļ—āļģ / āđāļāđ‰āđ„āļ‚āļĢāļēāļĒāļāļēāļĢāļĒāļāđ€āļ§āđ‰āļ™āļœāļđāđ‰āļĄāļĩāļ­āļģāļ™āļēāļˆ +Accounting journal entries.,āļĢāļēāļĒāļāļēāļĢāļšāļąāļāļŠāļĩāļ§āļēāļĢāļŠāļēāļĢ +Accounts,āļšāļąāļāļŠāļĩ +Accounts Browser,āđ€āļšāļĢāļēāļ§āđŒāđ€āļ‹āļ­āļĢāđŒāļšāļąāļāļŠāļĩ +Accounts Frozen Upto,āļšāļąāļāļŠāļĩ Frozen āđ€āļāļīāļ™ +Accounts Home,āļŦāļ™āđ‰āļēāđāļĢāļāļšāļąāļāļŠāļĩ +Accounts Payable,āļšāļąāļāļŠāļĩāđ€āļˆāđ‰āļēāļŦāļ™āļĩāđ‰ +Accounts Receivable,āļĨāļđāļāļŦāļ™āļĩāđ‰ +Action,āļāļēāļĢāļāļĢāļ°āļ—āļģ +Action Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļ”āļģāđ€āļ™āļīāļ™āļāļēāļĢ +Action html,html āļ—āļĩāđˆāļāļĢāļ°āļ—āļģ +Active,āļ„āļĨāđˆāļ­āļ‡āđāļ„āļĨāđˆāļ§ +Active: Will extract emails from ,āđƒāļŠāđ‰āļ‡āļēāļ™āļĨāđˆāļēāļŠāļļāļ”: āļˆāļ°āļ”āļķāļ‡āļ­āļĩāđ€āļĄāļĨāļˆāļēāļ +Activity,āļāļīāļˆāļāļĢāļĢāļĄ +Activity Log,āđ€āļ‚āđ‰āļēāļŠāļđāđˆāļĢāļ°āļšāļšāļāļīāļˆāļāļĢāļĢāļĄ +Activity Name,āļŠāļ·āđˆāļ­āļāļīāļˆāļāļĢāļĢāļĄ +Activity Type,āļ›āļĢāļ°āđ€āļ āļ—āļāļīāļˆāļāļĢāļĢāļĄ +Actual,āļ•āļēāļĄāļ„āļ§āļēāļĄāđ€āļ›āđ‡āļ™āļˆāļĢāļīāļ‡ +Actual Amount,āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™āļ—āļĩāđˆāđāļ—āđ‰āļˆāļĢāļīāļ‡ +Actual Budget,āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļˆāļĢāļīāļ‡ +Actual Completion Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļŠāļĢāđ‡āļˆāļŠāļĄāļšāļđāļĢāļ“āđŒāļˆāļĢāļīāļ‡ +Actual Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļˆāļĢāļīāļ‡ +Actual End Date,āļ§āļąāļ™āļ—āļĩāđˆāļŠāļīāđ‰āļ™āļŠāļļāļ”āļˆāļĢāļīāļ‡ +Actual End Time,āđ€āļ§āļĨāļēāļŠāļīāđ‰āļ™āļŠāļļāļ”āļˆāļĢāļīāļ‡ +Actual Qty,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļˆāļĢāļīāļ‡ +Actual Qty (at source/target),āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļˆāļĢāļīāļ‡ (āļ—āļĩāđˆāļĄāļē / āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒ) +Actual Qty After Transaction,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļˆāļĢāļīāļ‡āļŦāļĨāļąāļ‡āļ—āļģāļĢāļēāļĒāļāļēāļĢ +Actual Quantity,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļˆāļĢāļīāļ‡ +Actual Start Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļˆāļĢāļīāļ‡ +Actual Start Time,āđ€āļ§āļĨāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļˆāļĢāļīāļ‡ +Add,āđ€āļžāļīāđˆāļĄ +Add / Edit Taxes and Charges,āđ€āļžāļīāđˆāļĄ / āđāļāđ‰āđ„āļ‚āļ āļēāļĐāļĩāđāļĨāļ°āļ„āđˆāļēāļ˜āļĢāļĢāļĄāđ€āļ™āļĩāļĒāļĄ +Add A New Rule,āđ€āļžāļīāđˆāļĄāļāļŽāđƒāļŦāļĄāđˆ +Add A Property,āđ€āļžāļīāđˆāļĄāļŠāļ–āļēāļ™āļ—āļĩāđˆāđƒāļŦāđ‰āļšāļĢāļīāļāļēāļĢ +Add Attachments,āđ€āļžāļīāđˆāļĄāļŠāļīāđˆāļ‡āļ—āļĩāđˆāđāļ™āļš +Add Bookmark,āđ€āļžāļīāđˆāļĄāļšāļļāđŠāļ„āļĄāļēāļĢāđŒāļ„ +Add CSS,āđ€āļžāļīāđˆāļĄ CSS +Add Column,āđ€āļžāļīāđˆāļĄāļ„āļ­āļĨāļąāļĄāļ™āđŒ +Add Message,āđ€āļžāļīāđˆāļĄāļ‚āđ‰āļ­āļ„āļ§āļēāļĄ +Add New Permission Rule,āđ€āļžāļīāđˆāļĄāļāļŽāļāļēāļĢāļ­āļ™āļļāļāļēāļ•āđƒāļŦāļĄāđˆ +Add Reply,āđ€āļžāļīāđˆāļĄāļ•āļ­āļš +Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.,āđ€āļžāļīāđˆāļĄāļ‚āđ‰āļ­āļ•āļāļĨāļ‡āđāļĨāļ°āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđƒāļ™āļāļēāļĢāļĢāļąāļšāļ‹āļ·āđ‰āļ­ āļ™āļ­āļāļˆāļēāļāļ™āļĩāđ‰āļ„āļļāļ“āļĒāļąāļ‡āļŠāļēāļĄāļēāļĢāļ–āđ€āļ•āļĢāļĩāļĒāļĄāļ„āļ§āļēāļĄāļžāļĢāđ‰āļ­āļĄāļ‚āđ‰āļ­āļāļģāļŦāļ™āļ”āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđāļĨāļ°āļ›āļĢāļīāļāļāļēāđ‚āļ—āđāļĨāļ°āđƒāļŠāđ‰āđāļĄāđˆāđāļšāļš +Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template,āđ€āļžāļīāđˆāļĄāļ‚āđ‰āļ­āļ•āļāļĨāļ‡āđāļĨāļ°āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđƒāļ™āļāļēāļĢāđ€āļšāļīāļāļ‹āļ·āđ‰āļ­ āļ™āļ­āļāļˆāļēāļāļ™āļĩāđ‰āļ„āļļāļ“āļĒāļąāļ‡āļŠāļēāļĄāļēāļĢāļ–āđ€āļ•āļĢāļĩāļĒāļĄāļ„āļ§āļēāļĄāļžāļĢāđ‰āļ­āļĄāļ‚āđ‰āļ­āļāļģāļŦāļ™āļ”āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđāļĨāļ°āļ›āļĢāļīāļāļāļēāđ‚āļ—āđāļĨāļ°āđƒāļŠāđ‰āđāļĄāđˆāđāļšāļš +"Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template",āđ€āļžāļīāđˆāļĄāļ‚āđ‰āļ­āļ•āļāļĨāļ‡āđāļĨāļ°āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđƒāļ™āļāļēāļĢāļ‚āļ­āđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļēāđ€āļŠāđˆāļ™āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āļāļēāļĢāļŠāļģāļĢāļ°āđ€āļ‡āļīāļ™āļ–āļđāļāļ•āđ‰āļ­āļ‡āļ‚āļ­āļ‡āļ‚āđ‰āļ­āđ€āļŠāļ™āļ­āļ—āļĩāđˆāļ„āļļāļ“ āļŊāļĨāļŊ āļ™āļ­āļāļˆāļēāļāļ™āļĩāđ‰āļĒāļąāļ‡āļŠāļēāļĄāļēāļĢāļ–āđ€āļ•āļĢāļĩāļĒāļĄāļ„āļ§āļēāļĄāļžāļĢāđ‰āļ­āļĄāļ‚āđ‰āļ­āļāļģāļŦāļ™āļ”āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđāļĨāļ°āļ›āļĢāļīāļāļāļēāđ‚āļ—āđāļĨāļ°āđƒāļŠāđ‰āđāļĄāđˆāđāļšāļš +Add code as <script>,āđ€āļžāļīāđˆāļĄāļĢāļŦāļąāļŠāđ€āļ›āđ‡āļ™ <script> +Add custom code to forms,āđ€āļžāļīāđˆāļĄāļĢāļŦāļąāļŠāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡āđƒāļ™āļĢāļđāļ›āđāļšāļšāļ—āļĩāđˆ +Add fields to forms,āđ€āļžāļīāđˆāļĄāđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāđāļšāļšāļŸāļ­āļĢāđŒāļĄ +Add headers for standard print formats,āđ€āļžāļīāđˆāļĄāļŦāļąāļ§āļŠāļģāļŦāļĢāļąāļšāļĢāļđāļ›āđāļšāļšāļāļēāļĢāļžāļīāļĄāļžāđŒāļĄāļēāļ•āļĢāļāļēāļ™ +Add or Deduct,āđ€āļžāļīāđˆāļĄāļŦāļĢāļ·āļ­āļŦāļąāļ +Add rows to set annual budgets on Accounts.,āđ€āļžāļīāđˆāļĄāđāļ–āļ§āļ•āļąāđ‰āļ‡āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ›āļĢāļ°āļˆāļģāļ›āļĩāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļšāļąāļāļŠāļĩ +Add to To Do,āđ€āļžāļīāđˆāļĄāļŠāļīāđˆāļ‡āļ—āļĩāđˆāļ•āđ‰āļ­āļ‡āļ—āļģ +Add to To Do List of,āđ€āļžāļīāđˆāļĄāđ„āļ› To Do List āļ‚āļ­āļ‡ +Add/Remove Recipients,Add / Remove āļœāļđāđ‰āļĢāļąāļš +"Add/remove users, set roles, passwords etc",āđ€āļžāļīāđˆāļĄ / āļĨāļšāļœāļđāđ‰āđƒāļŠāđ‰āļšāļ—āļšāļēāļ—āļŠāļļāļ”āļĢāļŦāļąāļŠāļœāđˆāļēāļ™ āļŊāļĨāļŊ +Additional Columns,āļ„āļ­āļĨāļąāļĄāļ™āđŒāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +Additional Conditions,āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +Additional Info,āļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +Additional Tables,āļ•āļēāļĢāļēāļ‡āđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +Address,āļ—āļĩāđˆāļ­āļĒāļđāđˆ +Address & Contacts,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ•āļīāļ”āļ•āđˆāļ­ & +Address Desc,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” +Address Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ—āļĩāđˆāļ­āļĒāļđāđˆ +Address HTML,āļ—āļĩāđˆāļ­āļĒāļđāđˆ HTML +Address Line 1,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļšāļĢāļĢāļ—āļąāļ”āļ—āļĩāđˆ 1 +Address Line 2,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļšāļĢāļĢāļ—āļąāļ”āļ—āļĩāđˆ 2 +Address Line1,Line1 āļ—āļĩāđˆāļ­āļĒāļđāđˆ +Address Line2,Line2 āļ—āļĩāđˆāļ­āļĒāļđāđˆ +Address Title,āļŦāļąāļ§āļ‚āđ‰āļ­āļ—āļĩāđˆāļ­āļĒāļđāđˆ +Address Type,āļ›āļĢāļ°āđ€āļ āļ—āļ‚āļ­āļ‡āļ—āļĩāđˆāļ­āļĒāļđāđˆ +Address and other legal information you may want to put in the footer.,āļ—āļĩāđˆāļ­āļĒāļđāđˆāđāļĨāļ°āļ‚āđ‰āļ­āļĄāļđāļĨāļ—āļēāļ‡āļāļŽāļŦāļĄāļēāļĒāļ­āļ·āđˆāļ™ āđ† āļ—āļĩāđˆāļ„āļļāļ“āļ­āļēāļˆāļ•āđ‰āļ­āļ‡āļāļēāļĢāļ—āļĩāđˆāļˆāļ°āļ™āļģāđƒāļ™āļŠāđˆāļ§āļ™āļ—āđ‰āļēāļĒ +Address to be displayed on the Contact Page,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ—āļĩāđˆāļˆāļ°āļ›āļĢāļēāļāļāļšāļ™āļŦāļ™āđ‰āļēāļ•āļīāļ”āļ•āđˆāļ­ +Adds a custom field to a DocType,āđ€āļžāļīāđˆāļĄāđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡āđ€āļžāļ·āđˆāļ­ DocType +Adds a custom script (client or server) to a DocType,āđ€āļžāļīāđˆāļĄāļŠāļ„āļĢāļīāļ›āļ•āđŒāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ (āđ„āļ„āļĨāđ€āļ­āđ‡āļ™āļ•āđŒāļŦāļĢāļ·āļ­āđ€āļ‹āļīāļĢāđŒāļŸāđ€āļ§āļ­āļĢāđŒ) āđ€āļžāļ·āđˆāļ­ DocType +Advance Amount,āļˆāļģāļ™āļ§āļ™āļĨāđˆāļ§āļ‡āļŦāļ™āđ‰āļē +Advance amount,āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™ +Advanced Scripting,āļāļēāļĢāđ€āļ‚āļĩāļĒāļ™āļŠāļ„āļĢāļīāļ›āļ•āđŒāļ‚āļąāđ‰āļ™āļŠāļđāļ‡ +Advanced Settings,āļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ‚āļąāđ‰āļ™āļŠāļđāļ‡ +Advances,āļ„āļ§āļēāļĄāļāđ‰āļēāļ§āļŦāļ™āđ‰āļē +Advertisement,āļāļēāļĢāđ‚āļ†āļĐāļ“āļē +After Sale Installations,āļŦāļĨāļąāļ‡āļˆāļēāļāļāļēāļĢāļ•āļīāļ”āļ•āļąāđ‰āļ‡āļ‚āļēāļĒ +"After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field",āļŦāļĨāļąāļ‡āļˆāļēāļāļ—āļĩāđˆāļĒāļāđ€āļĨāļīāļāļāļēāļĢāđ€āļšāļīāļāļ‹āļ·āđ‰āļ­āļāļĨāđˆāļ­āļ‡āđ‚āļ•āđ‰āļ•āļ­āļšāļˆāļ°āļ‚āļ­āđƒāļŦāđ‰āļ„āļļāļ“āđ€āļŦāļ•āļļāļœāļĨāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļĒāļāđ€āļĨāļīāļāļ‹āļķāđˆāļ‡āļˆāļ°āļŠāļ°āļ—āđ‰āļ­āļ™āđƒāļŦāđ‰āđ€āļŦāđ‡āļ™āđƒāļ™āļ”āđ‰āļēāļ™āļ™āļĩāđ‰ +Against,āļāļąāļš +Against Account,āļāļąāļšāļšāļąāļāļŠāļĩ +Against Docname,āļāļąāļš Docname +Against Doctype,āļāļąāļš Doctype +Against Document Date,āļāļąāļšāļ§āļąāļ™āļ—āļĩāđˆāđ€āļ­āļāļŠāļēāļĢ +Against Document Detail No,āļāļąāļšāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āđ€āļ­āļāļŠāļēāļĢāđ„āļĄāđˆāļĄāļĩ +Against Document No,āļāļąāļšāđ€āļ­āļāļŠāļēāļĢāđ„āļĄāđˆāļĄāļĩ +Against Expense Account,āļāļąāļšāļšāļąāļāļŠāļĩāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Against Income Account,āļāļąāļšāļšāļąāļāļŠāļĩāļĢāļēāļĒāđ„āļ”āđ‰ +Against Journal Voucher,āļāļąāļšāļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāļ§āļēāļĢāļŠāļēāļĢ +Against Purchase Invoice,āļāļąāļšāđƒāļšāļāļģāļāļąāļšāļ‹āļ·āđ‰āļ­ +Against Sales Invoice,āļāļąāļšāļ‚āļēāļĒāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰ +Against Voucher,āļāļąāļšāļšāļąāļ•āļĢāļāļģāļ™āļąāļĨ +Against Voucher Type,āļāļąāļšāļ›āļĢāļ°āđ€āļ āļ—āļšāļąāļ•āļĢ +Agent,āļ•āļąāļ§āđāļ—āļ™ +"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials",āļāļĨāļļāđˆāļĄāļĢāļ§āļĄāļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢ ** ** āđ€āļ‚āđ‰āļēāđ„āļ›āļ­āļĩāļāļĢāļēāļĒāļāļēāļĢ ** ** āļ™āļĩāđ‰āļˆāļ°āđ€āļ›āđ‡āļ™āļ›āļĢāļ°āđ‚āļĒāļŠāļ™āđŒāļ–āđ‰āļēāļ„āļļāļ“āļāļģāļĨāļąāļ‡ bundling āļĢāļēāļĒāļāļēāļĢ ** ** āļšāļēāļ‡āđ€āļ›āđ‡āļ™āđāļžāļ„āđ€āļāļˆāđāļĨāļ°āļ„āļļāļ“āļĢāļąāļāļĐāļēāļŠāļ•āđ‡āļ­āļāļ‚āļ­āļ‡āļšāļĢāļĢāļˆāļļāļĢāļēāļĒāļāļēāļĢ ** ** āđāļĨāļ°āđ„āļĄāđˆāļĢāļ§āļĄāļĢāļēāļĒāļāļēāļĢ ** ** āđāļžāļ„āđ€āļāļˆāļŠāļīāļ™āļ„āđ‰āļē ** ** āļˆāļ°āļĄāļĩ "āļĢāļēāļĒāļāļēāļĢāļŠāļīāļ™āļ„āđ‰āļē" āļ‚āļ“āļ°āļ—āļĩāđˆ "āđ„āļĄāđˆāļĄāļĩ" āđāļĨāļ° "āļĢāļēāļĒāļāļēāļĢāļ‚āļēāļĒ" āđ€āļ›āđ‡āļ™ "āđƒāļŠāđˆ" āļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡:. āļ–āđ‰āļēāļ„āļļāļ“āļāļģāļĨāļąāļ‡āļ‚āļēāļĒāđāļĨāđ‡āļ›āļ—āđ‡āļ­āļ›āđāļĨāļ°āđ€āļ›āđ‰āļŠāļ°āļžāļēāļĒāļŦāļĨāļąāļ‡āđāļĒāļāđāļĨāļ°āļĄāļĩāļĢāļēāļ„āļēāļžāļīāđ€āļĻāļĐāļŦāļēāļāļĨāļđāļāļ„āđ‰āļēāļ‹āļ·āđ‰āļ­āļ—āļąāđ‰āļ‡ āđāļĨāđ‰āļ§āđāļĨāđ‡āļ›āļ—āđ‡āļ­āļ›āļāļĢāļ°āđ€āļ›āđ‹āļēāđ€āļ›āđ‰āļŠāļ°āļžāļēāļĒāļŦāļĨāļąāļ‡ + āļˆāļ°āļ‚āļēāļĒāđƒāļŦāļĄāđˆ BOM Item.Note: BOM āļšāļīāļĨāļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļ = +Aging Date,Aging āļ§āļąāļ™āļ—āļĩāđˆ +All Addresses.,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Contact,āļ•āļīāļ”āļ•āđˆāļ­āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Contacts.,āļ•āļīāļ”āļ•āđˆāļ­āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Customer Contact,āļ•āļīāļ”āļ•āđˆāļ­āļĨāļđāļāļ„āđ‰āļēāļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Day,āļ§āļąāļ™āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Employee (Active),āļžāļ™āļąāļāļ‡āļēāļ™ (Active) āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Lead (Open),āļ•āļ°āļāļąāđˆāļ§ (āđ€āļ›āļīāļ”) āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Products or Services.,āļœāļĨāļīāļ•āļ āļąāļ“āļ‘āđŒāļŦāļĢāļ·āļ­āļšāļĢāļīāļāļēāļĢ +All Sales Partner Contact,āļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ•āļīāļ”āļ•āđˆāļ­āļžāļąāļ™āļ˜āļĄāļīāļ•āļĢāļāļēāļĢāļ‚āļēāļĒ +All Sales Person,āļ„āļ™āļ‚āļēāļĒāļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,āļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ˜āļļāļĢāļāļĢāļĢāļĄāļāļēāļĢāļ‚āļēāļĒāļŠāļēāļĄāļēāļĢāļ–āļ•āļīāļ”āđāļ—āđ‡āļāļāļąāļšāļŦāļĨāļēāļĒāļ„āļ™ ** āļ‚āļēāļĒ ** āđ€āļžāļ·āđˆāļ­āđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ•āļąāđ‰āļ‡āļ„āđˆāļēāđāļĨāļ°āļ•āļĢāļ§āļˆāļŠāļ­āļšāđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒ +All Supplier Contact,āļ•āļīāļ”āļ•āđˆāļ­āļœāļđāđ‰āļœāļĨāļīāļ•āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.,āđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ§āļąāļ™ inbetween āļœāļđāđ‰āđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāđ€āļĨāļ·āļ­āļāļˆāļēāļāļ§āļąāļ™āļ—āļĩāđˆāđāļĨāļ°āļ§āļąāļ™āļ—āļĩāđˆāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ›āļĢāļ°āļŠāļļāļĄāđ€āļžāļ·āđˆāļ­āļˆāļ°āļĄāļēāđƒāļ™āđāļĄāđˆāđāļšāļšāļ—āļĩāđˆāļĄāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļžāļ™āļąāļāļ‡āļēāļ™ +"All export related fields like currency, conversion rate, export total, export grand total etc are available in
    Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","āļŠāļēāļ‚āļēāļ—āļĩāđˆāđ€āļāļĩāđˆāļĒāļ§āļ‚āđ‰āļ­āļ‡āļ—āļąāđ‰āļ‡āļŦāļĄāļ”āđ€āļŠāđˆāļ™āļāļēāļĢāļŠāđˆāļ‡āļ­āļ­āļāļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ­āļąāļ•āļĢāļēāļāļēāļĢāđāļ›āļĨāļ‡āļĢāļ§āļĄāļāļēāļĢāļŠāđˆāļ‡āļ­āļ­āļ āļŊāļĨāļŊ āļāļēāļĢāļŠāđˆāļ‡āļ­āļ­āļāļĢāļ§āļĄāļ—āļąāđ‰āļ‡āļŠāļīāđ‰āļ™āļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāđƒāļ™
    āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē, POS, āđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļē, āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļāļēāļĢāļ‚āļēāļĒ, āļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒ āļŊāļĨāļŊ" +"All import related fields like currency, conversion rate, import total, import grand total etc are available in
    Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","āļŠāļēāļ‚āļēāļ—āļĩāđˆāđ€āļāļĩāđˆāļĒāļ§āļ‚āđ‰āļ­āļ‡āļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ™āļģāđ€āļ‚āđ‰āļēāđ€āļŠāđˆāļ™āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ­āļąāļ•āļĢāļēāļāļēāļĢāđāļ›āļĨāļ‡āļĢāļ§āļĄāļāļēāļĢāļ™āļģāđ€āļ‚āđ‰āļēāđāļĨāļ°āļ­āļ·āđˆāļ™ āđ† āļ™āļģāđ€āļ‚āđ‰āļēāđāļāļĢāļ™āļ”āđŒāļĢāļ§āļĄāļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāđƒāļ™
    āļĢāļąāļšāļ‹āļ·āđ‰āļ­, āđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļēāļœāļđāđ‰āļœāļĨāļīāļ•, āđƒāļšāļāļģāļāļąāļšāļ‹āļ·āđ‰āļ­, āļ‹āļ·āđ‰āļ­āļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­ āļŊāļĨāļŊ" +All items have already been transferred \ for this Production Order.,āļĢāļēāļĒāļāļēāļĢāļ—āļąāđ‰āļ‡āļŦāļĄāļ”āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāđ‚āļ­āļ™āđāļĨāđ‰āļ§ \ āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļœāļĨāļīāļ•āļ™āļĩāđ‰ +"All possible Workflow States and roles of the workflow.
    Docstatus Options: 0 is""Saved"", 1 is ""Submitted"" and 2 is ""Cancelled""","āļ—āļļāļāļ›āļĢāļ°āđ€āļ—āļĻāļ—āļĩāđˆāđ€āļ›āđ‡āļ™āđ„āļ›āđ„āļ”āđ‰āđ€āļ§āļīāļĢāđŒāļāđ‚āļŸāļĨāļ§āđŒāđāļĨāļ°āļšāļ—āļšāļēāļ—āļ‚āļ­āļ‡āđ€āļ§āļīāļĢāđŒāļāđ‚āļŸāļĨāļ§āđŒ
    Docstatus āļ•āļąāļ§āđ€āļĨāļ·āļ­āļ: 0 āļ–āļđāļ "āļšāļąāļ™āļ—āļķāļ", 1 āļ„āļ·āļ­ "Submitted" āđāļĨāļ° 2 āļ„āļ·āļ­ "āļĒāļāđ€āļĨāļīāļ"" +Allocate,āļˆāļąāļ”āļŠāļĢāļĢ +Allocate leaves for the year.,āļˆāļąāļ”āļŠāļĢāļĢāđƒāļšāļŠāļģāļŦāļĢāļąāļšāļ›āļĩ +Allocated (%),āļāļēāļĢāļˆāļąāļ”āļŠāļĢāļĢ (%) +Allocated Amount,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāļˆāļąāļ”āļŠāļĢāļĢ +Allocated Budget,āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ—āļĩāđˆāļˆāļąāļ”āļŠāļĢāļĢ +Allocated amount,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāļˆāļąāļ”āļŠāļĢāļĢ +Allow Attach,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āđāļ™āļš +Allow Bill of Materials,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰ Bill of Materials +Allow Import,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļ™āļģāđ€āļ‚āđ‰āļē +Allow Import via Data Import Tool,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļ™āļģāđ€āļ‚āđ‰āļēāđ„āļ”āđ‰āļ”āļđāļœāđˆāļēāļ™āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĄāļ·āļ­āļ™āļģāđ€āļ‚āđ‰āļēāļ‚āđ‰āļ­āļĄāļđāļĨ +Allow Negative Balance,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļĒāļ­āļ”āļ„āļ‡āđ€āļŦāļĨāļ·āļ­āļ•āļīāļ”āļĨāļš +Allow Negative Stock,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļŠāļ•āđ‡āļ­āļāđ€āļŠāļīāļ‡āļĨāļš +Allow Production Order,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļœāļĨāļīāļ• +Allow Rename,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āđ€āļ›āļĨāļĩāđˆāļĒāļ™āļŠāļ·āđˆāļ­ +Allow Samples,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡ +Allow User,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰ +Allow Users,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āļ‡āļēāļ™ +Allow on Submit,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļŠāđˆāļ‡ +Allow the following users to approve Leave Applications for block days.,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āļ•āđˆāļ­āđ„āļ›āđ€āļžāļ·āđˆāļ­āļ‚āļ­āļ­āļ™āļļāļĄāļąāļ•āļīāļāļēāļĢāđƒāļŠāđ‰āļ‡āļēāļ™āļ­āļ­āļāļ§āļąāļ™āļšāļĨāđ‡āļ­āļ +Allow the following users to make Leave Applications for block days.,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āļ•āđˆāļ­āđ„āļ›āļ—āļĩāđˆāļˆāļ°āļ—āļģāđƒāļŦāđ‰āļāļēāļĢāđƒāļŠāđ‰āļ‡āļēāļ™āļ­āļ­āļāļ§āļąāļ™āļšāļĨāđ‡āļ­āļ +Allow this price in purchase related forms,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļĢāļēāļ„āļēāđƒāļ™āļĢāļđāļ›āđāļšāļšāļ—āļĩāđˆāđ€āļāļĩāđˆāļĒāļ§āļ‚āđ‰āļ­āļ‡āļāļēāļĢāļ‹āļ·āđ‰āļ­āļ™āļĩāđ‰ +Allow this price in sales related forms,āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļĢāļēāļ„āļēāđƒāļ™āļĢāļđāļ›āđāļšāļšāļ—āļĩāđˆāđ€āļāļĩāđˆāļĒāļ§āļ‚āđ‰āļ­āļ‡āļāļēāļĢāļ‚āļēāļĒāļ™āļĩāđ‰ +Allow user to login only after this hour (0-24),āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āđ€āļ‚āđ‰āļēāļŠāļđāđˆāļĢāļ°āļšāļšāđ€āļ—āđˆāļēāļ™āļąāđ‰āļ™āļŦāļĨāļąāļ‡āļˆāļēāļāļŠāļąāđˆāļ§āđ‚āļĄāļ‡āļ™āļĩāđ‰ (0-24) +Allow user to login only before this hour (0-24),āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āđ€āļ‚āđ‰āļēāļŠāļđāđˆāļĢāļ°āļšāļšāļāđˆāļ­āļ™āļ—āļĩāđˆāļˆāļ°āļŠāļąāđˆāļ§āđ‚āļĄāļ‡āļ™āļĩāđ‰ (0-24) +Allowance Percent,āļĢāđ‰āļ­āļĒāļĨāļ°āļ„āđˆāļēāđ€āļœāļ·āđˆāļ­ +Allowed,āļ­āļ™āļļāļāļēāļ• +Amend,āđāļāđ‰āđ„āļ‚ +Amended From,āđāļāđ‰āđ„āļ‚āđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +Amendment Date,āļ§āļąāļ™āļ—āļĩāđˆāđāļāđ‰āđ„āļ‚ +Amount,āļˆāļģāļ™āļ§āļ™ +Amount <=,āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™āļ—āļĩāđˆ <= +Amount >=,āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™āļ—āļĩāđˆ> = +Amount*,* āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™ +"An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]","file icon āļĄāļĩ. āļ‚āļĒāļēāļĒ ICO āļ„āļ§āļĢāļˆāļ°āļ‚āļ™āļēāļ” 16 x 16 px āļŠāļĢāđ‰āļēāļ‡āļ‚āļķāđ‰āļ™āđ‚āļ”āļĒāđƒāļŠāđ‰āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļāļģāđ€āļ™āļīāļ”āđ„āļŸāļŸāđ‰āļē favicon [ favicon-generator.org ]" +Analytics,Analytics +Answer,āļ•āļ­āļš +"Any other comments, noteworthy effort that should go in the records.",āļ„āļ§āļēāļĄāđ€āļŦāđ‡āļ™āļ­āļ·āđˆāļ™ āđ† āļ„āļ§āļēāļĄāļžāļĒāļēāļĒāļēāļĄāļ—āļĩāđˆāļ™āđˆāļēāļŠāļąāļ‡āđ€āļāļ•āļ§āđˆāļēāļ„āļ§āļĢāļˆāļ°āđ„āļ›āđƒāļ™āļšāļąāļ™āļ—āļķāļ +Applicable Holiday List,āļĢāļēāļĒāļāļēāļĢāļ§āļąāļ™āļŦāļĒāļļāļ”āļ—āļĩāđˆāđƒāļŠāđ‰āļšāļąāļ‡āļ„āļąāļš +Applicable To (Designation),āļ—āļĩāđˆāđƒāļŠāđ‰āļšāļąāļ‡āļ„āļąāļšāļāļąāļš (āļˆāļļāļ”) +Applicable To (Employee),āļ—āļĩāđˆāđƒāļŠāđ‰āļšāļąāļ‡āļ„āļąāļšāļāļąāļš (āļžāļ™āļąāļāļ‡āļēāļ™) +Applicable To (Role),āļ—āļĩāđˆāđƒāļŠāđ‰āļšāļąāļ‡āļ„āļąāļšāļāļąāļš (Role) +Applicable To (User),āļ—āļĩāđˆāđƒāļŠāđ‰āļšāļąāļ‡āļ„āļąāļšāļāļąāļš (User) +Applicable only if valuation method is moving average,āļŠāļēāļĄāļēāļĢāļ–āļ™āļģāđ„āļ›āđƒāļŠāđ‰āđ„āļ”āđ‰āđ€āļ‰āļžāļēāļ°āđƒāļ™āļāļĢāļ“āļĩāļ—āļĩāđˆāļ§āļīāļ˜āļĩāļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āđ€āļ›āđ‡āļ™āļ„āđˆāļēāđ€āļ‰āļĨāļĩāđˆāļĒāđ€āļ„āļĨāļ·āđˆāļ­āļ™āļ—āļĩāđˆ +Applicant Name,āļŠāļ·āđˆāļ­āļœāļđāđ‰āļĒāļ·āđˆāļ™āļ„āļģāļ‚āļ­ +Applicant for a Job,āļ‚āļ­āļĢāļąāļšāļ‡āļēāļ™ +Applicant for a Job (extracted from jobs email).,āļœāļđāđ‰āļ‚āļ­āļĢāļąāļšāļāļēāļĢāļ—āļģāļ‡āļēāļ™ (āļŠāļāļąāļ”āļˆāļēāļāļ­āļĩāđ€āļĄāļĨāļ‡āļēāļ™) +Applications for leave.,āđ‚āļ›āļĢāđāļāļĢāļĄāļ›āļĢāļ°āļĒāļļāļāļ•āđŒāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļĨāļē +Applies to Company,āļ™āļģāđ„āļ›āđƒāļŠāđ‰āļāļąāļš āļšāļĢāļīāļĐāļąāļ— +Apply / Approve Leaves,āđƒāļŠāđ‰ / āļ­āļ™āļļāļĄāļąāļ•āļīāđƒāļš +Appraisal,āļāļēāļĢāļ•āļĩāļĢāļēāļ„āļē +Appraisal Goal,āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒāļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™ +Appraisal Goals,āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒāļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™ +Appraisal Template,āđāļĄāđˆāđāļšāļšāļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™ +Appraisal Template Goal,āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒāđ€āļ—āļĄāđ€āļžāļĨāļ—āļ›āļĢāļ°āđ€āļĄāļīāļ™ +Appraisal Template Title,āļŦāļąāļ§āļ‚āđ‰āļ­āđāļĄāđˆāđāļšāļšāļ›āļĢāļ°āđ€āļĄāļīāļ™ +Approval Status,āļŠāļ–āļēāļ™āļ°āļāļēāļĢāļ­āļ™āļļāļĄāļąāļ•āļī +Approved,āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļ­āļ™āļļāļĄāļąāļ•āļī +Approver,āļ­āļ™āļļāļĄāļąāļ•āļī +Approving Role,āļ­āļ™āļļāļĄāļąāļ•āļīāļšāļ—āļšāļēāļ— +Approving User,āļ­āļ™āļļāļĄāļąāļ•āļīāļœāļđāđ‰āđƒāļŠāđ‰ +Are you sure you want to delete the attachment?,āļ„āļļāļ“āđāļ™āđˆāđƒāļˆāļŦāļĢāļ·āļ­āļ§āđˆāļēāļ•āđ‰āļ­āļ‡āļāļēāļĢāļĨāļšāļŠāļīāđˆāļ‡āļ—āļĩāđˆāđāļ™āļšāļĄāļē? +Arial,Arial +Arrear Amount,āļˆāļģāļ™āļ§āļ™ Arrear +"As a best practice, do not assign the same set of permission rule to different Roles instead set multiple Roles to the User",āđ€āļ›āđ‡āļ™āļ§āļīāļ˜āļĩāļ—āļĩāđˆāļ”āļĩāļ—āļĩāđˆāļŠāļļāļ”āđ„āļĄāđˆāđ„āļ”āđ‰āļāļģāļŦāļ™āļ”āļŠāļļāļ”āđ€āļ”āļĩāļĒāļ§āļāļąāļ™āļ‚āļ­āļ‡āļāļŽāļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļšāļ—āļšāļēāļ—āļ—āļĩāđˆāđāļ•āļāļ•āđˆāļēāļ‡āļāļąāļ™āđāļ—āļ™āļ—āļĩāđˆāļˆāļ°āļ•āļąāđ‰āļ‡āļŦāļĨāļēāļĒāļšāļ—āļšāļēāļ—āđƒāļŦāđ‰āļāļąāļšāļœāļđāđ‰āđƒāļŠāđ‰ +As existing qty for item: ,āđ€āļ›āđ‡āļ™āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢ: +As per Stock UOM,āđ€āļ›āđ‡āļ™āļ•āđˆāļ­āļŠāļ•āđ‡āļ­āļ UOM +Ascending,Ascending +Assign To,āļāļģāļŦāļ™āļ”āđƒāļŦāđ‰ +Assigned By,āđ„āļ”āđ‰āļĢāļąāļšāļĄāļ­āļšāļŦāļĄāļēāļĒāļˆāļēāļ +Associate a DocType to the Print Format,āđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡ DocType āļĢāļđāļ›āđāļšāļšāļāļēāļĢāļžāļīāļĄāļžāđŒ +Atleast one warehouse is mandatory,āļ­āļĒāđˆāļēāļ‡āļ™āđ‰āļ­āļĒāļŦāļ™āļķāđˆāļ‡āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļĄāļĩāļœāļĨāļšāļąāļ‡āļ„āļąāļšāđƒāļŠāđ‰ +Attach,āđāļ™āļš +Attach Document Print,āđāļ™āļšāđ€āļ­āļāļŠāļēāļĢāļžāļīāļĄāļžāđŒ +Attachments,āļŠāļīāđˆāļ‡āļ—āļĩāđˆāđāļ™āļšāļĄāļē +Attempted to Contact,āļžāļĒāļēāļĒāļēāļĄāļ—āļĩāđˆāļˆāļ°āļ•āļīāļ”āļ•āđˆāļ­ +Attendance,āļāļēāļĢāļ”āļđāđāļĨāļĢāļąāļāļĐāļē +Attendance Control Panel,āđāļœāļ‡āļ„āļ§āļšāļ„āļļāļĄāļāļēāļĢāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ›āļĢāļ°āļŠāļļāļĄ +Attendance Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄ +Attendance Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ›āļĢāļ°āļŠāļļāļĄ +Attendance From Date,āļœāļđāđ‰āđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļˆāļēāļāļ§āļąāļ™āļ—āļĩāđˆ +Attendance To Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ›āļĢāļ°āļŠāļļāļĄāđ€āļžāļ·āđˆāļ­ +Attendance record.,āļšāļąāļ™āļ—āļķāļāļāļēāļĢāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ›āļĢāļ°āļŠāļļāļĄ +Attributions,āđ€āļŦāļ•āļļāļœāļĨ +Authorization Control,āļ„āļ§āļšāļ„āļļāļĄāļāļēāļĢāļ­āļ™āļļāļĄāļąāļ•āļī +Authorization Rule,āļāļŽāļāļēāļĢāļ­āļ™āļļāļāļēāļ• +Authorized Role (Frozen Entry),āļšāļ—āļšāļēāļ—āļ­āļģāļ™āļēāļˆ (Entry āđāļŠāđˆāđāļ‚āđ‡āļ‡) +Authourized Role (Frozen Entry),āļšāļ—āļšāļēāļ— Authourized (Entry āđāļŠāđˆāđāļ‚āđ‡āļ‡) +Auto Email Id,āļĢāļŦāļąāļŠāļ­āļĩāđ€āļĄāļĨāđŒāļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļī +Auto Name,āļŠāļ·āđˆāļ­āļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļī +Auto generated,āļ­āļ­āđ‚āļ•āđ‰āļŠāļĢāđ‰āļēāļ‡ +Automatically updated via Stock Entry of type Manufacture/Repack,āļ›āļĢāļąāļšāļ›āļĢāļļāļ‡āđ‚āļ”āļĒāļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļīāļœāđˆāļēāļ™āļ—āļēāļ‡āļĢāļēāļĒāļāļēāļĢāđƒāļ™āļŠāļ•āđ‡āļ­āļāļāļēāļĢāļœāļĨāļīāļ•āļ›āļĢāļ°āđ€āļ āļ— / Repack +Autoreply when a new mail is received,autoreply āđ€āļĄāļ·āđˆāļ­āļĄāļĩāļ­āļĩāđ€āļĄāļĨāđƒāļŦāļĄāđˆāđ„āļ”āđ‰āļĢāļąāļš +Available Qty at Warehouse,āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļē +"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","āļ—āļĩāđˆāļĄāļĩāļˆāļģāļŦāļ™āđˆāļēāļĒāđƒāļ™ BOM, āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ‹āļ·āđ‰āļ­āļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļœāļĨāļīāļ•āļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­, āļĢāļąāļšāļ‹āļ·āđ‰āļ­, āļ‚āļēāļĒāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰, āļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļ‚āļēāļĒāļĢāļēāļĒāļāļēāļĢāļŠāļ•āđ‡āļ­āļ, Timesheet" +Average Discount,āļŠāđˆāļ§āļ™āļĨāļ”āđ€āļ‰āļĨāļĩāđˆāļĒ +B,B +B+,B + +B-,B- +BILL,BILL +BILLJ,BILLJ +BOM,BOM +BOM Detail No,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” BOM āđ„āļĄāđˆāļĄāļĩ +BOM Explosion Item,āļĢāļēāļĒāļāļēāļĢāļĢāļ°āđ€āļšāļīāļ” BOM +BOM Item,āļĢāļēāļĒāļāļēāļĢ BOM +BOM No,BOM āđ„āļĄāđˆāļĄāļĩ +BOM No. for a Finished Good Item,āļŦāļĄāļēāļĒāđ€āļĨāļ‚ BOM āļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāļ”āļĩāļŠāļģāđ€āļĢāđ‡āļˆāļĢāļđāļ› +BOM Operation,āļāļēāļĢāļ”āļģāđ€āļ™āļīāļ™āļ‡āļēāļ™ BOM +BOM Operations,āļāļēāļĢāļ”āļģāđ€āļ™āļīāļ™āļ‡āļēāļ™ BOM +BOM Replace Tool,āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĄāļ·āļ­āđāļ—āļ™āļ—āļĩāđˆ BOM +BOM replaced,BOM āđāļ—āļ™āļ—āļĩāđˆ +Background Color,āļŠāļĩāļžāļ·āđ‰āļ™āļŦāļĨāļąāļ‡ +Background Image,āļ āļēāļžāļžāļ·āđ‰āļ™āļŦāļĨāļąāļ‡ +Background shade of the top menu bar,āļŠāļĩāļžāļ·āđ‰āļ™āļŦāļĨāļąāļ‡āļ‚āļ­āļ‡āđāļ–āļšāđ€āļĄāļ™āļđāļ”āđ‰āļēāļ™āļšāļ™ +Bank,āļ˜āļ™āļēāļ„āļēāļĢ +Bank A/C No.,āļ˜āļ™āļēāļ„āļēāļĢ / āđ€āļĨāļ‚āļ—āļĩāđˆ C +Bank Account,āļšāļąāļāļŠāļĩāđ€āļ‡āļīāļ™āļāļēāļ +Bank Account No.,āđ€āļĨāļ‚āļ—āļĩāđˆāļšāļąāļāļŠāļĩāļ˜āļ™āļēāļ„āļēāļĢ +Bank Balance,āđāļĨāļ°āļŦāļ™āļĩāđ‰āļŠāļīāļ™āļ˜āļ™āļēāļ„āļēāļĢāđāļŦāđˆāļ‡ +Bank Name,āļŠāļ·āđˆāļ­āļ˜āļ™āļēāļ„āļēāļĢ +Bank Reconciliation,āļāļĢāļ°āļ—āļšāļĒāļ­āļ”āļ˜āļ™āļēāļ„āļēāļĢ +Bank Reconciliation Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļāļĢāļ°āļ—āļšāļĒāļ­āļ”āļ˜āļ™āļēāļ„āļēāļĢ +Bank Voucher,āļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāļ˜āļ™āļēāļ„āļēāļĢ +Bank or Cash,āļ˜āļ™āļēāļ„āļēāļĢāļŦāļĢāļ·āļ­āđ€āļ‡āļīāļ™āļŠāļ” +Banner,āļ˜āļ‡ +Banner HTML,HTML āđāļšāļ™āđ€āļ™āļ­āļĢāđŒ +Barcode,āļšāļēāļĢāđŒāđ‚āļ„āđ‰āļ” +Based On,āļ‚āļķāđ‰āļ™āļ­āļĒāļđāđˆāļāļąāļš +Based on,āļˆāļēāļ +Basic Info,āļ‚āđ‰āļ­āļĄāļđāļĨāļžāļ·āđ‰āļ™āļāļēāļ™ +Basic Information,āļ‚āđ‰āļ­āļĄāļđāļĨāļžāļ·āđ‰āļ™āļāļēāļ™ +Basic Rate,āļ­āļąāļ•āļĢāļēāļ‚āļąāđ‰āļ™āļžāļ·āđ‰āļ™āļāļēāļ™ +Basic Rate*,* āļ­āļąāļ•āļĢāļēāļ‚āļąāđ‰āļ™āļžāļ·āđ‰āļ™āļāļēāļ™ +Batch,āļŠāļļāļ” +Batch (lot) of an Item.,āđāļšāļ—āļŠāđŒ (āļĄāļēāļ) āļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢ +Batch Finished Date,āļŠāļļāļ”āļŠāļģāđ€āļĢāđ‡āļˆāļĢāļđāļ›āļ§āļąāļ™āļ—āļĩāđˆ +Batch ID,ID āļŠāļļāļ” +Batch No,āļŠāļļāļ”āđ„āļĄāđˆāļĄāļĩ +Batch Started Date,āļŠāļļāļ”āđ€āļĢāļīāđˆāļĄāļ§āļąāļ™āļ—āļĩāđˆ +Begin this page with a slideshow of images,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļŦāļ™āđ‰āļēāļ™āļĩāđ‰āđƒāļŦāđ‰āļāļąāļšāļŠāđ„āļĨāļ”āđŒāđ‚āļŠāļ§āđŒāļˆāļēāļāļ āļēāļž +Better Prospects,āļ­āļ™āļēāļ„āļ•āļ—āļĩāđˆāļ”āļĩāļāļ§āđˆāļē +Bill Date,āļ§āļąāļ™āļ—āļĩāđˆāļšāļīāļĨ +Bill No,āđ„āļĄāđˆāļĄāļĩāļšāļīāļĨ +Bill of Material to be considered for manufacturing,āļšāļīāļĨāļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāļˆāļ°āļ•āđ‰āļ­āļ‡āļžāļīāļˆāļēāļĢāļ“āļēāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļœāļĨāļīāļ• +Bill of Materials,āļšāļīāļĨāļ‚āļ­āļ‡āļ§āļąāļŠāļ”āļļ +Bill of Materials (BOM),āļšāļīāļĨāļ§āļąāļŠāļ”āļļ (BOM) +Billed,āđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™ +Billed Amt,āļˆāļģāļ™āļ§āļ™āļˆāļģāļ™āļ§āļ™āļĄāļēāļāļ—āļĩāđˆāļŠāļļāļ” +Billed Quantity,āļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™āļ—āļĩāđˆāđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļš +Billing Status,āļŠāļ–āļēāļ™āļ°āļāļēāļĢāđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™ +Bills raised by Suppliers.,āļ•āļąāđ‹āļ§āđ€āļ‡āļīāļ™āļĒāļāđ‚āļ”āļĒāļ‹āļąāļžāļžāļĨāļēāļĒāđ€āļ­āļ­āļĢāđŒ +Bills raised to Customers.,āļ•āļąāđ‹āļ§āđ€āļ‡āļīāļ™āļĒāļāđƒāļŦāđ‰āļāļąāļšāļĨāļđāļāļ„āđ‰āļē +Bin,āļ–āļąāļ‡ +Bio,āđ„āļšāđ‚āļ­ +Birth Date,āļ§āļąāļ™āđ€āļāļīāļ” +Black,āļŠāļĩāļ”āļģ +Blob,āļŦāļĒāļ” +Block Date,āļšāļĨāđ‡āļ­āļāļ§āļąāļ™āļ—āļĩāđˆ +Block Days,āļ§āļąāļ™āļ—āļĩāđˆāļ–āļđāļāļšāļĨāđ‡āļ­āļ +Block Holidays on important days.,āļ›āļīāļ”āļāļąāđ‰āļ™āļŦāļĒāļļāļ”āđƒāļ™āļ§āļąāļ™āļŠāļģāļ„āļąāļ +Block leave applications by department.,āļ›āļīāļ”āļāļąāđ‰āļ™āļāļēāļĢāđƒāļŠāđ‰āļ‡āļēāļ™āļ­āļ­āļāđ‚āļ”āļĒāļāļĢāļĄ +Blog,āļšāļĨāđ‡āļ­āļ +Blog Subscriber,āļŠāļĄāļēāļŠāļīāļāļšāļĨāđ‡āļ­āļ +Blog entry.,āļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļ +Blood Group,āļāļĢāļļāđŠāļ›āđ€āļĨāļ·āļ­āļ” +Bookmarks,āļ—āļĩāđˆāļ„āļąāđˆāļ™āļŦāļ™āđ‰āļē +Branch,āļŠāļēāļ‚āļē +Brand,āļĒāļĩāđˆāļŦāđ‰āļ­ +Brand HTML,HTML āļĒāļĩāđˆāļŦāđ‰āļ­ +Brand Name,āļŠāļ·āđˆāļ­āļĒāļĩāđˆāļŦāđ‰āļ­ +"Brand is what appears on the top-right of the toolbar. If it is an image, make sure ithas a transparent background and use the <img /> tag. Keep size as 200px x 30px",āļĒāļĩāđˆāļŦāđ‰āļ­āđ€āļ›āđ‡āļ™āļŠāļīāđˆāļ‡āļ—āļĩāđˆāļ›āļĢāļēāļāļāļšāļ™āļ”āđ‰āļēāļ™āļ‚āļ§āļēāļšāļ™āļ‚āļ­āļ‡āđāļ–āļšāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĄāļ·āļ­ āļ–āđ‰āļēāļĄāļąāļ™āđ€āļ›āđ‡āļ™āļ āļēāļžāđƒāļŦāđ‰āđāļ™āđˆāđƒāļˆāļ§āđˆāļē ithas āļžāļ·āđ‰āļ™āļŦāļĨāļąāļ‡āđ‚āļ›āļĢāđˆāļ‡āđƒāļŠāđāļĨāļ°āđƒāļŠāđ‰ <img /> āđāļ—āđ‡āļ āđƒāļŦāđ‰āļ‚āļ™āļēāļ”āđ€āļ›āđ‡āļ™ 200px x 30px +Brand master.,āļ•āđ‰āļ™āđāļšāļšāđāļšāļĢāļ™āļ”āđŒ +Branding and Printing,āļāļēāļĢāļŠāļĢāđ‰āļēāļ‡āļ•āļĢāļēāļŠāļīāļ™āļ„āđ‰āļēāđāļĨāļ°āļāļēāļĢāļžāļīāļĄāļžāđŒ +Brands,āđāļšāļĢāļ™āļ”āđŒ +Breakdown,āļāļēāļĢāđ€āļŠāļĩāļĒ +Budget,āļ‡āļš +Budget Allocated,āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ—āļĩāđˆāļˆāļąāļ”āļŠāļĢāļĢ +Budget Control,āļ„āļ§āļšāļ„āļļāļĄāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Budget Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Budget Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Budget Distribution,āļāļēāļĢāđāļžāļĢāđˆāļāļĢāļ°āļˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Budget Distribution Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļˆāļąāļ”āļˆāļģāļŦāļ™āđˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Budget Distribution Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļˆāļąāļ”āļˆāļģāļŦāļ™āđˆāļēāļĒāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Bulk Email,āļ­āļĩāđ€āļĄāļĨāđŒāļ‚āļĒāļ° +Bulk Email records.,āļšāļąāļ™āļ—āļķāļāļ­āļĩāđ€āļĄāļĨāđŒāļ‚āļĒāļ° +Bundle items at time of sale.,āļāļģāļĢāļēāļĒāļāļēāļĢāđƒāļ™āđ€āļ§āļĨāļēāļ‚āļ­āļ‡āļāļēāļĢāļ‚āļēāļĒ +Button,āļ›āļļāđˆāļĄ +Buyer of Goods and Services.,āļœāļđāđ‰āļ‹āļ·āđ‰āļ­āļŠāļīāļ™āļ„āđ‰āļēāđāļĨāļ°āļšāļĢāļīāļāļēāļĢ +Buying,āļāļēāļĢāļ‹āļ·āđ‰āļ­ +Buying Cost,āļ‹āļ·āđ‰āļ­āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Buying Cost will be updated from Purchase Orders and Purchase Receipts.
    The buying cost will calculated by moving average method.,āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļāļēāļĢāļ‹āļ·āđ‰āļ­āļˆāļ°āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļ›āļĢāļąāļšāļ›āļĢāļļāļ‡āļˆāļēāļāļ„āļģāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āđāļĨāļ°āļĢāļēāļĒāļĢāļąāļšāļ‹āļ·āđ‰āļ­
    āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļāļēāļĢāļ‹āļ·āđ‰āļ­āļˆāļ°āļ„āļģāļ™āļ§āļ“āđ‚āļ”āļĒāļ§āļīāļ˜āļĩāļ–āļąāļ§āđ€āļ‰āļĨāļĩāđˆāļĒāđ€āļ„āļĨāļ·āđˆāļ­āļ™āļ—āļĩāđˆ +Buying Home,āļ‹āļ·āđ‰āļ­āļšāđ‰āļēāļ™ +By,āđ‚āļ”āļĒ +C,C +C-FORM/,C-form / +C-Form,C-Form +C-Form Applicable,C-Form āļŠāļēāļĄāļēāļĢāļ–āļ™āļģāđ„āļ›āđƒāļŠāđ‰āđ„āļ”āđ‰ +C-Form Invoice Detail,C-Form āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰ +C-Form No,C-Form āđ„āļĄāđˆāļĄāļĩ +CGHelp,CGHelp +CI/2010-2011/,CI/2010-2011 / +COMM-,COMM- +CSS,CSS +CTC,CTC +CUST,cust +CUSTMUM,CUSTMUM +Calculate Charges,āļ„āļģāļ™āļ§āļ“āļ„āđˆāļēāđƒāļŠāđ‰āļšāļĢāļīāļāļēāļĢ +Calculate Tax,āļ„āļģāļ™āļ§āļ“āļ āļēāļĐāļĩ +Calculate Taxes and Charges,āļ„āļģāļ™āļ§āļ“āļ āļēāļĐāļĩāđāļĨāļ°āļ„āđˆāļēāļšāļĢāļīāļāļēāļĢ +Calculate Total Score,āļ„āļģāļ™āļ§āļ“āļ„āļ°āđāļ™āļ™āļĢāļ§āļĄ +Calendar,āļ›āļāļīāļ—āļīāļ™ +Calendar Events,āļ›āļāļīāļ—āļīāļ™āđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Call,āđ‚āļ—āļĢāļĻāļąāļžāļ—āđŒ +Campaign,āļĢāļ“āļĢāļ‡āļ„āđŒ +Campaign Name,āļŠāļ·āđˆāļ­āđāļ„āļĄāđ€āļ›āļ +Can only be exported by users with role 'Report Manager',āļŠāļēāļĄāļēāļĢāļ–āļŠāđˆāļ‡āļ­āļ­āļāđ‚āļ”āļĒāļœāļđāđ‰āđƒāļŠāđ‰āļ—āļĩāđˆāļĄāļĩ 'āļˆāļąāļ”āļāļēāļĢāļĢāļēāļĒāļ‡āļēāļ™āļšāļ—āļšāļēāļ— +Cancel,āļĒāļāđ€āļĨāļīāļ +Cancel Reason,āļĒāļāđ€āļĨāļīāļāđ€āļŦāļ•āļļāļœāļĨ +Cancel permission also allows the user to delete a document (if it is not linked to any other document).,āđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļāļēāļ•āļĒāļāđ€āļĨāļīāļāļĒāļąāļ‡āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āļŠāļēāļĄāļēāļĢāļ–āļĨāļšāđ€āļ­āļāļŠāļēāļĢ (āļ–āđ‰āļēāļĒāļąāļ‡āđ„āļĄāđˆāđ„āļ”āđ‰āđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡āļāļąāļšāđ€āļ­āļāļŠāļēāļĢāļ­āļ·āđˆāļ™) +Cancelled,āļĒāļāđ€āļĨāļīāļ +Cannot ,āđ„āļĄāđˆāđ„āļ”āđ‰ +Capacity,āļ„āļ§āļēāļĄāļˆāļļ +Capacity Units,āļŦāļ™āđˆāļ§āļĒāļ„āļ§āļēāļĄāļˆāļļ +Career History,āļ›āļĢāļ°āļ§āļąāļ•āļīāļāļēāļĢāļ—āļģāļ‡āļēāļ™ +Carry Forward,Carry Forward +Carry Forwarded Leaves,Carry āđƒāļš Forwarded +Cash,āđ€āļ‡āļīāļ™āļŠāļ” +Cash Voucher,āļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāđ€āļ‡āļīāļ™āļŠāļ” +Cash/Bank Account,āđ€āļ‡āļīāļ™āļŠāļ” / āļšāļąāļāļŠāļĩāļ˜āļ™āļēāļ„āļēāļĢ +Category,āļŦāļĄāļ§āļ”āļŦāļĄāļđāđˆ +Category of customer as entered in Customer master,āļŦāļĄāļ§āļ”āļŦāļĄāļđāđˆāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļ›āđ‰āļ­āļ™āđ„āļ§āđ‰āđƒāļ™āļŦāļĨāļąāļāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Cell Number,āļˆāļģāļ™āļ§āļ™āđ€āļ‹āļĨāļĨāđŒ +Center,āļĻāļđāļ™āļĒāđŒ +"Certain documents should not be changed once final, like an Invoice for example. The final state for such documents is called Submitted. You can restrict which roles can Submit.",āđ€āļ­āļāļŠāļēāļĢāļšāļēāļ‡āļ­āļĒāđˆāļēāļ‡āđ„āļĄāđˆāļ„āļ§āļĢāļˆāļ°āļĄāļĩāļāļēāļĢāđ€āļ›āļĨāļĩāđˆāļĒāļ™āđāļ›āļĨāļ‡āļ„āļĢāļąāđ‰āļ‡āļŠāļļāļ”āļ—āđ‰āļēāļĒāđ€āļŠāđˆāļ™āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļŠāļģāļŦāļĢāļąāļšāļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡ āļĢāļąāļāļŠāļļāļ”āļ—āđ‰āļēāļĒāļŠāļģāļŦāļĢāļąāļšāđ€āļ­āļāļŠāļēāļĢāļ”āļąāļ‡āļāļĨāđˆāļēāļ§āđ€āļĢāļĩāļĒāļāļ§āđˆāļē Submitted āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ– āļˆāļģāļāļąāļ” āļāļēāļĢāļ‹āļķāđˆāļ‡āļŠāļēāļĄāļēāļĢāļ–āļŠāđˆāļ‡āļšāļ—āļšāļēāļ— +Certificate,āđƒāļšāļĢāļąāļšāļĢāļ­āļ‡ +Challan Date,āļ§āļąāļ™āļ—āļĩāđˆ Challan +Challan No,Challan āđ„āļĄāđˆāļĄāļĩ +Change UOM for an Item.,āđ€āļ›āļĨāļĩāđˆāļĒāļ™ UOM āļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢ +Change background fonts etc,āđ€āļ›āļĨāļĩāđˆāļĒāļ™āļžāļ·āđ‰āļ™āļŦāļĨāļąāļ‡ āļŊāļĨāļŊ āđāļšāļšāļ­āļąāļāļĐāļĢ +"Change entry properties (hide fields, make mandatory etc)",āđ€āļ›āļĨāļĩāđˆāļĒāļ™āļ„āļļāļ“āļŠāļĄāļšāļąāļ•āļīāļĢāļēāļĒāļāļēāļĢ (āļŠāđˆāļ­āļ‡āļ‹āđˆāļ­āļ™āđƒāļŦāđ‰ āļŊāļĨāļŊ āļšāļąāļ‡āļ„āļąāļš) +Change the starting / current sequence number of an existing series.,āđ€āļ›āļĨāļĩāđˆāļĒāļ™āļŦāļĄāļēāļĒāđ€āļĨāļ‚āļĨāļģāļ”āļąāļšāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ / āļ›āļąāļˆāļˆāļļāļšāļąāļ™āļ‚āļ­āļ‡āļŠāļļāļ”āļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆ +Channel Partner,āļžāļąāļ™āļ˜āļĄāļīāļ•āļĢāļŠāđˆāļ­āļ‡āļ—āļēāļ‡ +Charge,āļĢāļąāļšāļœāļīāļ”āļŠāļ­āļš +Chargeable,āļĢāļąāļšāļœāļīāļ”āļŠāļ­āļš +Chart of Accounts,āļœāļąāļ‡āļšāļąāļāļŠāļĩ +Chart of Cost Centers,āđāļœāļ™āļ āļđāļĄāļīāļ‚āļ­āļ‡āļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™ +Chat,āļžāļđāļ”āļ„āļļāļĒ +Cheating FieldPlease do not delete ,āđ‚āļāļ‡ FieldPlease āđ„āļĄāđˆāļĨāļš +Check,āļ•āļĢāļ§āļˆāļŠāļ­āļš +Check / Uncheck roles assigned to the Profile. Click on the Role to find out what permissions that Role has.,āļ•āļĢāļ§āļˆāļŠāļ­āļš / āļšāļ—āļšāļēāļ—āļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđƒāļŦāđ‰āļĒāļāđ€āļĨāļīāļāļāļēāļĢāđ€āļĨāļ·āļ­āļāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” āļ„āļĨāļīāļāļ—āļĩāđˆāļšāļ—āļšāļēāļ—āđ€āļžāļ·āđˆāļ­āļŦāļēāļŠāļīāđˆāļ‡āļ—āļĩāđˆāļŠāļīāļ—āļ˜āļīāđŒāļšāļ—āļšāļēāļ—āļ—āļĩāđˆāđ„āļ”āđ‰ +Check all the items below that you want to send in this digest.,āļ•āļĢāļ§āļˆāļŠāļ­āļšāļĢāļēāļĒāļāļēāļĢāļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ—āļĩāđˆāļ”āđ‰āļēāļ™āļĨāđˆāļēāļ‡āļ—āļĩāđˆāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāļŠāđˆāļ‡āļĒāđˆāļ­āļĒāļ™āļĩāđ‰ +Check how the newsletter looks in an email by sending it to your email.,āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ§āđˆāļēāļĄāļĩāļĨāļąāļāļĐāļ“āļ°āļˆāļ”āļŦāļĄāļēāļĒāđƒāļ™āļ­āļĩāđ€āļĄāļĨāđ‚āļ”āļĒāļŠāđˆāļ‡āļ­āļĩāđ€āļĄāļĨāļ‚āļ­āļ‡āļ„āļļāļ“ +"Check if recurring invoice, uncheck to stop recurring or put proper End Date",āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ§āđˆāļēāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āđƒāļŦāđ‰āļĒāļāđ€āļĨāļīāļāļāļēāļĢāļŦāļĒāļļāļ”āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļŦāļĢāļ·āļ­āđƒāļŠāđˆāļ§āļąāļ™āļ—āļĩāđˆāļŠāļīāđ‰āļ™āļŠāļļāļ”āļ—āļĩāđˆāđ€āļŦāļĄāļēāļ°āļŠāļĄ +"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ§āđˆāļēāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ—āļĩāđˆāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āđ‚āļ”āļĒāļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļī āļŦāļĨāļąāļ‡āļˆāļēāļāļŠāđˆāļ‡āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āđƒāļ” āđ† āļ‚āļēāļĒāļŠāđˆāļ§āļ™āļāļīāļˆāļ§āļąāļ•āļĢāļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™ +Check if you want to send salary slip in mail to each employee while submitting salary slip,āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ§āđˆāļēāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāļ—āļĩāđˆāļˆāļ°āļŠāđˆāļ‡āļŠāļĨāļīāļ›āđ€āļ‡āļīāļ™āđ€āļ”āļ·āļ­āļ™āđƒāļ™ mail āđƒāļŦāđ‰āļžāļ™āļąāļāļ‡āļēāļ™āđāļ•āđˆāļĨāļ°āļ„āļ™āđƒāļ™āļ‚āļ“āļ°āļ—āļĩāđˆāļŠāđˆāļ‡āļŠāļĨāļīāļ›āđ€āļ‡āļīāļ™āđ€āļ”āļ·āļ­āļ™ +Check this if you want to force the user to select a series before saving. There will be no default if you check this.,āļ•āļĢāļ§āļˆāļŠāļ­āļšāđ€āļĢāļ·āđˆāļ­āļ‡āļ™āļĩāđ‰āļ–āđ‰āļēāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāļšāļąāļ‡āļ„āļąāļšāđƒāļŦāđ‰āļœāļđāđ‰āđƒāļŠāđ‰āđ€āļĨāļ·āļ­āļāļŠāļļāļ”āļāđˆāļ­āļ™āļ—āļĩāđˆāļˆāļ°āļšāļąāļ™āļ—āļķāļ āļˆāļ°āļĄāļĩāļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āđ„āļĄāđˆāļ–āđ‰āļēāļ„āļļāļ“āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ™āļĩāđ‰ +Check this if you want to show in website,āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ™āļĩāđ‰āļ–āđ‰āļēāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāļ—āļĩāđˆāļˆāļ°āđāļŠāļ”āļ‡āđƒāļ™āđ€āļ§āđ‡āļšāđ„āļ‹āļ•āđŒ +Check this to make this the default letter head in all prints,āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ™āļĩāđ‰āļˆāļ°āļ—āļģāđƒāļŦāđ‰āđ€āļĢāļ·āđˆāļ­āļ‡āļ™āļĩāđ‰āļŦāļąāļ§āļˆāļ”āļŦāļĄāļēāļĒāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āđƒāļ™āļāļēāļĢāļžāļīāļĄāļžāđŒāļ—āļąāđ‰āļ‡āļŦāļĄāļ” +Check this to pull emails from your mailbox,āļ•āļĢāļ§āļˆāļŠāļ­āļšāļ™āļĩāđ‰āļˆāļ°āļ”āļķāļ‡āļ­āļĩāđ€āļĄāļĨāļˆāļēāļāļāļĨāđˆāļ­āļ‡āļˆāļ”āļŦāļĄāļēāļĒāļ‚āļ­āļ‡āļ„āļļāļ“ +Check to activate,āļ•āļĢāļ§āļˆāļŠāļ­āļšāđ€āļžāļ·āđˆāļ­āđ€āļ›āļīāļ”āđƒāļŠāđ‰āļ‡āļēāļ™ +Check to make Shipping Address,āļ•āļĢāļ§āļˆāļŠāļ­āļšāđ€āļžāļ·āđˆāļ­āđƒāļŦāđ‰āļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļ—āļĩāđˆāļ­āļĒāļđāđˆ +Check to make primary address,āļ•āļĢāļ§āļˆāļŠāļ­āļšāđ€āļžāļ·āđˆāļ­āđƒāļŦāđ‰āļ­āļĒāļđāđˆāļŦāļĨāļąāļ +Checked,āļ–āļđāļāļ•āļĢāļ§āļˆāļŠāļ­āļš +"Checking Operator (To Fld, Operator, From Fld)","āļ•āļĢāļ§āļˆāļŠāļ­āļšāļœāļđāđ‰āļ›āļĢāļ°āļāļ­āļšāļāļēāļĢ (āđ€āļžāļ·āđˆāļ­ Fld, Operator, āļˆāļēāļ Fld)" +Cheque,āđ€āļŠāđ‡āļ„ +Cheque Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļŠāđ‡āļ„ +Cheque Number,āļˆāļģāļ™āļ§āļ™āđ€āļŠāđ‡āļ„ +Child Tables are shown as a Grid in other DocTypes.,āļ•āļēāļĢāļēāļ‡āđ€āļ”āđ‡āļāļˆāļ°āļ›āļĢāļēāļāļāđ€āļ›āđ‡āļ™āđ€āļŠāđ‰āļ™āļ•āļēāļĢāļēāļ‡āđƒāļ™ doctypes āļ­āļ·āđˆāļ™ āđ† +City,āđ€āļĄāļ·āļ­āļ‡ +City/Town,āđ€āļĄāļ·āļ­āļ‡ / āļˆāļąāļ‡āļŦāļ§āļąāļ” +Claim Amount,āļˆāļģāļ™āļ§āļ™āļāļēāļĢāđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡ +Claims for expenses made on behalf of the organization.,āļāļēāļĢāđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļ—āļĩāđˆāļ—āļģāđƒāļ™āļ™āļēāļĄāļ‚āļ­āļ‡āļ­āļ‡āļ„āđŒāļāļĢ +Class / Percentage,āļĢāļ°āļ”āļąāļš / āļĢāđ‰āļ­āļĒāļĨāļ° +Classification of Customers by region,āļāļēāļĢāļˆāļģāđāļ™āļāļ›āļĢāļ°āđ€āļ āļ—āļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļ•āļēāļĄāļ āļđāļĄāļīāļ āļēāļ„ +Clear Cache & Refresh,āļĨāđ‰āļēāļ‡āđāļ„āļŠ & āļĢāļĩāđ€āļŸāļĢāļŠ +Clear Pending,āļĨāđ‰āļēāļ‡ Pending +Clear Table,āļ•āļēāļĢāļēāļ‡āļ—āļĩāđˆāļŠāļąāļ”āđ€āļˆāļ™ +Clearance Date,āļ§āļąāļ™āļ—āļĩāđˆāļāļ§āļēāļ”āļĨāđ‰āļēāļ‡ +Click on button in the 'Condition' column and select the option 'User is the creator of the document',āļ„āļĨāļīāļāļ—āļĩāđˆāļ›āļļāđˆāļĄāđƒāļ™ 'āļŠāļ āļēāļž' āļ„āļ­āļĨāļąāļĄāļ™āđŒāđāļĨāļ°āđ€āļĨāļ·āļ­āļāļ•āļąāļ§āđ€āļĨāļ·āļ­āļ 'āļœāļđāđ‰āđƒāļŠāđ‰āđ€āļ›āđ‡āļ™āļœāļđāđ‰āļŠāļĢāđ‰āļēāļ‡āđ€āļ­āļāļŠāļēāļĢ' +Click on edit button to start a new report.,āļ„āļĨāļīāļāļ—āļĩāđˆāļ›āļļāđˆāļĄāđāļāđ‰āđ„āļ‚āđ€āļžāļ·āđˆāļ­āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļāļēāļĢāļĢāļēāļĒāļ‡āļēāļ™āđƒāļŦāļĄāđˆ +Click to Expand / Collapse,āļ„āļĨāļīāļāļ—āļĩāđˆāļ™āļĩāđˆāđ€āļžāļ·āđˆāļ­āļ‚āļĒāļēāļĒ / āļĒāļļāļš +Client,āļĨāļđāļāļ„āđ‰āļē +Client Script,āļŠāļ„āļĢāļīāļ›āļ•āđŒāļĨāļđāļāļ„āđ‰āļē +Closed,āļ›āļīāļ” +Closing Account Head,āļ›āļīāļ”āļŦāļąāļ§āļšāļąāļāļŠāļĩ +Closing Date,āļ›āļīāļ”āļ§āļąāļ™āļ—āļĩāđˆ +Closing Fiscal Year,āļ›āļīāļ”āļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +CoA Help,āļŠāđˆāļ§āļĒāđ€āļŦāļĨāļ·āļ­ CoA +Code,āļĢāļŦāļąāļŠ +Cold Calling,āđ‚āļ—āļĢāđ€āļĒāđ‡āļ™ +Collections,āļ„āļ­āļĨāđ€āļĨāļāļŠāļąāļ™ +Color,āļŠāļĩ +Column Break,āļ•āļąāļ§āđāļšāđˆāļ‡āļ„āļ­āļĨāļąāļĄāļ™āđŒ +Columns,āļ„āļ­āļĨāļąāļĄāļ™āđŒ +Comma separated list of email addresses,āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāļ„āļąāđˆāļ™āļ”āđ‰āļ§āļĒāļˆāļļāļĨāļ āļēāļ„āļ‚āļ­āļ‡āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ­āļĩāđ€āļĄāļĨ +Comment,āļ„āļ§āļēāļĄāđ€āļŦāđ‡āļ™ +Comment By,āļ„āļ§āļēāļĄāļ„āļīāļ”āđ€āļŦāđ‡āļ™āļ—āļĩāđˆ +Comment By Fullname,āļ„āļ§āļēāļĄāļ„āļīāļ”āđ€āļŦāđ‡āļ™āļ—āļĩāđˆ Fullname +Comment Date,āļ„āļ§āļēāļĄāļ„āļīāļ”āđ€āļŦāđ‡āļ™āļ§āļąāļ™āļ—āļĩāđˆ +Comment Docname,āļ„āļ§āļēāļĄāļ„āļīāļ”āđ€āļŦāđ‡āļ™ Docname +Comment Doctype,āļ„āļ§āļēāļĄāļ„āļīāļ”āđ€āļŦāđ‡āļ™ DOCTYPE +Comment Time,āļ„āļ§āļēāļĄāļ„āļīāļ”āđ€āļŦāđ‡āļ™āđ€āļ§āļĨāļē +Comments,āļ„āļ§āļēāļĄāđ€āļŦāđ‡āļ™ +Commission Rate,āļ­āļąāļ•āļĢāļēāļ„āđˆāļēāļ„āļ­āļĄāļĄāļīāļŠāļŠāļąāđˆāļ™ +Commission Rate (%),āļ­āļąāļ•āļĢāļēāļ„āđˆāļēāļ„āļ­āļĄāļĄāļīāļŠāļŠāļąāđˆāļ™ (%) +Commission partners and targets,āļžāļąāļ™āļ˜āļĄāļīāļ•āļĢāļ„āļ“āļ°āļāļĢāļĢāļĄāļāļēāļĢāđāļĨāļ°āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒ +Communication,āļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢ +Communication HTML,HTML āļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢ +Communication History,āļŠāļ·āđˆāļ­āļŠāļēāļĢ +Communication Log,āđ€āļ‚āđ‰āļēāļŠāļđāđˆāļĢāļ°āļšāļšāļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢ +Communication Medium,āļāļĨāļēāļ‡āļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢ +Communication by,āļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢāđ‚āļ”āļĒ +Communication log.,āļšāļąāļ™āļ—āļķāļāļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢ +Communication type,āļ›āļĢāļ°āđ€āļ āļ—āļāļēāļĢāļŠāļ·āđˆāļ­āļŠāļēāļĢ +Company,āļšāļĢāļīāļĐāļąāļ— +Company Control,āļāļēāļĢāļ„āļ§āļšāļ„āļļāļĄāļ‚āļ­āļ‡ āļšāļĢāļīāļĐāļąāļ— +Company Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” āļšāļĢāļīāļĐāļąāļ— +Company History,āļ›āļĢāļ°āļ§āļąāļ•āļī āļšāļĢāļīāļĐāļąāļ— +Company History Heading,āļ›āļĢāļ°āļ§āļąāļ•āļī āļšāļĢāļīāļĐāļąāļ— āļŦāļąāļ§āđ€āļĢāļ·āđˆāļ­āļ‡ +Company Info,āļ‚āđ‰āļ­āļĄāļđāļĨ āļšāļĢāļīāļĐāļąāļ— +Company Introduction,āđāļ™āļ°āļ™āļģ āļšāļĢāļīāļĐāļąāļ— +Company Name,āļŠāļ·āđˆāļ­ āļšāļĢāļīāļĐāļąāļ— +Company branches.,āļšāļĢāļīāļĐāļąāļ— āļŠāļēāļ‚āļē +Company departments.,āđāļœāļ™āļāļ•āđˆāļēāļ‡āđ†āđƒāļ™ āļšāļĢāļīāļĐāļąāļ— +Company registration numbers for your reference. Example: VAT Registration Numbers etc.,āđ€āļĨāļ‚āļ—āļ°āđ€āļšāļĩāļĒāļ™ āļšāļĢāļīāļĐāļąāļ— āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ­āđ‰āļēāļ‡āļ­āļīāļ‡āļ‚āļ­āļ‡āļ„āļļāļ“ āļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡: āļŦāļĄāļēāļĒāđ€āļĨāļ‚āļ—āļ°āđ€āļšāļĩāļĒāļ™āļ āļēāļĐāļĩāļĄāļđāļĨāļ„āđˆāļēāđ€āļžāļīāđˆāļĄāđ€āļ›āđ‡āļ™āļ•āđ‰āļ™ +Company registration numbers for your reference. Tax numbers etc.,āđ€āļĨāļ‚āļ—āļ°āđ€āļšāļĩāļĒāļ™ āļšāļĢāļīāļĐāļąāļ— āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ­āđ‰āļēāļ‡āļ­āļīāļ‡āļ‚āļ­āļ‡āļ„āļļāļ“ āļ•āļąāļ§āđ€āļĨāļ‚āļ āļēāļĐāļĩ āļŊāļĨāļŊ +Complaint,āļāļēāļĢāļĢāđ‰āļ­āļ‡āđ€āļĢāļĩāļĒāļ™ +Complete By,āđ€āļŠāļĢāđ‡āļˆāļŠāļĄāļšāļđāļĢāļ“āđŒāđ‚āļ”āļĒ +Completed,āđ€āļŠāļĢāđ‡āļˆ +Completion Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļŠāļĢāđ‡āļˆāļŠāļĄāļšāļđāļĢāļ“āđŒ +Completion Status,āļŠāļ–āļēāļ™āļ°āđ€āļŠāļĢāđ‡āļˆ +Confirmed orders from Customers.,āļ„āļģāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļĒāļ·āļ™āļĒāļąāļ™āļˆāļēāļāļĨāļđāļāļ„āđ‰āļē +Consider Tax or Charge for,āļžāļīāļˆāļēāļĢāļ“āļēāļ āļēāļĐāļĩāļŦāļĢāļ·āļ­āļ„āļīāļ”āļ„āđˆāļēāļšāļĢāļīāļāļēāļĢāļŠāļģāļŦāļĢāļąāļš +"Consider this Price List for fetching rate. (only which have ""For Buying"" as checked)",āļžāļīāļˆāļēāļĢāļ“āļēāļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļēāļ™āļĩāđ‰āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđ€āļĢāļĩāļĒāļāļ­āļąāļ•āļĢāļē (āđ€āļ‰āļžāļēāļ°āļ—āļĩāđˆāļĄāļĩ "āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ‹āļ·āđ‰āļ­" āļāļēāļĢāļ•āļĢāļ§āļˆāļŠāļ­āļšāđ€āļ›āđ‡āļ™) +Consultant,āļœāļđāđ‰āđƒāļŦāđ‰āļ„āļģāļ›āļĢāļķāļāļĐāļē +Consumed Qty,āļˆāļģāļ™āļ§āļ™āļāļēāļĢāļšāļĢāļīāđ‚āļ āļ„ +Contact,āļ•āļīāļ”āļ•āđˆāļ­ +Contact Control,āļ•āļīāļ”āļ•āđˆāļ­āļ„āļ§āļšāļ„āļļāļĄ +Contact Desc,Desc āļ•āļīāļ”āļ•āđˆāļ­ +Contact Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļ•āļīāļ”āļ•āđˆāļ­ +Contact Email,āļ•āļīāļ”āļ•āđˆāļ­āļ­āļĩāđ€āļĄāļĨāđŒ +Contact HTML,HTML āļ•āļīāļ”āļ•āđˆāļ­ +Contact Info,āļ‚āđ‰āļ­āļĄāļđāļĨāļāļēāļĢāļ•āļīāļ”āļ•āđˆāļ­ +Contact Mobile No,āđ€āļšāļ­āļĢāđŒāļĄāļ·āļ­āļ–āļ·āļ­āđ„āļĄāđˆāļĄāļĩ +Contact Name,āļŠāļ·āđˆāļ­āļœāļđāđ‰āļ•āļīāļ”āļ•āđˆāļ­ +Contact No,āļ•āļīāļ”āļ•āđˆāļ­āđ„āļĄāđˆāļĄāļĩ +Contact No.,āļ•āļīāļ”āļ•āđˆāļ­āļŦāļĄāļēāļĒāđ€āļĨāļ‚ +Contact Person,Contact Person +Contact Type,āļ›āļĢāļ°āđ€āļ āļ—āļ—āļĩāđˆāļ•āļīāļ”āļ•āđˆāļ­ +Contact Us Settings,āļ•āļīāļ”āļ•āđˆāļ­āđ€āļĢāļēāļ•āļąāđ‰āļ‡āļ„āđˆāļē +Contact in Future,āļ•āļīāļ”āļ•āđˆāļ­āđƒāļ™āļ­āļ™āļēāļ„āļ• +"Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.",āļ•āļąāļ§āđ€āļĨāļ·āļ­āļāļāļēāļĢāļ•āļīāļ”āļ•āđˆāļ­āđ€āļŠāđˆāļ™ "āđāļšāļšāļŠāļ­āļšāļ–āļēāļĄāļ‚āļēāļĒāļāļēāļĢāļŠāļ™āļąāļšāļŠāļ™āļļāļ™āđāļšāļšāļŠāļ­āļšāļ–āļēāļĄ" āļŊāļĨāļŊ āđāļ•āđˆāļĨāļ°āļšāļĢāļĢāļ—āļąāļ”āđƒāļŦāļĄāđˆāļŦāļĢāļ·āļ­āļ„āļąāđˆāļ™āļ”āđ‰āļ§āļĒāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļŦāļĄāļēāļĒāļˆāļļāļĨāļ āļēāļ„ +Contacted,āļ•āļīāļ”āļ•āđˆāļ­ +Content,āđ€āļ™āļ·āđ‰āļ­āļŦāļē +Content Type,āļ›āļĢāļ°āđ€āļ āļ—āđ€āļ™āļ·āđ‰āļ­āļŦāļē +Content in markdown format that appears on the main side of your page,āđ€āļ™āļ·āđ‰āļ­āļŦāļēāđƒāļ™āļĢāļđāļ›āđāļšāļš markdown āļ‹āļķāđˆāļ‡āļ›āļĢāļēāļāļāļšāļ™āļ”āđ‰āļēāļ™āļŦāļĨāļąāļāļ‚āļ­āļ‡āļŦāļ™āđ‰āļēāđ€āļ§āđ‡āļšāļ‚āļ­āļ‡āļ„āļļāļ“ +Content web page.,āļŦāļ™āđ‰āļēāđ€āļ§āđ‡āļšāđ€āļ™āļ·āđ‰āļ­āļŦāļē +Contra Voucher,āļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāļ•āđ‰āļēāļ™ +Contract End Date,āļ§āļąāļ™āļ—āļĩāđˆāļŠāļīāđ‰āļ™āļŠāļļāļ”āļŠāļąāļāļāļē +Control Panel,āđāļœāļ‡āļ„āļ§āļšāļ„āļļāļĄ +Conversion Factor,āļ›āļąāļˆāļˆāļąāļĒāļāļēāļĢāđ€āļ›āļĨāļĩāđˆāļĒāļ™āđāļ›āļĨāļ‡ +Conversion Rate,āļ­āļąāļ•āļĢāļēāļāļēāļĢāđāļ›āļĨāļ‡ +Convert into Recurring Invoice,āđāļ›āļĨāļ‡āđ€āļ›āđ‡āļ™āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ—āļĩāđˆāđ€āļāļīāļ”āļ‚āļķāđ‰āļ™āļ›āļĢāļ°āļˆāļģ +Converted,āđāļ›āļĨāļ‡ +Copyright,āļĨāļīāļ‚āļŠāļīāļ—āļ˜āļīāđŒ +Core,āđāļāļ™ +Cost Center,āļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™ +Cost Center Details,āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļĻāļđāļ™āļĒāđŒ +Cost Center Name,āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļŠāļ·āđˆāļ­āļĻāļđāļ™āļĒāđŒ +Cost Center must be specified for PL Account: ,āļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™āļ•āđ‰āļ­āļ‡āļĢāļ°āļšāļļāļŠāļģāļŦāļĢāļąāļšāļšāļąāļāļŠāļĩ PL: +Cost to Company,āđ€āļŠāļĩāļĒāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāđƒāļŦāđ‰āļāļąāļš āļšāļĢāļīāļĐāļąāļ— +Costing,āļ•āđ‰āļ™āļ—āļļāļ™ +Country,āļ›āļĢāļ°āđ€āļ—āļĻ +Country Name,āļŠāļ·āđˆāļ­āļ›āļĢāļ°āđ€āļ—āļĻ +Create,āļŠāļĢāđ‰āļēāļ‡ +Create Bank Voucher for the total salary paid for the above selected criteria,āļŠāļĢāđ‰āļēāļ‡āļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāļ˜āļ™āļēāļ„āļēāļĢāđ€āļžāļ·āđˆāļ­āļāļēāļĢāļĢāļ§āļĄāđ€āļ‡āļīāļ™āđ€āļ”āļ·āļ­āļ™āļ—āļĩāđˆāļˆāđˆāļēāļĒāļŠāļģāļŦāļĢāļąāļšāđ€āļāļ“āļ‘āđŒāļ—āļĩāđˆāđ€āļĨāļ·āļ­āļāļ‚āđ‰āļēāļ‡āļ•āđ‰āļ™ +Create Production Orders,āļŠāļĢāđ‰āļēāļ‡āļ„āļģāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļœāļĨāļīāļ• +Create Receiver List,āļŠāļĢāđ‰āļēāļ‡āļĢāļēāļĒāļāļēāļĢāļĢāļąāļš +Create Salary Slip,āļŠāļĢāđ‰āļēāļ‡āļŠāļĨāļīāļ›āđ€āļ‡āļīāļ™āđ€āļ”āļ·āļ­āļ™ +"Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.","āļŠāļĢāđ‰āļēāļ‡āļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļēāļˆāļēāļāļ•āđ‰āļ™āđāļšāļšāļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļēāđāļĨāļ°āļ›āđ‰āļ­āļ™āļ­āļąāļ•āļĢāļēāļ­āđ‰āļēāļ‡āļ­āļīāļ‡āļĄāļēāļ•āļĢāļāļēāļ™āļāļąāļšāđāļ•āđˆāļĨāļ°āļ‚āļ­āļ‡āļžāļ§āļāđ€āļ‚āļē āđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļāļēāļĢāđ€āļĨāļ·āļ­āļāļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļēāđƒāļ™āđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļē, āļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒāļŦāļĢāļ·āļ­āļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļ­āļąāļ•āļĢāļēāļ­āđ‰āļēāļ‡āļ­āļīāļ‡āļ—āļĩāđˆāļŠāļ­āļ”āļ„āļĨāđ‰āļ­āļ‡āļāļąāļ™āļˆāļ°āļ–āļđāļāđ€āļĢāļĩāļĒāļāļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢāļ™āļĩ​​āđ‰" +Create and Send Newsletters,āļāļēāļĢāļŠāļĢāđ‰āļēāļ‡āđāļĨāļ°āļŠāđˆāļ‡āļˆāļ”āļŦāļĄāļēāļĒāļ‚āđˆāļēāļ§ +Created Account Head: ,āļŦāļąāļ§āļŦāļ™āđ‰āļēāļšāļąāļāļŠāļĩāļ—āļĩāđˆāļŠāļĢāđ‰āļēāļ‡āđ„āļ§āđ‰: +Created Customer Issue,āļ›āļąāļāļŦāļēāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļŠāļĢāđ‰āļēāļ‡āđ„āļ§āđ‰ +Created Group ,āļāļĨāļļāđˆāļĄāļ—āļĩāđˆāļŠāļĢāđ‰āļēāļ‡āđ„āļ§āđ‰ +Created Opportunity,āļŠāļĢāđ‰āļēāļ‡āđ‚āļ­āļāļēāļŠ +Created Support Ticket,āļ•āļąāđ‹āļ§āļŠāļ™āļąāļšāļŠāļ™āļļāļ™āļŠāļĢāđ‰āļēāļ‡ +Creates salary slip for above mentioned criteria.,āļŠāļĢāđ‰āļēāļ‡āļŠāļĨāļīāļ›āđ€āļ‡āļīāļ™āđ€āļ”āļ·āļ­āļ™āļŠāļģāļŦāļĢāļąāļšāđ€āļāļ“āļ‘āđŒāļ”āļąāļ‡āļāļĨāđˆāļēāļ§āļ‚āđ‰āļēāļ‡āļ•āđ‰āļ™ +Credit,āđ€āļ„āļĢāļ”āļīāļ• +Credit Amt,āļˆāļģāļ™āļ§āļ™āđ€āļ„āļĢāļ”āļīāļ• +Credit Card Voucher,āļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāļŠāļģāļĢāļ°āļ”āđ‰āļ§āļĒāļšāļąāļ•āļĢāđ€āļ„āļĢāļ”āļīāļ• +Credit Controller,āļ„āļ§āļšāļ„āļļāļĄāđ€āļ„āļĢāļ”āļīāļ• +Credit Days,āļ§āļąāļ™āđ€āļ„āļĢāļ”āļīāļ• +Credit Limit,āļ§āļ‡āđ€āļ‡āļīāļ™āļŠāļīāļ™āđ€āļŠāļ·āđˆāļ­ +Credit Note,āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāđ€āļ„āļĢāļ”āļīāļ• +Credit To,āđ€āļ„āļĢāļ”āļīāļ• +Criteria Name,āļŠāļ·āđˆāļ­āđ€āļāļ“āļ‘āđŒ +Cross List Item Group,āļ‚āđ‰āļēāļĄāļāļĨāļļāđˆāļĄāļĢāļēāļĒāļāļēāļĢ +Cross Listing of Item in multiple groups,āļ‚āđ‰āļēāļĄāļĢāļēāļĒāļāļēāļĢāļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢāđƒāļ™āļŦāļĨāļēāļĒāļāļĨāļļāđˆāļĄ +Currency,āđ€āļ‡āļīāļ™āļ•āļĢāļē +Currency & Price List,āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āđāļĨāļ°āļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļē +Currency Format,āļĢāļđāļ›āđāļšāļšāļŠāļāļļāļĨāđ€āļ‡āļīāļ™ +Currency Name,āļŠāļ·āđˆāļ­āļŠāļāļļāļĨ +Current Accommodation Type,āļ›āļĢāļ°āđ€āļ āļ—āļ‚āļ­āļ‡āļ—āļĩāđˆāļžāļąāļāļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current Address,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current BOM,BOM āļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current Fiscal Year,āļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current Stock,āļŠāļ•āđ‡āļ­āļāļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current Stock UOM,UOM āļ•āđ‡āļ­āļāļŠāļīāļ™āļ„āđ‰āļēāļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current Value,āļ„āđˆāļēāļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Current status,āļŠāļ–āļēāļ™āļ°āļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Cust/Supp Address,āļ—āļĩāđˆāļ­āļĒāļđāđˆ cust / Supp +Cust/Supp Name,āļŠāļ·āđˆāļ­ cust / Supp +Custom,āļ›āļĢāļ°āđ€āļžāļ“āļĩ +Custom Autoreply Message,āļ‚āđ‰āļ­āļ„āļ§āļēāļĄāļ•āļ­āļšāļāļĨāļąāļšāļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļīāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom CSS,CSS āļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom Field,āļŸāļīāļĨāļ”āđŒāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom Message,āļ‚āđ‰āļ­āļ„āļ§āļēāļĄāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom Query,āđāļšāļšāļŠāļ­āļšāļ–āļēāļĄāđāļšāļšāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom Reports,āļĢāļēāļĒāļ‡āļēāļ™āļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom Script,āļŠāļ„āļĢāļīāļ›āļ•āđŒāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom Startup Code,āļĢāļŦāļąāļŠāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡ +Custom?,āļāļģāļŦāļ™āļ”āđ€āļ­āļ‡āđ„āļ”āđ‰āļ­āļĒāđˆāļēāļ‡āđ„āļĢ +Customer,āļĨāļđāļāļ„āđ‰āļē +Customer / Item Name,āļŠāļ·āđˆāļ­āļĨāļđāļāļ„āđ‰āļē / āļĢāļēāļĒāļāļēāļĢ +Customer Account,āļšāļąāļāļŠāļĩāļĨāļđāļāļ„āđ‰āļē +Customer Address,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Customer Addresses And Contacts,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāđāļĨāļ°āļāļēāļĢāļ•āļīāļ”āļ•āđˆāļ­ +Customer Code,āļĢāļŦāļąāļŠāļĨāļđāļāļ„āđ‰āļē +Customer Codes,āļĢāļŦāļąāļŠāļĨāļđāļāļ„āđ‰āļē +Customer Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļĨāļđāļāļ„āđ‰āļē +Customer Feedback,āļ„āļģāļ•āļīāļŠāļĄāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Customer Group,āļāļĨāļļāđˆāļĄāļĨāļđāļāļ„āđ‰āļē +Customer Group Name,āļŠāļ·āđˆāļ­āļāļĨāļļāđˆāļĄāļĨāļđāļāļ„āđ‰āļē +Customer Intro,āđāļ™āļ°āļ™āļģāļĨāļđāļāļ„āđ‰āļē +Customer Issue,āļ›āļąāļāļŦāļēāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Customer Issue No,āļ›āļąāļāļŦāļēāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāđ„āļĄāđˆāļĄāļĩ +Customer Issue against a Serial No (warranty).,āļ›āļąāļāļŦāļēāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļāļąāļšāļŦāļĄāļēāļĒāđ€āļĨāļ‚āđ€āļ„āļĢāļ·āđˆāļ­āļ‡ (āļĢāļąāļšāļ›āļĢāļ°āļāļąāļ™) +Customer Master created by ,āļŦāļĨāļąāļāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļŠāļĢāđ‰āļēāļ‡āļ‚āļķāđ‰āļ™āđ‚āļ”āļĒ +Customer Name,āļŠāļ·āđˆāļ­āļĨāļđāļāļ„āđ‰āļē +Customer Type,āļ›āļĢāļ°āđ€āļ āļ—āļĨāļđāļāļ„āđ‰āļē +Customer classification tree.,āļ•āđ‰āļ™āđ„āļĄāđ‰āļˆāļģāđāļ™āļāļĨāļđāļāļ„āđ‰āļē +Customer database.,āļāļēāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāļĨāļđāļāļ„āđ‰āļē +Customer's Currency,āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Customer's Item Code,āļĢāļŦāļąāļŠāļŠāļīāļ™āļ„āđ‰āļēāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Customer's Vendor,āļœāļđāđ‰āļ‚āļēāļĒāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +Customer's currency,āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē +"Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.",āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļē - āļŦāļēāļāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāđ€āļĨāļ·āļ­āļāļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ—āļĩāđˆāđ„āļĄāđˆāđ„āļ”āđ‰āđ€āļ›āđ‡āļ™āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āđāļĨāđ‰āļ§āļ„āļļāļ“āļˆāļ°āļ•āđ‰āļ­āļ‡āļĢāļ°āļšāļļāļ­āļąāļ•āļĢāļēāļāļēāļĢāđāļ›āļĨāļ‡āļŠāļāļļāļĨāđ€āļ‡āļīāļ™ +Customer/Supplier,āļĨāļđāļāļ„āđ‰āļē / āļœāļđāđ‰āļœāļĨāļīāļ• +Customerwise Discount,āļŠāđˆāļ§āļ™āļĨāļ” Customerwise +Customize,āļ›āļĢāļąāļšāđāļ•āđˆāļ‡ +Customize Form,āļ›āļĢāļąāļšāđāļ•āđˆāļ‡āļĢāļđāļ›āđāļšāļš +Customize Form Field,āļāļģāļŦāļ™āļ”āđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāļŸāļ­āļĢāđŒāļĄ +"Customize Label, Print Hide, Default etc.","āļāļģāļŦāļ™āļ” Label, āļ‹āđˆāļ­āļ™āļžāļīāļĄāļžāđŒ āļŊāļĨāļŊ āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™" +Customize the Notification,āļāļģāļŦāļ™āļ”āļ›āļĢāļ°āļāļēāļĻ +Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,āļ›āļĢāļąāļšāđāļ•āđˆāļ‡āļ‚āđ‰āļ­āļ„āļ§āļēāļĄāđ€āļāļĢāļīāđˆāļ™āļ™āļģāļ—āļĩāđˆāļˆāļ°āđ„āļ›āđ€āļ›āđ‡āļ™āļŠāđˆāļ§āļ™āļŦāļ™āļķāđˆāļ‡āļ‚āļ­āļ‡āļ­āļĩāđ€āļĄāļĨāļ—āļĩāđˆ āđāļ•āđˆāļĨāļ°āļĢāļēāļĒāļāļēāļĢāļĄāļĩāļ‚āđ‰āļ­āļ„āļ§āļēāļĄāđ€āļāļĢāļīāđˆāļ™āļ™āļģāđāļĒāļ +DN,DN +DN Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” DN +Daily,āļ›āļĢāļ°āļˆāļģāļ§āļąāļ™ +"Daily, weekly, monthly email Digests",āļĢāļēāļĒāļ§āļąāļ™āļĢāļēāļĒāļŠāļąāļ›āļ”āļēāļŦāđŒāļĢāļēāļĒāđ€āļ”āļ·āļ­āļ™āļ­āļĩāđ€āļĄāļĨāđŒāļŠāļģāļ„āļąāļ +Danger,āļ­āļąāļ™āļ•āļĢāļēāļĒ +Data,āļ‚āđ‰āļ­āļĄāļđāļĨ +Data Import,āļāļēāļĢāļ™āļģāđ€āļ‚āđ‰āļēāļ‚āđ‰āļ­āļĄāļđāļĨ +Data Import Tool,āđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĄāļ·āļ­āļāļēāļĢāļ™āļģāđ€āļ‚āđ‰āļēāļ‚āđ‰āļ­āļĄāļđāļĨ +Database,āļāļēāļ™āļ‚āđ‰āļ­āļĄāļđāļĨ +Database of potential customers.,āļāļēāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļĄāļĩāļĻāļąāļāļĒāļ āļēāļž +Date,āļ§āļąāļ™āļ—āļĩāđˆ +Date Format,āļĢāļđāļ›āđāļšāļšāļ§āļąāļ™āļ—āļĩāđˆ +Date Of Retirement,āļ§āļąāļ™āļ—āļĩāđˆāļ‚āļ­āļ‡āļāļēāļĢāđ€āļāļĐāļĩāļĒāļ“āļ­āļēāļĒāļļ +Date is repeated,āļ§āļąāļ™āļ—āļĩāđˆāļ‹āđ‰āļģāđāļĨāđ‰āļ§āļ‹āđ‰āļģāļ­āļĩāļ +Date of Birth,āļ§āļąāļ™āđ€āļāļīāļ” +Date of Issue,āļ§āļąāļ™āļ—āļĩāđˆāļ­āļ­āļ +Date of Joining,āļ§āļąāļ™āļ—āļĩāđˆāļ‚āļ­āļ‡āļāļēāļĢāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄ +Date on which lorry started from supplier warehouse,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļˆāļēāļāļĢāļ–āļšāļĢāļĢāļ—āļļāļāļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļœāļđāđ‰āļˆāļąāļ”āļˆāļģāļŦāļ™āđˆāļēāļĒ +Date on which lorry started from your warehouse,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļˆāļēāļāļĢāļ–āļšāļĢāļĢāļ—āļļāļāļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļ‚āļ­āļ‡āļ„āļļāļ“ +Date on which the lead was last contacted,āļ§āļąāļ™āļ—āļĩāđˆāļ™āļģāđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļ•āļīāļ”āļ•āđˆāļ­āļĨāđˆāļēāļŠāļļāļ” +Dates,āļ§āļąāļ™āļ—āļĩāđˆ +Datetime,datetime +Days for which Holidays are blocked for this department.,āļ§āļąāļ™āļ—āļĩāđˆāļ§āļąāļ™āļŦāļĒāļļāļ”āļˆāļ°āļ–āļđāļāļšāļĨāđ‡āļ­āļāļŠāļģāļŦāļĢāļąāļšāđāļœāļ™āļāļ™āļĩāđ‰ +Dealer,āđ€āļˆāđ‰āļēāļĄāļ·āļ­ +Dear,āļ™āđˆāļēāļĢāļąāļ +Debit,āļŦāļąāļāļšāļąāļāļŠāļĩ +Debit Amt,āļˆāļģāļ™āļ§āļ™āļšāļąāļ•āļĢāđ€āļ”āļšāļīāļ• +Debit Note,āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāđ€āļ”āļšāļīāļ• +Debit To,āđ€āļ”āļšāļīāļ•āđ€āļžāļ·āđˆāļ­ +Debit or Credit,āđ€āļ”āļšāļīāļ•āļŦāļĢāļ·āļ­āļšāļąāļ•āļĢāđ€āļ„āļĢāļ”āļīāļ• +Deduct,āļŦāļąāļ +Deduction,āļāļēāļĢāļŦāļąāļ +Deduction Type,āļ›āļĢāļ°āđ€āļ āļ—āļŦāļąāļ +Deduction1,Deduction1 +Deductions,āļāļēāļĢāļŦāļąāļāđ€āļ‡āļīāļ™ +Default,āļœāļīāļ”āļ™āļąāļ” +Default Account,āļšāļąāļāļŠāļĩāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default BOM,BOM āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļšāļąāļāļŠāļĩāļ˜āļ™āļēāļ„āļēāļĢ / āđ€āļ‡āļīāļ™āļŠāļ”āļˆāļ°āļ–āļđāļāļ›āļĢāļąāļšāļ›āļĢāļļāļ‡āđ‚āļ”āļĒāļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļīāđƒāļ™āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰ POS āđ€āļĄāļ·āđˆāļ­āđ‚āļŦāļĄāļ”āļ™āļĩāđ‰āļ–āļđāļāđ€āļĨāļ·āļ­āļ +Default Bank Account,āļšāļąāļāļŠāļĩāļ˜āļ™āļēāļ„āļēāļĢāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Commission Rate,āļ­āļąāļ•āļĢāļēāļ„āđˆāļēāļ„āļ­āļĄāļĄāļīāļŠāļŠāļąāđˆāļ™āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Company,āļšāļĢāļīāļĐāļąāļ— āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Cost Center,āļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Cost Center for tracking expense for this item.,āļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ•āļīāļ”āļ•āļēāļĄāļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢāļ™āļĩ​​āđ‰ +Default Currency,āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Customer Group,āļāļĨāļļāđˆāļĄāļĨāļđāļāļ„āđ‰āļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Expense Account,āļšāļąāļāļŠāļĩāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Home Page,āļŦāļ™āđ‰āļēāđāļĢāļāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Home Pages,āļŦāļ™āđ‰āļēāđāļĢāļāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Income Account,āļšāļąāļāļŠāļĩāļĢāļēāļĒāđ„āļ”āđ‰āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Item Group,āļāļĨāļļāđˆāļĄāļŠāļīāļ™āļ„āđ‰āļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Price List,āļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Price List Currency,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļĢāļēāļĒāļāļēāļĢāļĢāļēāļ„āļē +Default Print Format,āļĢāļđāļ›āđāļšāļšāļāļēāļĢāļžāļīāļĄāļžāđŒāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Product Category,āļ›āļĢāļ°āđ€āļ āļ—āļŠāļīāļ™āļ„āđ‰āļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Purchase Account in which cost of the item will be debited.,āļšāļąāļāļŠāļĩāļ‹āļ·āđ‰āļ­āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ—āļĩāđˆāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāļˆāļ°āļ–āļđāļāļŦāļąāļ +Default Reserved Warehouse,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļŠāļ‡āļ§āļ™ +Default Sales Partner,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ‚āļēāļĒāļžāļąāļ™āļ˜āļĄāļīāļ•āļĢ +Default Settings,āļ•āļąāđ‰āļ‡āļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Source Warehouse,āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļ—āļĩāđˆāļĄāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Stock UOM,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ UOM āļŠāļ•āđ‡āļ­āļ +Default Supplier Type,āļ‹āļąāļžāļžāļĨāļēāļĒāđ€āļ­āļ­āļĢāđŒāļŠāļ™āļīāļ”āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Target Warehouse,āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Territory,āļ”āļīāļ™āđāļ”āļ™āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Unit of Measure,āļŦāļ™āđˆāļ§āļĒāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ‚āļ­āļ‡āļ§āļąāļ” +Default Valuation Method,āļ§āļīāļ˜āļĩāļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Value,āļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default Warehouse Type,āļ›āļĢāļ°āđ€āļ āļ—āļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Default values are set across the role and can be over-ridden by user permissions.,āļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļˆāļ°āļāļģāļŦāļ™āļ”āļ—āļąāđˆāļ§āļšāļ—āļšāļēāļ—āđāļĨāļ°āļŠāļēāļĄāļēāļĢāļ–āđ€āļāļīāļ™āļ‚āļĩāđˆāļŠāļīāļ—āļ˜āļīāđŒāļ‚āļ­āļ‡āļœāļđāđ‰āđƒāļŠāđ‰ +"Default: ""Product Search""",āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™: "āļ„āđ‰āļ™āļŦāļēāļœāļĨāļīāļ•āļ āļąāļ“āļ‘āđŒ" +DefaultValue,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +Defaults,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ +"Define Budget for this Cost Center. To set budget action, see Company Master","āļāļģāļŦāļ™āļ”āļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļŠāļģāļŦāļĢāļąāļšāļĻāļđāļ™āļĒāđŒāļ•āđ‰āļ™āļ—āļļāļ™āļ™āļĩāđ‰ āđ€āļžāļ·āđˆāļ­āļ•āļąāđ‰āļ‡āļāļĢāļ°āļ—āļģāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āđ€āļŦāđ‡āļ™ āļšāļĢāļīāļĐāļąāļ— āļĄāļēāļŠāđ€āļ•āļ­āļĢāđŒ" +Define Rule,āļāļģāļŦāļ™āļ”āļāļŽ +Defines actions on states and the next step and allowed roles.,āļāļģāļŦāļ™āļ”āļ”āļģāđ€āļ™āļīāļ™āļāļēāļĢāļāļąāļšāļĢāļąāļāđāļĨāļ°āļ‚āļąāđ‰āļ™āļ•āļ­āļ™āļ•āđˆāļ­āđ„āļ›āđāļĨāļ°āļšāļ—āļšāļēāļ—āļ­āļ™āļļāļāļēāļ• +Defines workflow states and rules for a document.,āļāļģāļŦāļ™āļ”āļĢāļąāļāđ€āļ§āļīāļĢāđŒāļāđ‚āļŸāļĨāļ§āđŒāđāļĨāļ°āļāļŽāļĢāļ°āđ€āļšāļĩāļĒāļšāļŠāļģāļŦāļĢāļąāļšāđ€āļ­āļāļŠāļēāļĢ +Delete,āļĨāļš +Delivered,āļŠāđˆāļ‡ +Delivered Items To Be Billed,āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāļŠāđˆāļ‡āļˆāļ°āđ€āļĢāļĩāļĒāļāđ€āļāđ‡āļšāđ€āļ‡āļīāļ™ +Delivered Qty,āļˆāļģāļ™āļ§āļ™āļŠāđˆāļ‡ +Delivery (shipment) to customers.,āļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡ (āļ‚āļ™āļŠāđˆāļ‡) āđƒāļŦāđ‰āļāļąāļšāļĨāļđāļāļ„āđ‰āļē +Delivery Address,āļ—āļĩāđˆāļ­āļĒāļđāđˆāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Delivery Date,āļ§āļąāļ™āļ—āļĩāđˆāļŠāđˆāļ‡ +Delivery Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Delivery Document No,āđ€āļ­āļāļŠāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđ„āļĄāđˆāļĄāļĩ +Delivery Document Type,āļ›āļĢāļ°āđ€āļ āļ—āđ€āļ­āļāļŠāļēāļĢāļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Delivery Note,āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Delivery Note Item,āļĢāļēāļĒāļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļ +Delivery Note Items,āļĢāļēāļĒāļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļ +Delivery Note Message,āļ‚āđ‰āļ­āļ„āļ§āļēāļĄāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Delivery Note No,āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđ„āļĄāđˆāļĄāļĩ +Delivery Note Packing Item,āļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļšāļĢāļĢāļˆāļļāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļ +Delivery Note Required,āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļ—āļĩāđˆāļˆāļģāđ€āļ›āđ‡āļ™ +Delivery Status,āļŠāļ–āļēāļ™āļ°āļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Delivery Time,āđ€āļ§āļĨāļēāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Department,āđāļœāļ™āļ +Depend on LWP,āļ‚āļķāđ‰āļ™āļ­āļĒāļđāđˆāļāļąāļš LWP +Depends On,āļ‚āļķāđ‰āļ™āļ­āļĒāļđāđˆāļāļąāļš +Depends on LWP,āļ‚āļķāđ‰āļ™āļ­āļĒāļđāđˆāļāļąāļš LWP +Descending,āļ™āđ‰āļ­āļĒ +Description,āļĨāļąāļāļĐāļ“āļ° +Description HTML,HTML āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” +Description of a Job Opening,āļ„āļģāļ­āļ˜āļīāļšāļēāļĒāļ‚āļ­āļ‡āļāļēāļĢāđ€āļ›āļīāļ”āļ‡āļēāļ™ +Desert,āļ—āļ°āđ€āļĨāļ—āļĢāļēāļĒ +Designation,āļāļēāļĢāđāļ•āđˆāļ‡āļ•āļąāđ‰āļ‡ +Desktop,āļŠāļāđŒāļ—āđ‡āļ­āļ› +Detail Name,āļŠāļ·āđˆāļ­āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” +Detailed Breakup of the totals,āļāļĢāļ°āļˆāļąāļ”āļāļĢāļ°āļˆāļēāļĒāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ‚āļ­āļ‡āļœāļĨāļĢāļ§āļĄ +Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” +Did not add.,āđ„āļĄāđˆāđ„āļ”āđ‰āđ€āļžāļīāđˆāļĄ +Did not cancel,āđ„āļĄāđˆāđ„āļ”āđ‰āļĒāļāđ€āļĨāļīāļ +Did not save,āđ„āļĄāđˆāđ„āļ”āđ‰āļšāļąāļ™āļ—āļķāļ +Difference,āļ‚āđ‰āļ­āđāļ•āļāļ•āđˆāļēāļ‡ +"Different ""States"" this document can exist in. Like ""Open"", ""Pending Approval"" etc.","āļ—āļĩāđˆāđāļ•āļāļ•āđˆāļēāļ‡āļāļąāļ™ "āļĢāļąāļ" āđ€āļ­āļāļŠāļēāļĢāļ™āļĩāđ‰āļŠāļēāļĄāļēāļĢāļ–āļ­āļĒāļđāđˆāļĄāļēāļŠāļ­āļš "āđ€āļ›āļīāļ”", "āļĢāļ­āļāļēāļĢāļ­āļ™āļļāļĄāļąāļ•āļī" āļŊāļĨāļŊ" +Disabled,āļžāļīāļāļēāļĢ +Disabled Filters,āļāļĢāļ­āļ‡āļžāļīāļāļēāļĢ +Discount %,āļŠāđˆāļ§āļ™āļĨāļ”% +Discount %,āļŠāđˆāļ§āļ™āļĨāļ”% +Discount (%),āļŠāđˆāļ§āļ™āļĨāļ” (%) +"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","āļ—āļļāđˆāļ‡āļŠāđˆāļ§āļ™āļĨāļ”āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āđƒāļŠāđ‰āđ„āļ”āđ‰āđƒāļ™āđƒāļšāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļĢāļąāļšāļ‹āļ·āđ‰āļ­, āđƒāļšāļāļģāļāļąāļšāļ‹āļ·āđ‰āļ­" +Discount(%),āļŠāđˆāļ§āļ™āļĨāļ” (%) +Display,āđāļŠāļ”āļ‡ +Display Settings,āđāļŠāļ”āļ‡āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļē +Display all the individual items delivered with the main items,āđāļŠāļ”āļ‡āļĢāļēāļĒāļāļēāļĢāļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ‚āļ­āļ‡āđāļ•āđˆāļĨāļ°āļšāļļāļ„āļ„āļĨāļĄāļēāļžāļĢāđ‰āļ­āļĄāļāļąāļšāļĢāļēāļĒāļāļēāļĢāļŦāļĨāļąāļ +Distinct unit of an Item,āļŦāļ™āđˆāļ§āļĒāļ—āļĩāđˆāđāļ•āļāļ•āđˆāļēāļ‡āļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢ +Distribute transport overhead across items.,āđāļˆāļāļˆāđˆāļēāļĒāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļāļēāļĢāļ‚āļ™āļŠāđˆāļ‡āļ‚āđ‰āļēāļĄāļĢāļēāļĒāļāļēāļĢ +Distribution Id,āļĢāļŦāļąāļŠāļāļĢāļ°āļˆāļēāļĒ +Distribution Name,āļŠāļ·āđˆāļ­āļāļēāļĢāđāļˆāļāļˆāđˆāļēāļĒ +Distributor,āļœāļđāđ‰āļˆāļąāļ”āļˆāļģāļŦāļ™āđˆāļēāļĒ +Divorced,āļŦāļĒāđˆāļēāļĢāđ‰āļēāļ‡ +Do not show any symbol like $ etc next to currencies.,āđ„āļĄāđˆāđāļŠāļ”āļ‡āļŠāļąāļāļĨāļąāļāļĐāļ“āđŒāđƒāļ” āđ† āđ€āļŠāđˆāļ™ āļŊāļĨāļŊ $ āļ•āđˆāļ­āđ„āļ›āļāļąāļšāđ€āļ‡āļīāļ™āļŠāļāļļāļĨ +Doc Name,āļŠāļ·āđˆāļ­āļŦāļĄāļ­ +Doc Status,āļŠāļ–āļēāļ™āļ° Doc +Doc Type,āļ›āļĢāļ°āđ€āļ āļ— Doc +DocField,DocField +DocPerm,DocPerm +DocType,DOCTYPE +DocType Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” DocType +DocType Label,āļ›āđ‰āļēāļĒ DocType +DocType Mapper,Mapper DocType +DocType is a Table / Form in the application.,DocType āđ€āļ›āđ‡āļ™āļ•āļēāļĢāļēāļ‡ / āđāļšāļšāļŸāļ­āļĢāđŒāļĄāđƒāļ™āđƒāļšāļŠāļĄāļąāļ„āļĢ +DocType on which this Workflow is applicable.,DOCTYPE āļ—āļĩāđˆāđ€āļ§āļīāļĢāđŒāļāđ‚āļŸāļĨāļ§āđŒāļ™āļĩāđ‰āđƒāļŠāđ‰āđ„āļ”āđ‰ +DocType or Field,DocType āļŦāļĢāļ·āļ­āļŠāļēāļ‚āļē +Document,āđ€āļ­āļāļŠāļēāļĢ +Document Description,āļ„āļģāļ­āļ˜āļīāļšāļēāļĒāđ€āļ­āļāļŠāļēāļĢ +Document Status transition from ,āđ€āļ›āļĨāļĩāđˆāļĒāļ™āļŠāļ–āļēāļ™āļ°āđ€āļ­āļāļŠāļēāļĢāļˆāļēāļ +Document Type,āļ›āļĢāļ°āđ€āļ āļ—āđ€āļ­āļāļŠāļēāļĢ +Document is only editable by users of role,āđ€āļ­āļāļŠāļēāļĢāđ€āļ›āđ‡āļ™āđ€āļžāļĩāļĒāļ‡āđāļāđ‰āđ„āļ‚āđ„āļ”āđ‰āđ‚āļ”āļĒāļœāļđāđ‰āđƒāļŠāđ‰āļ‚āļ­āļ‡āļšāļ—āļšāļēāļ— +Document to rename,āđ€āļ­āļāļŠāļēāļĢāļāļēāļĢāđ€āļ›āļĨāļĩāđˆāļĒāļ™āļŠāļ·āđˆāļ­ +Documentation,āđ€āļ­āļāļŠāļēāļĢ +Documents,āđ€āļ­āļāļŠāļēāļĢ +Domain List,āļĢāļēāļĒāļŠāļ·āđˆāļ­āđ‚āļ”āđ€āļĄāļ™ +Download Backup,āļ”āļēāļ§āļ™āđŒāđ‚āļŦāļĨāļ”āļŠāļģāļĢāļ­āļ‡ +Download Materials Required,āļ”āļēāļ§āļ™āđŒāđ‚āļŦāļĨāļ”āļ§āļąāļŠāļ”āļļāļ—āļĩāđˆāļˆāļģāđ€āļ›āđ‡āļ™ +Download Template,āļ”āļēāļ§āļ™āđŒāđ‚āļŦāļĨāļ”āđāļĄāđˆāđāļšāļš +Download a report containing all raw materials with their latest inventory status,āļ”āļēāļ§āļ™āđŒāđ‚āļŦāļĨāļ”āļĢāļēāļĒāļ‡āļēāļ™āļ—āļĩāđˆāļĄāļĩāļ§āļąāļ•āļ–āļļāļ”āļīāļšāļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ—āļĩāđˆāļĄāļĩāļŠāļ–āļēāļ™āļ°āļŠāļīāļ™āļ„āđ‰āļēāļ„āļ‡āļ„āļĨāļąāļ‡āļ‚āļ­āļ‡āļžāļ§āļāđ€āļ‚āļēāļĨāđˆāļēāļŠāļļāļ” +Draft,āļĢāđˆāļēāļ‡ +Drafts,āļĢāđˆāļēāļ‡ +Drag to sort columns,āļĨāļēāļāđ€āļžāļ·āđˆāļ­āđ€āļĢāļĩāļĒāļ‡āļĨāļģāļ”āļąāļšāļ„āļ­āļĨāļąāļĄāļ™āđŒ +Due Date,āļ§āļąāļ™āļ—āļĩāđˆāļ„āļĢāļšāļāļģāļŦāļ™āļ” +Duration,āļĢāļ°āļĒāļ°āđ€āļ§āļĨāļē +EMP/,EMP / +ESIC CARD No,CARD ESIC āđ„āļĄāđˆāļĄāļĩ +ESIC No.,āļŦāļĄāļēāļĒāđ€āļĨāļ‚ ESIC +Earning,āļĢāļēāļĒāđ„āļ”āđ‰ +Earning & Deduction,āļĢāļēāļĒāđ„āļ”āđ‰āđāļĨāļ°āļāļēāļĢāļŦāļąāļ +Earning Type,āļĢāļēāļĒāđ„āļ”āđ‰āļ›āļĢāļ°āđ€āļ āļ— +Earning1,Earning1 +Edit,āđāļāđ‰āđ„āļ‚ +Editable,āļ—āļĩāđˆāļŠāļēāļĄāļēāļĢāļ–āđāļāđ‰āđ„āļ‚āđ„āļ”āđ‰ +Educational Qualification,āļ§āļļāļ’āļīāļāļēāļĢāļĻāļķāļāļĐāļē +Educational Qualification Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ„āļļ​​āļ“āļŠāļĄāļšāļąāļ•āļīāļāļēāļĢāļĻāļķāļāļĐāļē +Eg. smsgateway.com/api/send_sms.cgi,āđ€āļŠāđˆāļ™ smsgateway.com / API / send_sms.cgi +Eligible Amount,āļˆāļģāļ™āļ§āļ™āļŠāļīāļ—āļ˜āļīāđŒ +Email,āļ­āļĩāđ€āļĄāļĨāđŒ +Email (By company),āļ­āļĩāđ€āļĄāļĨāđŒ (āđ‚āļ”āļĒ āļšāļĢāļīāļĐāļąāļ— ) +Email Digest,āļ‚āđˆāļēāļ§āļŠāļēāļĢāļ—āļēāļ‡āļ­āļĩāđ€āļĄāļĨ +Email Digest Settings,āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ­āļĩāđ€āļĄāļĨāđ€āļ”āđˆāļ™ +Email Host,āđ‚āļŪāļŠāļ•āđŒāļ­āļĩāđ€āļĄāļĨāđŒ +Email Id,Email āļĢāļŦāļąāļŠ +"Email Id must be unique, already exists for: ",Email āļĢāļŦāļąāļŠāļ•āđ‰āļ­āļ‡āđ„āļĄāđˆāļ‹āđ‰āļģāļāļąāļ™āļ­āļĒāļđāđˆāđāļĨāđ‰āļ§āļŠāļģāļŦāļĢāļąāļš: +"Email Id where a job applicant will email e.g. ""jobs@example.com""",Email āļĢāļŦāļąāļŠāļ—āļĩāđˆāļœāļđāđ‰āļŠāļĄāļąāļ„āļĢāļ‡āļēāļ™āļˆāļ°āļŠāđˆāļ‡āļ­āļĩāđ€āļĄāļĨāļ–āļķāļ‡ "jobs@example.com" āđ€āļŠāđˆāļ™ +Email Login,āđ€āļ‚āđ‰āļēāļŠāļđāđˆāļĢāļ°āļšāļšāļ­āļĩāđ€āļĄāļĨāđŒ +Email Password,āļĢāļŦāļąāļŠāļœāđˆāļēāļ™ Email +Email Sent,āļ­āļĩāđ€āļĄāļĨāļ—āļĩāđˆāļŠāđˆāļ‡ +Email Sent?,āļ­āļĩāđ€āļĄāļĨāļ—āļĩāđˆāļŠāđˆāļ‡? +Email Settings,āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ­āļĩāđ€āļĄāļĨ +Email Settings for Outgoing and Incoming Emails.,āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ­āļĩāđ€āļĄāļĨāļŠāļģāļŦāļĢāļąāļšāļ­āļĩāđ€āļĄāļĨāļ‚āļēāļ­āļ­āļāđāļĨāļ°āļ‚āļēāđ€āļ‚āđ‰āļē +Email Signature,āļĨāļēāļĒāđ€āļ‹āđ‡āļ™āļ­āļĩāđ€āļĄāļĨ +Email Use SSL,āļŠāđˆāļ‡āļ­āļĩāđ€āļĄāļĨāđƒāļŠāđ‰ SSL +"Email addresses, separted by commas","āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ­āļĩāđ€āļĄāļĨ, separted āļ”āđ‰āļ§āļĒāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļŦāļĄāļēāļĒāļˆāļļāļĨāļ āļēāļ„" +"Email settings for jobs email id ""jobs@example.com""",āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ­āļĩāđ€āļĄāļĨāļŠāļģāļŦāļĢāļąāļšāļ­āļĩāđ€āļĄāļĨ ID āļ‡āļēāļ™ "jobs@example.com" +"Email settings to extract Leads from sales email id e.g. ""sales@example.com""",āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ­āļĩāđ€āļĄāļĨāļ—āļĩāđˆāļˆāļ°āļ”āļķāļ‡āļ™āļģāļĄāļēāļˆāļēāļāļ­āļĩāđ€āļĄāļĨāđŒ ID āđ€āļŠāđˆāļ™āļĒāļ­āļ”āļ‚āļēāļĒ "sales@example.com" +Embed image slideshows in website pages.,āļāļąāļ‡āļ āļēāļžāļŠāđ„āļĨāļ”āđŒāļ āļēāļžāđƒāļ™āļŦāļ™āđ‰āļēāđ€āļ§āđ‡āļšāđ„āļ‹āļ•āđŒ +Emergency Contact Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļ•āļīāļ”āļ•āđˆāļ­āđƒāļ™āļāļĢāļ“āļĩāļ‰āļļāļāđ€āļ‰āļīāļ™ +Emergency Phone Number,āļŦāļĄāļēāļĒāđ€āļĨāļ‚āđ‚āļ—āļĢāļĻāļąāļžāļ—āđŒāļ‰āļļāļāđ€āļ‰āļīāļ™ +Employee,āļĨāļđāļāļˆāđ‰āļēāļ‡ +Employee Designation.,āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāđāļ•āđˆāļ‡āļ•āļąāđ‰āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +Employee Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +Employee Education,āļāļēāļĢāļĻāļķāļāļĐāļēāļāļēāļĢāļ—āļģāļ‡āļēāļ™āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +Employee External Work History,āļ›āļĢāļ°āļ§āļąāļ•āļīāļāļēāļĢāļ—āļģāļ‡āļēāļ™āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™āļ āļēāļĒāļ™āļ­āļ +Employee Internal Work History,āļ›āļĢāļ°āļ§āļąāļ•āļīāļāļēāļĢāļ—āļģāļ‡āļēāļ™āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™āļ āļēāļĒāđƒāļ™ +Employee Internal Work Historys,Historys āļāļēāļĢāļ—āļģāļ‡āļēāļ™āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™āļ āļēāļĒāđƒāļ™ +Employee Name,āļŠāļ·āđˆāļ­āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +Employee Number,āļˆāļģāļ™āļ§āļ™āļžāļ™āļąāļāļ‡āļēāļ™ +Employee Records to be created by ,āļĢāļ°āđ€āļšāļĩāļĒāļ™āļžāļ™āļąāļāļ‡āļēāļ™āļ—āļĩāđˆāļˆāļ°āļ–āļđāļāļŠāļĢāđ‰āļēāļ‡āļ‚āļķāđ‰āļ™āđ‚āļ”āļĒ +Employee Setup,āļāļēāļĢāļ•āļīāļ”āļ•āļąāđ‰āļ‡āļāļēāļĢāļ—āļģāļ‡āļēāļ™āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +Employee Training,āļāļēāļĢāļāļķāļāļ­āļšāļĢāļĄāļžāļ™āļąāļāļ‡āļēāļ™ +Employee Type,āļ›āļĢāļ°āđ€āļ āļ—āļžāļ™āļąāļāļ‡āļēāļ™ +Employee grades,āđ€āļāļĢāļ”āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +Employee record is created using selected field. ,āļĢāļ°āđ€āļšāļĩāļĒāļ™āļžāļ™āļąāļāļ‡āļēāļ™āļ—āļĩāđˆāļ–āļđāļāļŠāļĢāđ‰āļēāļ‡āļ‚āļķāđ‰āļ™āđ‚āļ”āļĒāđƒāļŠāđ‰āđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāļ—āļĩāđˆāđ€āļĨāļ·āļ­āļ +Employee records.,āļĢāļ°āđ€āļšāļĩāļĒāļ™āļžāļ™āļąāļāļ‡āļēāļ™ +Employees Email Id,Email āļĢāļŦāļąāļŠāļžāļ™āļąāļāļ‡āļēāļ™ +Employment Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļˆāđ‰āļēāļ‡āļ‡āļēāļ™ +Employment Type,āļ›āļĢāļ°āđ€āļ āļ—āļāļēāļĢāļˆāđ‰āļēāļ‡āļ‡āļēāļ™ +Enable / disable currencies.,āđ€āļ›āļīāļ” / āļ›āļīāļ”āļŠāļāļļāļĨāđ€āļ‡āļīāļ™ +Enabled,āđ€āļ›āļīāļ”āļāļēāļĢāđƒāļŠāđ‰āļ‡āļēāļ™ +Enables More Info. in all documents,āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ. āđƒāļ™āđ€āļ­āļāļŠāļēāļĢāļ—āļąāđ‰āļ‡āļŦāļĄāļ” +Encashment Date,āļ§āļąāļ™āļ—āļĩāđˆāļāļēāļĢāđ„āļ”āđ‰āđ€āļ›āđ‡āļ™āđ€āļ‡āļīāļ™āļŠāļ” +End Date,āļ§āļąāļ™āļ—āļĩāđˆāļŠāļīāđ‰āļ™āļŠāļļāļ” +End date of current invoice's period,āļ§āļąāļ™āļ—āļĩāđˆāļŠāļīāđ‰āļ™āļŠāļļāļ”āļ‚āļ­āļ‡āļĢāļ­āļšāļĢāļ°āļĒāļ°āđ€āļ§āļĨāļēāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ›āļąāļˆāļˆāļļāļšāļąāļ™ +End of Life,āđƒāļ™āļ•āļ­āļ™āļ—āđ‰āļēāļĒāļ‚āļ­āļ‡āļŠāļĩāļ§āļīāļ• +Ends on,āļŠāļīāđ‰āļ™āļŠāļļāļ” +Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,āļ›āđ‰āļ­āļ™āļĢāļŦāļąāļŠāļ—āļĩāđˆāļˆāļ°āđ„āļ”āđ‰āļĢāļąāļšāļ­āļĩāđ€āļĄāļĨāđŒāļĢāļēāļĒāļ‡āļēāļ™āļ‚āđ‰āļ­āļœāļīāļ”āļžāļĨāļēāļ”āļ—āļĩāđˆāļŠāđˆāļ‡āļĄāļēāļˆāļēāļ users.Eg: support@iwebnotes.com +Enter Form Type,āļ›āđ‰āļ­āļ™āļ›āļĢāļ°āđ€āļ āļ—āđāļšāļšāļŸāļ­āļĢāđŒāļĄ +Enter Row,āđƒāļŠāđˆāđāļ–āļ§ +Enter campaign name if the source of lead is campaign.,āļ›āđ‰āļ­āļ™āļŠāļ·āđˆāļ­āđāļ„āļĄāđ€āļ›āļāļŦāļēāļāđāļŦāļĨāđˆāļ‡āļ—āļĩāđˆāļĄāļēāļ‚āļ­āļ‡āļŠāļēāļĢāļ•āļ°āļāļąāđˆāļ§āđ€āļ›āđ‡āļ™āđāļ„āļĄāđ€āļ›āļ +"Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set ""match"" permission rules. To see list of fields, go to Customize Form.","āđƒāļŠāđˆāđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™ (āļ„āļĩāļĒāđŒ) āđāļĨāļ°āļ„āđˆāļē āļ–āđ‰āļēāļ„āļļāļ“āđ€āļžāļīāđˆāļĄāļ„āđˆāļēāļŦāļĨāļēāļĒāļ„āđˆāļēāļŠāļģāļŦāļĢāļąāļšāđ€āļ‚āļ•āļ—āļĩāđˆāļ„āļ™āđāļĢāļāļ—āļĩāđˆāļˆāļ°āļ–āļđāļāđ€āļĨāļ·āļ­āļ āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āđ€āļŦāļĨāđˆāļēāļ™āļĩāđ‰āļĒāļąāļ‡āđƒāļŠāđ‰āđƒāļ™āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļē "āļāļēāļĢāđāļ‚āđˆāļ‡āļ‚āļąāļ™" āļāļŽāļ­āļ™āļļāļāļēāļ• āđ€āļžāļ·āđˆāļ­āļ”āļđāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āļ­āļ‡āđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāđ„āļ› āļāļģāļŦāļ™āļ”āļĢāļđāļ›āđāļšāļš ." +Enter department to which this Contact belongs,āđƒāļŠāđˆāđāļœāļ™āļāļ—āļĩāđˆāļ•āļīāļ”āļ•āđˆāļ­āļ™āļĩāđ‰āđ€āļ›āđ‡āļ™āļ‚āļ­āļ‡ +Enter designation of this Contact,āđƒāļŠāđˆāļŠāļ·āđˆāļ­āļ‚āļ­āļ‡āđ€āļĢāļēāđ„āļ”āđ‰āļ—āļĩāđˆāļ™āļĩāđˆ +"Enter domain names associated to this website, each on a new line",āđƒāļŠāđˆāļŠāļ·āđˆāļ­āđ‚āļ”āđ€āļĄāļ™āļ—āļĩāđˆāđ€āļāļĩāđˆāļĒāļ§āļ‚āđ‰āļ­āļ‡āļāļąāļšāđ€āļ§āđ‡āļšāđ„āļ‹āļ•āđŒāļ™āļĩāđ‰āđāļ•āđˆāļĨāļ°āļšāļĢāļĢāļ—āļąāļ”āđƒāļŦāļĄāđˆ +"Enter email id separated by commas, invoice will be mailed automatically on particular date",āđƒāļŠāđˆāļŦāļĄāļēāļĒāđ€āļĨāļ‚āļ­āļĩāđ€āļĄāļĨāļ„āļąāđˆāļ™āļ”āđ‰āļ§āļĒāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļŦāļĄāļēāļĒāļˆāļļāļĨāļ āļēāļ„āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļˆāļ°āļ–āļđāļāļŠāđˆāļ‡āđ‚āļ”āļĒāļ­āļąāļ•āđ‚āļ™āļĄāļąāļ•āļīāđƒāļ™āļ§āļąāļ™āļ—āļĩāđˆāđ€āļˆāļēāļ°āļˆāļ‡ +Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,āļ›āđ‰āļ­āļ™āļĢāļēāļĒāļāļēāļĢāđāļĨāļ°āļˆāļģāļ™āļ§āļ™āļ—āļĩāđˆāļ§āļēāļ‡āđāļœāļ™āđ„āļ§āđ‰āļŠāļģāļŦāļĢāļąāļšāļ—āļĩāđˆāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāļ—āļĩāđˆāļˆāļ°āļĒāļāļĢāļ°āļ”āļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļœāļĨāļīāļ•āļŦāļĢāļ·āļ­āļ”āļēāļ§āļ™āđŒāđ‚āļŦāļĨāļ”āļ§āļąāļ•āļ–āļļāļ”āļīāļšāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒ +Enter message,āļ›āđ‰āļ­āļ™āļ‚āđ‰āļ­āļ„āļ§āļēāļĄ +Enter name of campaign if source of enquiry is campaign,āļ›āđ‰āļ­āļ™āļŠāļ·āđˆāļ­āļ‚āļ­āļ‡āđāļ„āļĄāđ€āļ›āļāļŦāļēāļāđāļŦāļĨāđˆāļ‡āļ—āļĩāđˆāļĄāļēāļ‚āļ­āļ‡āļāļēāļĢāļĢāļ“āļĢāļ‡āļ„āđŒāļŠāļ­āļšāļ–āļēāļĄāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄ +"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",āļ›āđ‰āļ­āļ™āļžāļēāļĢāļēāļĄāļīāđ€āļ•āļ­āļĢāđŒāļ„āļ‡āļ—āļĩāđˆ URL āļ—āļĩāđˆāļ™āļĩāđˆ (āđ€āļŠāđˆāļ™āļœāļđāđ‰āļŠāđˆāļ‡ = ERPNext āļŠāļ·āđˆāļ­āļœāļđāđ‰āđƒāļŠāđ‰ = ERPNext āļĢāļŦāļąāļŠāļœāđˆāļēāļ™ = 1234 āļŊāļĨāļŊ ) +Enter the company name under which Account Head will be created for this Supplier,āļ›āđ‰āļ­āļ™āļŠāļ·āđˆāļ­ āļšāļĢāļīāļĐāļąāļ— āļ āļēāļĒāđƒāļ•āđ‰āļ‹āļķāđˆāļ‡āļŦāļąāļ§āļŦāļ™āđ‰āļēāļšāļąāļāļŠāļĩāļˆāļ°āļ–āļđāļāļŠāļĢāđ‰āļēāļ‡āļ‚āļķāđ‰āļ™āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āļœāļĨāļīāļ•āļ™āļĩāđ‰ +Enter the date by which payments from customer is expected against this invoice.,āļ›āđ‰āļ­āļ™āļ§āļąāļ™āļ—āļĩāđˆāđ‚āļ”āļĒāļ—āļĩāđˆāļāļēāļĢāļŠāļģāļĢāļ°āđ€āļ‡āļīāļ™āļˆāļēāļāļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļ„āļēāļ”āļ§āđˆāļēāļˆāļ°āļ•āđˆāļ­āļ•āđ‰āļēāļ™āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ™āļĩāđ‰ +Enter url parameter for message,āļ›āđ‰āļ­āļ™āļžāļēāļĢāļēāļĄāļīāđ€āļ•āļ­āļĢāđŒ URL āļŠāļģāļŦāļĢāļąāļšāļ‚āđ‰āļ­āļ„āļ§āļēāļĄ +Enter url parameter for receiver nos,āļ›āđ‰āļ­āļ™āļžāļēāļĢāļēāļĄāļīāđ€āļ•āļ­āļĢāđŒ URL āļŠāļģāļŦāļĢāļąāļš Nos āļĢāļąāļš +Entries,āļ„āļ­āļĄāđ€āļĄāļ™āļ•āđŒ +Entries are not allowed against this Fiscal Year if the year is closed.,āļ„āļ­āļĄāđ€āļĄāļ™āļ•āđŒāđ„āļĄāđˆāđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļāļēāļ•āļāļąāļšāļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ™āļĩāđ‰āļŦāļēāļāļ—āļĩāđˆāļ›āļīāļ”āļ›āļĩ +Error,āļ„āļ§āļēāļĄāļœāļīāļ”āļžāļĨāļēāļ” +Estimated Material Cost,āļ•āđ‰āļ™āļ—āļļāļ™āļ§āļąāļŠāļ”āļļāļ›āļĢāļ°āļĄāļēāļ“ +Event,āđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Event Individuals,āļšāļļāļ„āļ„āļĨāđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Event Role,āļšāļ—āļšāļēāļ—āđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Event Roles,āļšāļ—āļšāļēāļ—āđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Event Type,āļŠāļ™āļīāļ”āđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Event Updates,āļ›āļĢāļąāļšāļ›āļĢāļļāļ‡āđ€āļŦāļ•āļļāļāļēāļĢāļ“āđŒ +Event User,āļœāļđāđ‰āđƒāļŠāđ‰āļ‡āļēāļ™ +Exchange Rate,āļ­āļąāļ•āļĢāļēāđāļĨāļāđ€āļ›āļĨāļĩāđˆāļĒāļ™ +Excise Page Number,āļŦāļĄāļēāļĒāđ€āļĨāļ‚āļŦāļ™āđ‰āļēāļŠāļĢāļĢāļžāļŠāļēāļĄāļīāļ• +Excise Voucher,āļšāļąāļ•āļĢāļāļģāļ™āļąāļĨāļŠāļĢāļĢāļžāļŠāļēāļĄāļīāļ• +Execute,āļ›āļāļīāļšāļąāļ•āļī +Exemption Limit,āļ§āļ‡āđ€āļ‡āļīāļ™āļ‚āđ‰āļ­āļĒāļāđ€āļ§āđ‰āļ™ +Exhibition,āļ‡āļēāļ™āļĄāļŦāļāļĢāļĢāļĄ +Existing Customer,āļĨāļđāļāļ„āđ‰āļēāļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆ +Exit,āļ—āļēāļ‡āļ­āļ­āļ +Exit Interview Details,āļ­āļ­āļāļˆāļēāļāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļāļēāļĢāļŠāļąāļĄāļ āļēāļĐāļ“āđŒ +Expected,āļ—āļĩāđˆāļ„āļēāļ”āļŦāļ§āļąāļ‡ +Expected Delivery Date,āļ„āļēāļ”āļ§āđˆāļēāļ§āļąāļ™āļ—āļĩāđˆāļŠāđˆāļ‡ +Expected End Date,āļ„āļēāļ”āļ§āđˆāļēāļ§āļąāļ™āļ—āļĩāđˆāļŠāļīāđ‰āļ™āļŠāļļāļ” +Expected Start Date,āļ§āļąāļ™āļ—āļĩāđˆāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ„āļēāļ”āļ§āđˆāļē +Expense Account,āļšāļąāļāļŠāļĩāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Expense Claim,āđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Expense Claim Approved,āđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļĄāļąāļ•āļī +Expense Claim Approved Message,āđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļĄāļąāļ•āļīāļ‚āđ‰āļ­āļ„āļ§āļēāļĄ +Expense Claim Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļŠāļīāļ™āđ„āļŦāļĄ +Expense Claim Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļŠāļīāļ™āđ„āļŦāļĄ +Expense Claim Rejected,āđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļ—āļĩāđˆāļ–āļđāļāļ›āļāļīāđ€āļŠāļ˜ +Expense Claim Rejected Message,āđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāļ—āļĩāđˆāļ–āļđāļāļ›āļāļīāđ€āļŠāļ˜āļ‚āđ‰āļ­āļ„āļ§āļēāļĄ +Expense Claim Type,āđ€āļĢāļĩāļĒāļāļĢāđ‰āļ­āļ‡āļ›āļĢāļ°āđ€āļ āļ—āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Expense Date,āļ§āļąāļ™āļ—āļĩāđˆāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Expense Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Expense Head,āļŦāļąāļ§āļŦāļ™āđ‰āļēāļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒ +Expenses Booked,āļ„āđˆāļēāđƒāļŠāđ‰āļˆāđˆāļēāļĒāđƒāļ™ Booked +Expiry Date,āļ§āļąāļ™āļŦāļĄāļ”āļ­āļēāļĒāļļ +Export,āļŠāđˆāļ‡āļ­āļ­āļ +Exports,āļāļēāļĢāļŠāđˆāļ‡āļ­āļ­āļ +External,āļ āļēāļĒāļ™āļ­āļ +Extra Condition,āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚āļžāļīāđ€āļĻāļĐ +Extract Emails,āļŠāļēāļĢāļŠāļāļąāļ”āļˆāļēāļāļ­āļĩāđ€āļĄāļĨ +Extract Job Applicant from jobs email id e.g. jobs@example.com,āļŠāļēāļĢāļŠāļāļąāļ”āļˆāļēāļāđƒāļšāļ‡āļēāļ™āļˆāļēāļāļ‡āļēāļ™āļ­āļĩāđ€āļĄāļĨāđŒāļĢāļŦāļąāļŠāđ€āļŠāđˆāļ™ jobs@example.com +Extract Leads from sales email id e.g. sales@example.com,āļŠāļēāļĢāļŠāļāļąāļ”āļ™āļģāļĄāļēāļˆāļēāļāļĒāļ­āļ”āļ‚āļēāļĒāļ­āļĩāđ€āļĄāļĨāđŒ ID āđ€āļŠāđˆāļ™ sales@example.com +FCFS Rate,āļ­āļąāļ•āļĢāļē FCFS +FIFO,FIFO +Family Background,āļ āļđāļĄāļīāļŦāļĨāļąāļ‡āļ‚āļ­āļ‡āļ„āļĢāļ­āļšāļ„āļĢāļąāļ§ +FavIcon,favicon +Fax,āđāļŸāļāļ‹āđŒ +Featured Item,āļĢāļēāļĒāļāļēāļĢāđ€āļ”āđˆāļ™ +Featured Item in Item Group,āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāđ‚āļ”āļ”āđ€āļ”āđˆāļ™āđƒāļ™āļāļĨāļļāđˆāļĄāļŠāļīāļ™āļ„āđ‰āļē +Features Setup,āļāļēāļĢāļ•āļīāļ”āļ•āļąāđ‰āļ‡āļŠāļīāđˆāļ‡āļ­āļģāļ™āļ§āļĒāļ„āļ§āļēāļĄāļŠāļ°āļ”āļ§āļ +Feed,āļāļīāļ™ +Feed Type,āļŸāļĩāļ”āļ›āļĢāļ°āđ€āļ āļ— +Feedback,āļ‚āđ‰āļ­āđ€āļŠāļ™āļ­āđāļ™āļ° +Female,āļŦāļāļīāļ‡ +Fetch lead which will be converted into customer.,āđ€āļĢāļĩāļĒāļāļ•āļ°āļāļąāđˆāļ§āļ‹āļķāđˆāļ‡āļˆāļ°āļ–āļđāļāđāļ›āļĨāļ‡āđ€āļ›āđ‡āļ™āļĨāļđāļāļ„āđ‰āļē +Field,āļŠāļ™āļēāļĄ +Field Description,āļŸāļīāļĨāļ”āđŒāļ„āļģāļ­āļ˜āļīāļšāļēāļĒ +Field Mapper Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļŠāļ™āļēāļĄāđāļĄāļ›āđ€āļ›āļ­āļĢāđŒ +Field Mapper Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļŠāļ™āļēāļĄāđāļĄāļ›āđ€āļ›āļ­āļĢāđŒ +Field Name,āļŠāļ·āđˆāļ­āđ€āļ‚āļ• +Field Type,āļŸāļīāļĨāļ”āđŒāļŠāļ™āļīāļ” +"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","āļŠāļ™āļēāļĄāļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāđƒāļ™āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļŠāđˆāļ‡āđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļē, āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļāļēāļĢāļ‚āļēāļĒ, āļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒ" +Field from other forms,āđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāļˆāļēāļāļĢāļđāļ›āđāļšāļšāļ­āļ·āđˆāļ™ āđ† +"Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)",āļŠāļ™āļēāļĄāļ—āļĩāđˆāđāļŠāļ”āļ‡āļ–āļķāļ‡āļĢāļąāļāđ€āļ§āļīāļĢāđŒāļāđ‚āļŸāļĨāļ§āđŒāļ‚āļ­āļ‡āļāļēāļĢāļ—āļģāļ˜āļļāļĢāļāļĢāļĢāļĄ (āļ–āđ‰āļēāđ€āļ‚āļ•āļ‚āđ‰āļ­āļĄāļđāļĨāđ„āļĄāđˆāđƒāļŠāđˆāļ›āļąāļˆāļˆāļļāļšāļąāļ™āļŸāļīāļĨāļ”āđŒāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āđ€āļ­āļ‡āđƒāļŦāļĄāđˆāļ‹āđˆāļ­āļ™āļˆāļ°āļ–āļđāļāļŠāļĢāđ‰āļēāļ‡āļ‚āļķāđ‰āļ™) +Fieldname,fieldname +Fields,āļŠāļēāļ‚āļē +"Fields separated by comma (,) will be included in the
    Search By list of Search dialog box","āđ€āļ‚āļ•āļ„āļąāđˆāļ™āļ”āđ‰āļ§āļĒāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļŦāļĄāļēāļĒāļˆāļļāļĨāļ āļēāļ„ (,) āļˆāļ°āļĢāļ§āļĄāļ­āļĒāļđāđˆāđƒāļ™
    āļ„āđ‰āļ™āļŦāļēāļ•āļēāļĄāļĢāļēāļĒāļŠāļ·āđˆāļ­āļ‚āļ­āļ‡āļāļĨāđˆāļ­āļ‡āđ‚āļ•āđ‰āļ•āļ­āļšāļ„āđ‰āļ™āļŦāļē" +File Data,āđāļŸāđ‰āļĄāļ‚āđ‰āļ­āļĄāļđāļĨ +File LIst,āļĢāļēāļĒāļŠāļ·āđˆāļ­āđ„āļŸāļĨāđŒ +File List,āļĢāļēāļĒāļŠāļ·āđˆāļ­āđ„āļŸāļĨāđŒ +File Name,āļŠāļ·āđˆāļ­āđ„āļŸāļĨāđŒ +File URL,āđ„āļŸāļĨāđŒ URL +File Uploaded Sucessfully.,āđ„āļŸāļĨāđŒāļ—āļĩāđˆāļ­āļąāļ›āđ‚āļŦāļĨāļ”āļŠāļģāđ€āļĢāđ‡āļˆ +Filing in Additional Information about the Opportunity will help you analyze your data better.,āļĒāļ·āđˆāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāđ‚āļ­āļāļēāļŠāļ—āļĩāđˆāļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒāļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļ„āļļāļ“āļ”āļĩāļ‚āļķāđ‰āļ™ +Filing in Additional Information about the Purchase Receipt will help you analyze your data better.,āļĒāļ·āđˆāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļĢāļąāļšāļ‹āļ·āđ‰āļ­āļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒāļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļ„āļļāļ“āļ”āļĩāļ‚āļķāđ‰āļ™ +Filing in Additional Information about the Purchase Requisition will help you analyze your data better.,āļĒāļ·āđˆāļ™āļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāđƒāļšāļ‚āļ­āļ‹āļ·āđ‰āļ­āļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒāļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļ„āļļāļ“āļ”āļĩāļ‚āļķāđ‰āļ™ +Filling in Additional Information about the Delivery Note will help you analyze your data better.,āļāļĢāļ­āļāļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒāļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļ„āļļāļ“āđ„āļ”āđ‰āļ”āļĩāļĒāļīāđˆāļ‡āļ‚āļķāđ‰āļ™ +Filling in additional information about the Quotation will help you analyze your data better.,āļāļĢāļ­āļāļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļēāļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒāļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļ„āļļāļ“āļ”āļĩāļ‚āļķāđ‰āļ™ +Filling in additional information about the Sales Order will help you analyze your data better.,āļāļĢāļ­āļāļ‚āđ‰āļ­āļĄāļđāļĨāđ€āļžāļīāđˆāļĄāđ€āļ•āļīāļĄāđ€āļāļĩāđˆāļĒāļ§āļāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒāļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ§āļīāđ€āļ„āļĢāļēāļ°āļŦāđŒāļ‚āđ‰āļ­āļĄāļđāļĨāļ‚āļ­āļ‡āļ„āļļāļ“āļ”āļĩāļ‚āļķāđ‰āļ™ +Filter By Amount,āļāļĢāļ­āļ‡āļ•āļēāļĄāļˆāđāļēāļ™āļ§āļ™āđ€āļ‡āļīāļ™ +Filter By Date,āļāļĢāļ­āļ‡āļ•āļēāļĄāļ§āļąāļ™āļ—āļĩāđˆ +Filter based on customer,āļāļĢāļ­āļ‡āļ‚āļķāđ‰āļ™āļ­āļĒāļđāđˆāļāļąāļšāļĨāļđāļāļ„āđ‰āļē +Filter based on item,āļāļĢāļ­āļ‡āļ‚āļķāđ‰āļ™āļ­āļĒāļđāđˆāļāļąāļšāļŠāļīāļ™āļ„āđ‰āļē +Filters,āļ•āļąāļ§āļāļĢāļ­āļ‡ +Final Confirmation Date,āļ§āļąāļ™āļ—āļĩāđˆāļĒāļ·āļ™āļĒāļąāļ™āļ„āļĢāļąāđ‰āļ‡āļŠāļļāļ”āļ—āđ‰āļēāļĒ +Financial Analytics,Analytics āļāļēāļĢāđ€āļ‡āļīāļ™ +Financial Statements,āļ‡āļšāļāļēāļĢāđ€āļ‡āļīāļ™ +Financial Years for books of accounts,āļ›āļĩāļāļēāļĢāđ€āļ‡āļīāļ™āļŠāļģāļŦāļĢāļąāļšāļŦāļ™āļąāļ‡āļŠāļ·āļ­āļ‚āļ­āļ‡āļšāļąāļāļŠāļĩ +First Name,āļŠāļ·āđˆāļ­āđāļĢāļ +First Responded On,āļ„āļĢāļąāđ‰āļ‡āđāļĢāļāđ€āļĄāļ·āđˆāļ­āļ§āļąāļ™āļ—āļĩāđˆāļ‡āđˆāļ§āļ‡ +Fiscal Year,āļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Fiscal Year Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ›āļĩāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“ +Fixed Asset Account,āļšāļąāļāļŠāļĩāļŠāļīāļ™āļ—āļĢāļąāļžāļĒāđŒāļ–āļēāļ§āļĢ +Float,āļĨāļ­āļĒ +Float Precision,āļžāļĢāļĩāļ‹āļīāļŠāļąāđˆāļĨāļ­āļĒ +Floral,āļ”āļ­āļāđ„āļĄāđ‰ +Follow via Email,āļœāđˆāļēāļ™āļ—āļēāļ‡āļ­āļĩāđ€āļĄāļĨāđŒāļ•āļēāļĄ +Following dates are blocked for Leave,āļ§āļąāļ™āļ•āđˆāļ­āđ„āļ›āļ™āļĩāđ‰āļˆāļ°āļ–āļđāļāļšāļĨāđ‡āļ­āļāļŠāļģāļŦāļĢāļąāļšāļ­āļ­āļ +"Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.",āļ•āļēāļĢāļēāļ‡āļ•āđˆāļ­āđ„āļ›āļ™āļĩāđ‰āļˆāļ°āđāļŠāļ”āļ‡āļ„āđˆāļēāļŦāļēāļāļĢāļēāļĒāļāļēāļĢāļĒāđˆāļ­āļĒ - āļŠāļąāļāļāļē āļ„āđˆāļēāđ€āļŦāļĨāđˆāļēāļ™āļĩāđ‰āļˆāļ°āļ–āļđāļāđ€āļĢāļĩāļĒāļāļˆāļēāļāļ•āđ‰āļ™āđāļšāļšāļ‚āļ­āļ‡ "Bill of Materials" āļĒāđˆāļ­āļĒ - āļĢāļēāļĒāļāļēāļĢāļŠāļąāļāļāļē +Font,āļ•āļąāļ§āļ­āļąāļāļĐāļĢ +Font Size,āļ‚āļ™āļēāļ”āļ•āļąāļ§āļ­āļąāļāļĐāļĢ +Footer,āļŠāđˆāļ§āļ™āļ—āđ‰āļēāļĒ +Footer Items,āļĢāļēāļĒāļāļēāļĢāļŠāđˆāļ§āļ™āļ—āđ‰āļēāļĒ +For All Users,āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āđƒāļŠāđ‰āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +For Buying,āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ‹āļ·āđ‰āļ­ +For Company,āļŠāļģāļŦāļĢāļąāļš āļšāļĢāļīāļĐāļąāļ— +For Employee,āļŠāļģāļŦāļĢāļąāļšāļžāļ™āļąāļāļ‡āļēāļ™ +For Employee Name,āļŠāļģāļŦāļĢāļąāļšāļŠāļ·āđˆāļ­āļ‚āļ­āļ‡āļžāļ™āļąāļāļ‡āļēāļ™ +For Item ,āļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢ +"For Links, enter the DocType as rangeFor Select, enter list of Options separated by comma",āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡āđ€āļ‚āđ‰āļēāļŠāļđāđˆ DocType āđ€āļ›āđ‡āļ™ rangeFor āđ€āļĨāļ·āļ­āļāđƒāļŠāđˆāļĢāļēāļĒāļāļēāļĢāļ‚āļ­āļ‡āļ•āļąāļ§āđ€āļĨāļ·āļ­āļāļ—āļĩāđˆāļ„āļąāđˆāļ™āļ”āđ‰āļ§āļĒāļˆāļļāļĨāļ āļēāļ„ +"For Links, use define linked",āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡āļāļēāļĢāđ€āļŠāļ·āđˆāļ­āļĄāđ‚āļĒāļ‡āđƒāļŠāđ‰āļāļģāļŦāļ™āļ” +For Production,āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļœāļĨāļīāļ• +For Reference Only.,āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ­āđ‰āļēāļ‡āļ­āļīāļ‡āđ€āļ—āđˆāļēāļ™āļąāđ‰āļ™ +For Selling,āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ‚āļēāļĒ +For Warehouse,āļŠāļģāļŦāļĢāļąāļšāđ‚āļāļ”āļąāļ‡ +"For comparative filters, start with",āļŠāļģāļŦāļĢāļąāļšāļ•āļąāļ§āļāļĢāļ­āļ‡āđ€āļ›āļĢāļĩāļĒāļšāđ€āļ—āļĩāļĒāļšāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ”āđ‰āļ§āļĒ +"For e.g. 2012, 2012-13","āļŠāļģāļŦāļĢāļąāļšāđ€āļŠāđˆāļ™ 2012, 2012-13" +For example if you cancel and amend 'INV004' it will become a new document 'INV004-1'. This helps you to keep track of each amendment.,āļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡āđ€āļŠāđˆāļ™āļ–āđ‰āļēāļ„āļļāļ“āļĒāļāđ€āļĨāļīāļāđāļĨāļ°āđāļāđ‰āđ„āļ‚ 'INV004' āļĄāļąāļ™āļˆāļ°āļāļĨāļēāļĒāđ€āļ›āđ‡āļ™āđ€āļ­āļāļŠāļēāļĢāđƒāļŦāļĄāđˆ 'INV004-1' āļ™āļĩāđ‰āļˆāļ°āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļ•āļīāļ”āļ•āļēāļĄāļāļēāļĢāđāļāđ‰āđ„āļ‚āđāļ•āđˆāļĨāļ° +For example: You want to restrict users to transactions marked with a certain property called 'Territory',āļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡āđ€āļŠāđˆāļ™āļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢ āļˆāļģāļāļąāļ” āļœāļđāđ‰āđƒāļŠāđ‰āļāļąāļšāļāļēāļĢāļ—āļģāļ˜āļļāļĢāļāļĢāļĢāļĄāļ—āļĩāđˆāļĄāļĩāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļŦāļĄāļēāļĒāļ„āļļāļ“āļŠāļĄāļšāļąāļ•āļīāļšāļēāļ‡āļ­āļĒāđˆāļēāļ‡āļ—āļĩāđˆāđ€āļĢāļĩāļĒāļāļ§āđˆāļē 'āļžāļ·āđ‰āļ™āļ—āļĩāđˆ' +For opening balance entry account can not be a PL account,āđ€āļ›āļīāļ”āļšāļąāļāļŠāļĩāļĢāļēāļĒāļāļēāļĢāļŠāļĄāļ”āļļāļĨāđ„āļĄāđˆāļŠāļēāļĄāļēāļĢāļ–āļšāļąāļāļŠāļĩ PL +"For opening invoice entry, this date will reflect in the period-wise aging report.",āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđ€āļ›āļīāļ”āļĢāļēāļĒāļāļēāļĢāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ§āļąāļ™āļ™āļĩāđ‰āļˆāļ°āļŠāļ°āļ—āđ‰āļ­āļ™āđƒāļŦāđ‰āđ€āļŦāđ‡āļ™āļ–āļķāļ‡āđƒāļ™āļĢāļēāļĒāļ‡āļēāļ™ aging āļĢāļ°āļĒāļ°āđ€āļ§āļĨāļēāļ—āļĩāđˆāļŠāļēāļāļ‰āļĨāļēāļ” +For ranges,āļŠāļģāļŦāļĢāļąāļšāļŠāđˆāļ§āļ‡ +For reference,āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ­āđ‰āļēāļ‡āļ­āļīāļ‡ +For reference only.,āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ­āđ‰āļēāļ‡āļ­āļīāļ‡āđ€āļ—āđˆāļēāļ™āļąāđ‰āļ™ +"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",āđ€āļžāļ·āđˆāļ­āļ„āļ§āļēāļĄāļŠāļ°āļ”āļ§āļāļ‚āļ­āļ‡āļĨāļđāļāļ„āđ‰āļēāļĢāļŦāļąāļŠāđ€āļŦāļĨāđˆāļēāļ™āļĩāđ‰āļŠāļēāļĄāļēāļĢāļ–āļ™āļģāļĄāļēāđƒāļŠāđ‰āđƒāļ™āļĢāļđāļ›āđāļšāļšāļ—āļĩāđˆāļžāļīāļĄāļžāđŒāđ€āļŠāđˆāļ™āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āđāļĨāļ°āļ™āļģāļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +Form,āļŸāļ­āļĢāđŒāļĄ +Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,āļĢāļđāļ›āđāļšāļš: hh: mm āļŠāļģāļŦāļĢāļąāļšāļ•āļąāļ§āļ­āļĒāđˆāļēāļ‡āļŦāļ™āļķāđˆāļ‡āļŠāļąāđˆāļ§āđ‚āļĄāļ‡āļŦāļĄāļ”āļ­āļēāļĒāļļāļ•āļąāđ‰āļ‡āđ€āļŠāđˆāļ™ 01:00 āđāļĄāđ‡āļāļ‹āđŒāļˆāļ°āļŦāļĄāļ”āļ­āļēāļĒāļļ 72 āļŠāļąāđˆāļ§āđ‚āļĄāļ‡ āļ„āđˆāļēāđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ„āļ·āļ­ 24 āļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +Forum,āļŸāļ­āļĢāļąāđˆāļĄ +Fraction,āđ€āļĻāļĐ +Fraction Units,āļŦāļ™āđˆāļ§āļĒāđ€āļĻāļĐ +Friday,āļ§āļąāļ™āļĻāļļāļāļĢāđŒ +From Company,āļˆāļēāļ āļšāļĢāļīāļĐāļąāļ— +From Customer,āļˆāļēāļāļĨāļđāļāļ„āđ‰āļē +From Date,āļˆāļēāļāļ§āļąāļ™āļ—āļĩāđˆ +From Date must be before To Date,āļ™āļąāļš āđāļ•āđˆāļ§āļąāļ™āļ—āļĩāđˆāļ•āđ‰āļ­āļ‡āļ­āļĒāļđāđˆāļāđˆāļ­āļ™āļ§āļąāļ™āļ—āļĩāđˆāļ•āđ‰āļ­āļ‡āļāļēāļĢ +From DocType,āļˆāļēāļ DocType +From Employee,āļˆāļēāļāļžāļ™āļąāļāļ‡āļēāļ™ +From Field,āļˆāļēāļāļŠāļ™āļēāļĄ +From PR Date,āļˆāļēāļāļ§āļąāļ™āļ—āļĩāđˆ PR +From Package No.,āļˆāļēāļāđ€āļĨāļ‚āļ—āļĩāđˆāđāļžāļ„āđ€āļāļˆ +From Table,āļˆāļēāļāļ•āļēāļĢāļēāļ‡āļ—āļĩāđˆ +Frozen,āđāļŠāđˆāđāļ‚āđ‡āļ‡ +Full Name,āļŠāļ·āđˆāļ­āđ€āļ•āđ‡āļĄ +Fully Billed,āļˆāļģāļ™āļ§āļ™āļĄāļēāļāļ—āļĩāđˆāļŠāļļāļ”āļ­āļĒāđˆāļēāļ‡āđ€āļ•āđ‡āļĄāļ—āļĩāđˆ +Fully Completed,āđ€āļŠāļĢāđ‡āļˆāļŠāļĄāļšāļđāļĢāļ“āđŒ +GL Control,āļ„āļ§āļšāļ„āļļāļĄ GL +GL Entry,āļĢāļēāļĒāļāļēāļĢ GL +GL Entry: Debit or Credit amount is mandatory for ,āļĢāļēāļĒāļāļēāļĢ GL: āļˆāļģāļ™āļ§āļ™āđ€āļ”āļšāļīāļ•āļŦāļĢāļ·āļ­āļšāļąāļ•āļĢāđ€āļ„āļĢāļ”āļīāļ•āļ—āļĩāđˆāļˆāļģāđ€āļ›āđ‡āļ™āļŠāļģāļŦāļĢāļąāļš +GL Mapper,Mapper GL +GL Mapper Detail,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ” Mapper GL +GRN,GRN +Gantt Chart,āđāļœāļ™āļ āļđāļĄāļīāđāļāļ™āļ•āđŒ +Gantt chart of all tasks.,āđāļœāļ™āļ āļđāļĄāļī Gantt āļ‚āļ­āļ‡āļ‡āļēāļ™āļ—āļąāđ‰āļ‡āļŦāļĄāļ” +Gender,āđ€āļžāļĻ +General,āļ—āļąāđˆāļ§āđ„āļ› +General Ledger,āļšāļąāļāļŠāļĩāđāļĒāļāļ›āļĢāļ°āđ€āļ āļ—āļ—āļąāđˆāļ§āđ„āļ› +Generate Description HTML,āļŠāļĢāđ‰āļēāļ‡āļ„āļģāļ­āļ˜āļīāļšāļēāļĒ HTML +Generate Purchase Requests (MRP) and Production Orders.,āļŠāļĢāđ‰āļēāļ‡āļ„āļģāļ‚āļ­āļ‹āļ·āđ‰āļ­ (MRP) āđāļĨāļ°āļ„āļģāļŠāļąāđˆāļ‡āļāļēāļĢāļœāļĨāļīāļ• +Generate Salary Slips,āļŠāļĢāđ‰āļēāļ‡ Slips āđ€āļ‡āļīāļ™āđ€āļ”āļ·āļ­āļ™ +Generate Schedule,āļŠāļĢāđ‰āļēāļ‡āļ•āļēāļĢāļēāļ‡ +"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",āļŠāļĢāđ‰āļēāļ‡āļšāļĢāļĢāļˆāļļāļ āļąāļ“āļ‘āđŒāđāļžāļ„āđ€āļāļˆāļ—āļĩāđˆāļˆāļ°āļŠāđˆāļ‡āļĄāļ­āļš āđƒāļŠāđ‰āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđāļˆāđ‰āļ‡āļˆāļģāļ™āļ§āļ™āđāļžāđ‡āļāđ€āļāļˆāļ—āļĩāđˆāļšāļĢāļĢāļˆāļļāđāļĨāļ°āļ™āđ‰āļģāļŦāļ™āļąāļāļ‚āļ­āļ‡āļĄāļąāļ™ +Generates HTML to include selected image in the description,āļŠāļĢāđ‰āļēāļ‡ HTM​​L āļ—āļĩāđˆāļˆāļ°āļĢāļ§āļĄāļ āļēāļžāļ—āļĩāđˆāđ€āļĨāļ·āļ­āļāđ„āļ§āđ‰āđƒāļ™āļ„āļģāļ­āļ˜āļīāļšāļēāļĒ +Georgia,āļˆāļ­āļĢāđŒāđ€āļˆāļĩāļĒ +Get Advances Paid,āļĢāļąāļšāđ€āļ‡āļīāļ™āļ—āļ”āļĢāļ­āļ‡āļˆāđˆāļēāļĒ +Get Advances Received,āļĢāļąāļšāđ€āļ‡āļīāļ™āļĢāļąāļšāļĨāđˆāļ§āļ‡āļŦāļ™āđ‰āļē +Get Current Stock,āļĢāļąāļšāļŠāļīāļ™āļ„āđ‰āļēāļ›āļąāļˆāļˆāļļāļšāļąāļ™ +Get Items,āļĢāļąāļšāļŠāļīāļ™āļ„āđ‰āļē +Get Last Purchase Rate,āļĢāļąāļšāļ‹āļ·āđ‰āļ­āđƒāļŦāđ‰āļĨāđˆāļēāļŠāļļāļ” +Get Non Reconciled Entries,āļĢāļąāļšāļ„āļ­āļĄāđ€āļĄāļ™āļ•āđŒāļ„āļ·āļ™āļ”āļĩāđ„āļĄāđˆ +Get Open Sales Order,āļĢāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒāđ€āļ›āļīāļ” +Get Outstanding Invoices,āļĢāļąāļšāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļ„āđ‰āļēāļ‡ +Get Purchase Receipt,āļĢāļąāļšāđƒāļšāđ€āļŠāļĢāđ‡āļˆāļĢāļąāļšāđ€āļ‡āļīāļ™āļ‹āļ·āđ‰āļ­ +Get Sales Orders,āļĢāļąāļšāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒ +Get Specification Details,āļ”āļđāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļŠāđ€āļ›āļ„ +Get Stock and Rate,āļĢāļąāļšāļŠāļīāļ™āļ„āđ‰āļēāđāļĨāļ°āļ­āļąāļ•āļĢāļē +Get Tax Detail,āļĢāļąāļšāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļ āļēāļĐāļĩ +Get Taxes and Charges,āļĢāļąāļšāļ āļēāļĐāļĩāđāļĨāļ°āļ„āđˆāļēāļ˜āļĢāļĢāļĄāđ€āļ™āļĩāļĒāļĄ +Get Template,āļĢāļąāļšāđāļĄāđˆāđāļšāļš +Get Terms and Conditions,āļĢāļąāļšāļ‚āđ‰āļ­āļ•āļāļĨāļ‡āđāļĨāļ°āđ€āļ‡āļ·āđˆāļ­āļ™āđ„āļ‚ +Get Weekly Off Dates,āļĢāļąāļšāļ§āļąāļ™āļ›āļīāļ”āļŠāļąāļ›āļ”āļēāļŦāđŒ +Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.Fill data in the template. Save the template in CSV format.All attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.,āļĢāļąāļšāđāļĄāđˆāđāļšāļšāļ‚āļ­āļ‡āļœāļđāđ‰āđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ—āļĩāđˆāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢāļ—āļĩāđˆāļˆāļ°āļ™āļģāđ€āļ‚āđ‰āļēāđƒāļ™āļĢāļđāļ›āđāļšāļš CSV (āļ„āđˆāļēāđāļĒāļāļˆāļļāļĨāļ āļēāļ„) āļ‚āđ‰āļ­āļĄāļđāļĨ format.Fill āđƒāļ™āđāļĄāđˆāđāļšāļš āļšāļąāļ™āļ—āļķāļāđāļĄāđˆāđāļšāļšāđƒāļ™āļāļēāļĢāđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ›āļĢāļ°āļŠāļļāļĄ CSV format.All āļ§āļąāļ™ 'āļœāļđāđ‰āđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļˆāļēāļāļ§āļąāļ™āļ—āļĩāđˆ' inbetween āđāļĨāļ° 'āļœāļđāđ‰āđ€āļ‚āđ‰āļēāļĢāđˆāļ§āļĄāļ™āļąāļ”' āļˆāļ°āļĄāļēāđƒāļ™āđāļĄāđˆāđāļšāļšāļ—āļĩāđˆāļĄāļĩāļĢāļēāļĒāļŠāļ·āđˆāļ­āļžāļ™āļąāļāļ‡āļēāļ™ +"Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.",āđ„āļ”āđ‰āļĢāļąāļšāļ­āļąāļ•āļĢāļēāļĄāļđāļĨāļ„āđˆāļēāđāļĨāļ°āļŠāļ•āđ‡āļ­āļāļ—āļĩāđˆāļ„āļĨāļąāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđāļŦāļĨāđˆāļ‡āļ—āļĩāđˆāļĄāļē / āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒāļ”āļąāļ‡āļāļĨāđˆāļēāļ§āđ‚āļžāļŠāļ•āđŒāļ§āļąāļ™āļ—āļĩāđˆāđ€āļ§āļĨāļē āļ–āđ‰āļēāļ•āđˆāļ­āđ€āļ™āļ·āđˆāļ­āļ‡āļĢāļēāļĒāļāļēāļĢāđ‚āļ›āļĢāļ”āļāļ”āļ›āļļāđˆāļĄāļ™āļĩāđ‰āļŦāļĨāļąāļ‡āļˆāļēāļāļ—āļĩāđˆāđ€āļ‚āđ‰āļēāļĄāļē Nos āļ­āļ™āļļāļāļĢāļĄ +Global Defaults,āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ—āļąāđˆāļ§āđ‚āļĨāļ +Go back to home,āļāļĨāļąāļšāđ„āļ›āļ—āļĩāđˆāļšāđ‰āļēāļ™ +Go to Setup > User Properties to set \ 'territory' for diffent Users.,āđ„āļ›āļ—āļĩāđˆ Setup> āļ„āļļāļ“āļŠāļĄāļšāļąāļ•āļīāļ‚āļ­āļ‡āļœāļđāđ‰āđƒāļŠāđ‰ āđƒāļ™āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļē \ 'āļ”āļīāļ™āđāļ”āļ™' āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āđƒāļŠāđ‰ diffent +Goal,āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒ +Goals,āđ€āļ›āđ‰āļēāļŦāļĄāļēāļĒ +Goods received from Suppliers.,āļŠāļīāļ™āļ„āđ‰āļēāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļˆāļēāļāļœāļđāđ‰āļˆāļģāļŦāļ™āđˆāļēāļĒ +Grade,āđ€āļāļĢāļ” +Graduate,āļˆāļšāļāļēāļĢāļĻāļķāļāļĐāļē +Grand Total,āļĢāļ§āļĄāļ—āļąāđ‰āļ‡āļŠāļīāđ‰āļ™ +Grand Total (Export),āđāļāļĢāļ™āļ”āđŒāļĢāļ§āļĄ (āļŠāđˆāļ‡āļ­āļ­āļ) +Grand Total (Import),āđāļāļĢāļ™āļ”āđŒāļĢāļ§āļĄ (āļ™āļģāđ€āļ‚āđ‰āļē) +Grand Total*,* āđāļāļĢāļ™āļ”āđŒāļĢāļ§āļĄ +Gratuity LIC ID,ID LIC āļšāļģāđ€āļŦāļ™āđ‡āļˆ +Gross Margin %,āļ­āļąāļ•āļĢāļēāļāļģāđ„āļĢāļ‚āļąāđ‰āļ™āļ•āđ‰āļ™% +Gross Margin Value,āļ„āđˆāļēāļ­āļąāļ•āļĢāļēāļāļģāđ„āļĢāļ‚āļąāđ‰āļ™āļ•āđ‰āļ™ +Gross Pay,āļˆāđˆāļēāļĒāļ‚āļąāđ‰āļ™āļ•āđ‰āļ™ +Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,āļˆāđˆāļēāļĒāļ‚āļąāđ‰āļ™āļ•āđ‰āļ™ + āļˆāļģāļ™āļ§āļ™ Arrear + āļˆāļģāļ™āļ§āļ™āļāļēāļĢāđ„āļ”āđ‰āđ€āļ›āđ‡āļ™āđ€āļ‡āļīāļ™āļŠāļ” - āļŦāļąāļāļĢāļ§āļĄ +Gross Profit,āļāļģāđ„āļĢāļ‚āļąāđ‰āļ™āļ•āđ‰āļ™ +Gross Profit (%),āļāļģāđ„āļĢāļ‚āļąāđ‰āļ™āļ•āđ‰āļ™ (%) +Gross Weight,āļ™āđ‰āļģāļŦāļ™āļąāļāļĢāļ§āļĄ +Gross Weight UOM,UOM āļ™āđ‰āļģāļŦāļ™āļąāļāļĢāļ§āļĄ +Group,āļāļĨāļļāđˆāļĄ +Group By,āļāļĨāļļāđˆāļĄāļ•āļēāļĄ +Group or Ledger,āļāļĨāļļāđˆāļĄāļŦāļĢāļ·āļ­āļšāļąāļāļŠāļĩāđāļĒāļāļ›āļĢāļ°āđ€āļ āļ— +Groups,āļāļĨāļļāđˆāļĄ +HR,āļ—āļĢāļąāļžāļĒāļēāļāļĢāļšāļļāļ„āļ„āļĨ +HTML,HTML +HTML / Banner that will show on the top of product list.,HTML / āđāļšāļ™āđ€āļ™āļ­āļĢāđŒāļ—āļĩāđˆāļˆāļ°āđāļŠāļ”āļ‡āļ­āļĒāļđāđˆāļ”āđ‰āļēāļ™āļšāļ™āļ‚āļ­āļ‡āļĢāļēāļĒāļāļēāļĢāļŠāļīāļ™āļ„āđ‰āļē +"HTML print formats for quotes, invoices etc",āļžāļīāļĄāļžāđŒāļĢāļđāļ›āđāļšāļšāļ—āļĩāđˆ HTML āļŠāļģāļŦāļĢāļąāļšāļ„āļģāļžāļđāļ” āļŊāļĨāļŊ āđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰ +Half Day,āļ„āļĢāļķāđˆāļ‡āļ§āļąāļ™ +Half Yearly,āļ›āļĢāļ°āļˆāļģāļ›āļĩāļ„āļĢāļķāđˆāļ‡ +Half-yearly,āļĢāļēāļĒāļŦāļāđ€āļ”āļ·āļ­āļ™ +Has Batch No,āļŠāļļāļ”āļĄāļĩāđ„āļĄāđˆāļĄāļĩ +Has Child Node,āļĄāļĩāđ‚āļŦāļ™āļ”āļĨāļđāļ +Has Serial No,āļĄāļĩāļ‹āļĩāđ€āļĢāļĩāļĒāļĨāđ„āļĄāđˆāļĄāļĩ +Header,āļŠāđˆāļ§āļ™āļŦāļąāļ§ +Heading,āļŦāļąāļ§āđ€āļĢāļ·āđˆāļ­āļ‡ +Heading Font,āļŦāļąāļ§āđ€āļĢāļ·āđˆāļ­āļ‡ Font +Heads (or groups) against which Accounting Entries are made and balances are maintained.,āļŦāļąāļ§ (āļŦāļĢāļ·āļ­āļāļĨāļļāđˆāļĄ) āļāļąāļšāļ—āļĩāđˆāļ„āļ­āļĄāđ€āļĄāļ™āļ•āđŒāļˆāļ°āļ—āļģāļšāļąāļāļŠāļĩāđāļĨāļ°āļĒāļ­āļ”āļ„āļ‡āđ€āļŦāļĨāļ·āļ­āļˆāļ°āļĢāļąāļāļĐāļē +Health Concerns,āļ„āļ§āļēāļĄāļāļąāļ‡āļ§āļĨāđ€āļĢāļ·āđˆāļ­āļ‡āļŠāļļāļ‚āļ āļēāļž +Health Details,āļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āļŠāļļāļ‚āļ āļēāļž +Held On,āļˆāļąāļ”āļ‚āļķāđ‰āļ™āđ€āļĄāļ·āđˆāļ­āļ§āļąāļ™āļ—āļĩāđˆ +Help,āļŠāđˆāļ§āļĒ +Help HTML,āļ§āļīāļ˜āļĩāđƒāļŠāđ‰ HTML +Helper for managing return of goods (sales or purchase),āļœāļđāđ‰āļŠāđˆāļ§āļĒāđƒāļ™āļāļēāļĢāļšāļĢāļīāļŦāļēāļĢāļˆāļąāļ”āļāļēāļĢāļāļēāļĢāļāļĨāļąāļšāļĄāļēāļ‚āļ­āļ‡āļŠāļīāļ™āļ„āđ‰āļē (āļ‚āļēāļĒāļŦāļĢāļ·āļ­āļ‹āļ·āđ‰āļ­) +Helvetica Neue,Neue Helvetica +"Hence, maximum allowed Manufacturing Quantity",āļ”āļąāļ‡āļ™āļąāđ‰āļ™āļˆāļģāļ™āļ§āļ™āļāļēāļĢāļœāļĨāļīāļ•āļŠāļđāļ‡āļŠāļļāļ”āļ—āļĩāđˆāļ­āļ™āļļāļāļēāļ• +"Here you can maintain family details like name and occupation of parent, spouse and children",āļ—āļĩāđˆāļ™āļĩāđˆāļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļĢāļąāļāļĐāļēāļĢāļēāļĒāļĨāļ°āđ€āļ­āļĩāļĒāļ”āđ€āļŠāđˆāļ™āļŠāļ·āđˆāļ­āļ„āļĢāļ­āļšāļ„āļĢāļąāļ§āđāļĨāļ°āļ­āļēāļŠāļĩāļžāļ‚āļ­āļ‡āļœāļđāđ‰āļ›āļāļ„āļĢāļ­āļ‡āļ„āļđāđˆāļŠāļĄāļĢāļŠāđāļĨāļ°āđ€āļ”āđ‡āļ +"Here you can maintain height, weight, allergies, medical concerns etc","āļ—āļĩāđˆāļ™āļĩāđˆāļ„āļļāļ“āļŠāļēāļĄāļēāļĢāļ–āļĢāļąāļāļĐāļēāļ„āļ§āļēāļĄāļŠāļđāļ‡āļ™āđ‰āļģāļŦāļ™āļąāļ, āļ āļđāļĄāļīāđāļžāđ‰, āļŊāļĨāļŊ āļ›āļąāļāļŦāļēāļ”āđ‰āļēāļ™āļāļēāļĢāđāļžāļ—āļĒāđŒ" +Hey there! You need to put at least one item in \ the item table.,Hey there! āļ„āļļāļ“āļˆāļ°āļ•āđ‰āļ­āļ‡āđƒāļŠāđˆāļ­āļĒāđˆāļēāļ‡āļ™āđ‰āļ­āļĒāļŦāļ™āļķāđˆāļ‡āļĢāļēāļĒāļāļēāļĢāđƒāļ™ \ āļ•āļēāļĢāļēāļ‡āļĢāļēāļĒāļāļēāļĢ +Hey! You seem to be using the wrong template. \ Click on 'Download Template' button to get the correct template.,Hey! āļ„āļļāļ“āļ”āļđāđ€āļŦāļĄāļ·āļ­āļ™āļˆāļ°āđƒāļŠāđ‰āđāļĄāđˆāđāļšāļšāļ—āļĩāđˆāđ„āļĄāđˆāļ–āļđāļāļ•āđ‰āļ­āļ‡ \ āļ„āļĨāļīāļāļ—āļĩāđˆāļ›āļļāđˆāļĄ 'āļ”āļēāļ§āļ™āđŒāđ‚āļŦāļĨāļ”āđāļĄāđˆāđāļšāļš' āđ€āļžāļ·āđˆāļ­āđāļĄāđˆāļ—āļĩāđˆāļ–āļđāļāļ•āđ‰āļ­āļ‡ +Hidden,āļ‹āđˆāļ­āļ™ +Hide Actions,āļ‹āđˆāļ­āļ™āļāļēāļĢāļ”āļģāđ€āļ™āļīāļ™āļāļēāļĢ +Hide Copy,āļ‹āđˆāļ­āļ™āļ„āļąāļ”āļĨāļ­āļ +Hide Currency Symbol,āļ‹āđˆāļ­āļ™āļŠāļąāļāļĨāļąāļāļĐāļ“āđŒāļŠāļāļļāļĨāđ€āļ‡āļīāļ™ +Hide Email,āļ‹āđˆāļ­āļ™āļ­āļĩāđ€āļĄāļĨāđŒ +Hide Heading,āļ‹āđˆāļ­āļ™āļŦāļąāļ§āđ€āļĢāļ·āđˆāļ­āļ‡ +Hide Print,āļ‹āđˆāļ­āļ™āļžāļīāļĄāļžāđŒ +Hide Toolbar,āļ‹āđˆāļ­āļ™āđāļ–āļšāđ€āļ„āļĢāļ·āđˆāļ­āļ‡āļĄāļ·āļ­ +High,āļŠāļđāļ‡ +Highlight,āđ€āļ™āđ‰āļ™ +History In Company,āļ›āļĢāļ°āļ§āļąāļ•āļīāđƒāļ™ āļšāļĢāļīāļĐāļąāļ— +Hold,āļ–āļ·āļ­ +Holiday,āļ§āļąāļ™āļŦāļĒāļļāļ” +Holiday Block List,āļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļāļ§āļąāļ™āļŦāļĒāļļāļ” +Holiday Block List Allow,āļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļ Holiday āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰ +Holiday Block List Allowed,āļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļ Holiday āļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļ™āļģ +Holiday Block List Date,āļ§āļąāļ™āļŦāļĒāļļāļ”āļ§āļąāļ™āļ—āļĩāđˆāļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļ +Holiday Block List Dates,āļ§āļąāļ™āļŦāļĒāļļāļ”āļ§āļąāļ™āļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļ +Holiday Block List Name,āļ§āļąāļ™āļŦāļĒāļļāļ”āļŠāļ·āđˆāļ­āļĢāļēāļĒāļāļēāļĢāļšāļĨāđ‡āļ­āļ +Holiday List,āļĢāļēāļĒāļāļēāļĢāļ§āļąāļ™āļŦāļĒāļļāļ” +Holiday List Name,āļŠāļ·āđˆāļ­āļĢāļēāļĒāļāļēāļĢāļ§āļąāļ™āļŦāļĒāļļāļ” +Holidays,āļ§āļąāļ™āļŦāļĒāļļāļ” +Home,āļšāđ‰āļēāļ™ +Home Control,āļ„āļ§āļšāļ„āļļāļĄāļŦāļ™āđ‰āļēāđāļĢāļ +Home Page,āļŦāļ™āđ‰āļēāđāļĢāļ +Home Page is Products,āļŦāļ™āđ‰āļēāđāļĢāļāļ„āļ·āļ­āļœāļĨāļīāļ•āļ āļąāļ“āļ‘āđŒ +Home Pages,āļŦāļ™āđ‰āļēāđāļĢāļ +Host,āđ€āļˆāđ‰āļēāļ āļēāļž +"Host, Email and Password required if emails are to be pulled","āđ‚āļŪāļŠāļ•āđŒ, Email āđāļĨāļ°āļĢāļŦāļąāļŠāļœāđˆāļēāļ™āļ—āļĩāđˆāļˆāļģāđ€āļ›āđ‡āļ™āļŦāļēāļāļ­āļĩāđ€āļĄāļĨāļ—āļĩāđˆāļˆāļ°āļ”āļķāļ‡" +Hour Rate,āļ­āļąāļ•āļĢāļēāļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +Hour Rate Consumable,āļ§āļąāļŠāļ”āļļāļŠāļīāđ‰āļ™āđ€āļ›āļĨāļ·āļ­āļ‡āļ„āđˆāļēāļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +Hour Rate Electricity,āļāļēāļĢāđ„āļŸāļŸāđ‰āļēāļ­āļąāļ•āļĢāļēāļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +Hour Rate Labour,āđāļĢāļ‡āļ‡āļēāļ™āļ­āļąāļ•āļĢāļēāļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +Hour Rate Rent,āļĢāļēāļ„āļēāđ€āļŠāđˆāļēāļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +Hours,āļŠāļąāđˆāļ§āđ‚āļĄāļ‡ +How frequently?,āļ§āļīāļ˜āļĩāļšāđˆāļ­āļĒ? +"How should this currency be formatted? If not set, will use system defaults",āļ§āļīāļ˜āļĩāļāļēāļĢāļ—āļĩāđˆāļ„āļ§āļĢāļŠāļāļļāļĨāđ€āļ‡āļīāļ™āļ™āļĩāđ‰āļˆāļ°āļˆāļąāļ”āļĢāļđāļ›āđāļšāļš? āļ–āđ‰āļēāđ„āļĄāđˆāļ•āļąāđ‰āļ‡āļˆāļ°āđƒāļŠāđ‰āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļ‚āļ­āļ‡āļĢāļ°āļšāļš +How to upload,āļ§āļīāļ˜āļĩāļāļēāļĢāļ­āļąāļ›āđ‚āļŦāļĨāļ” +Hrvatski,Hrvatski +Human Resources,āļ—āļĢāļąāļžāļĒāļēāļāļĢāļĄāļ™āļļāļĐāļĒāđŒ +Human Resources Home,āļ—āļĢāļąāļžāļĒāļēāļāļĢāļĄāļ™āļļāļĐāļĒāđŒāļŦāļ™āđ‰āļēāđāļĢāļ +Hurray! The day(s) on which you are applying for leave \ coincide with holiday(s). You need not apply for leave.,! Hurray āļ§āļąāļ™āļ—āļĩāđˆ (s) āļ—āļĩāđˆāļ„āļļāļ“āļāļģāļĨāļąāļ‡āđƒāļŠāđ‰āļŠāļģāļŦāļĢāļąāļšāļ­āļ­āļ \ āļ•āļĢāļ‡āļāļąāļšāļ§āļąāļ™āļŦāļĒāļļāļ” (s) āļ„āļļāļ“āđ„āļĄāđˆāļˆāļģāđ€āļ›āđ‡āļ™āļ•āđ‰āļ­āļ‡āđƒāļŠāđ‰āļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ­āļ­āļ +I,āļœāļĄ +ID (name) of the entity whose property is to be set,ID (āļŠāļ·āđˆāļ­) āļ‚āļ­āļ‡āļāļīāļˆāļāļēāļĢāļ—āļĩāđˆāļĄāļĩāļŠāļ–āļēāļ™āļ—āļĩāđˆāđƒāļŦāđ‰āļšāļĢāļīāļāļēāļĢāļˆāļ°āļ–āļđāļāļāļģāļŦāļ™āļ” +IDT,IDT +IGHelp,IGHelp +II,āļ„āļĢāļąāđ‰āļ‡āļ—āļĩāđˆāļŠāļ­āļ‡ +III,III +IN,āđƒāļ™ +INV,INV +INV/10-11/,INV/10-11 / +IV,IV +Icon,āđ„āļ­āļ„āļ­āļ™ +Icon will appear on the button,āđ„āļ­āļ„āļ­āļ™āļˆāļ°āļ›āļĢāļēāļāļāļšāļ™āļ›āļļāđˆāļĄ +Id of the profile will be the email.,id āļ‚āļ­āļ‡āđ‚āļ›āļĢāđ„āļŸāļĨāđŒāļˆāļ°āđ€āļ›āđ‡āļ™āļ­āļĩāđ€āļĄāļĨ +Identification of the package for the delivery (for print),āļšāļąāļ•āļĢāļ›āļĢāļ°āļˆāļģāļ•āļąāļ§āļ‚āļ­āļ‡āđāļžāļ„āđ€āļāļˆāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļŠāđˆāļ‡āļĄāļ­āļš (āļŠāļģāļŦāļĢāļąāļšāļžāļīāļĄāļžāđŒ) +If Monthly Budget Exceeded,āļŦāļēāļāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļĢāļēāļĒāđ€āļ”āļ·āļ­āļ™āļ—āļĩāđˆāđ€āļāļīāļ™ +"If Sale BOM is defined, the actual BOM of the Pack is displayed as table.Available in Delivery Note and Sales Order",āļ–āđ‰āļē BOM āļ‚āļēāļĒāļ–āļđāļāļāļģāļŦāļ™āļ” BOM āļ—āļĩāđˆāđāļ—āđ‰āļˆāļĢāļīāļ‡āļ‚āļ­āļ‡āđāļžāđ‡āļ„āļˆāļ°āļ›āļĢāļēāļāļāđ€āļ›āđ‡āļ™ table.Available āđƒāļ™āļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļēāđāļĨāļ°āļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒ +"If Supplier Part Number exists for given Item, it gets stored here",āļŦāļēāļāļŦāļĄāļēāļĒāđ€āļĨāļ‚āļœāļđāđ‰āļœāļĨāļīāļ•āļ—āļĩāđˆāļĄāļĩāļ­āļĒāļđāđˆāļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāļāļģāļŦāļ™āļ”āļˆāļ°āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāđ€āļāđ‡āļšāđ„āļ§āđ‰āļ—āļĩāđˆāļ™āļĩāđˆ +If Yearly Budget Exceeded,āļ–āđ‰āļēāļ‡āļšāļ›āļĢāļ°āļĄāļēāļ“āļ›āļĢāļ°āļˆāļģāļ›āļĩāđ€āļāļīāļ™ +"If a User does not have access at Level 0, then higher levels are meaningless","āļŦāļēāļāļœāļđāđ‰āđƒāļŠāđ‰āđ„āļĄāđˆāļŠāļēāļĄāļēāļĢāļ–āđ€āļ‚āđ‰āļēāļ–āļķāļ‡āļ—āļĩāđˆāļĢāļ°āļ”āļąāļš 0, āļĢāļ°āļ”āļąāļšāļ—āļĩāđˆāļŠāļđāļ‡āļ‚āļķāđ‰āļ™āđāļĨāđ‰āļ§āļĄāļĩāļ„āļ§āļēāļĄāļŦāļĄāļēāļĒ" +"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",āļŦāļēāļāļāļēāļĢāļ•āļĢāļ§āļˆāļŠāļ­āļšāļĢāļēāļĒāļāļēāļĢāļ§āļąāļŠāļ”āļļāļŠāļģāļŦāļĢāļąāļšāļĢāļēāļĒāļāļēāļĢāļĒāđˆāļ­āļĒāļ›āļĢāļ°āļāļ­āļšāļˆāļ°āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļžāļīāļˆāļēāļĢāļ“āļēāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāđƒāļŠāđ‰āļ§āļąāļ•āļ–āļļāļ”āļīāļš āļĄāļīāļ‰āļ°āļ™āļąāđ‰āļ™āļ—āļļāļāļĢāļēāļĒāļāļēāļĢāļĒāđˆāļ­āļĒāļ›āļĢāļ°āļāļ­āļšāļˆāļ°āđ„āļ”āđ‰āļĢāļąāļšāļāļēāļĢāļ›āļāļīāļšāļąāļ•āļīāđ€āļ›āđ‡āļ™āļ§āļąāļ•āļ–āļļāļ”āļīāļš +"If checked, all other workflows become inactive.",āļŦāļēāļāļ•āļĢ​​āļ§āļˆāļŠāļ­āļšāļ—āļļāļāļ‚āļąāđ‰āļ™āļ•āļ­āļ™āļāļēāļĢāļ—āļģāļ‡āļēāļ™āļ­āļ·āđˆāļ™ āđ† āđ€āļ›āđ‡āļ™āļ—āļĩāđˆāļĢāļ­ +"If checked, the Home page will be the default Item Group for the website.",āļŦāļēāļāļāļēāļĢāļ•āļĢāļ§āļˆāļŠāļ­āļšāļŦāļ™āđ‰āļēāđāļĢāļāļˆāļ°āđ€āļĢāļīāđˆāļĄāļ•āđ‰āļ™āļāļĨāļļāđˆāļĄāļŠāļīāļ™āļ„āđ‰āļēāļŠāļģāļŦāļĢāļąāļšāđ€āļ§āđ‡āļšāđ„āļ‹āļ•āđŒ +"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",āļŦāļēāļāļāļēāļĢāļ•āļĢāļ§āļˆāļŠāļ­āļšāļˆāļģāļ™āļ§āļ™āđ€āļ‡āļīāļ™āļ āļēāļĐāļĩāļˆāļ°āļ–āļ·āļ­āļ§āđˆāļēāđ€āļ›āđ‡āļ™āļĢāļ§āļĄāļ­āļĒāļđāđˆāđƒāļ™āļ­āļąāļ•āļĢāļēāļžāļīāļĄāļžāđŒ / āļˆāļģāļ™āļ§āļ™āļžāļīāļĄāļžāđŒ +"If image is selected, color will be ignored (attach first)",āļŦāļēāļāļ āļēāļžāļ–āļđāļāđ€āļĨāļ·āļ­āļāļŠāļĩāļˆāļ°āļ–āļđāļāļĨāļ°āđ€āļ§āđ‰āļ™ (āđāļ™āļšāđāļĢāļ) +If more than one package of the same type (for print),āļŦāļēāļāļĄāļĩāļĄāļēāļāļāļ§āđˆāļēāļŦāļ™āļķāđˆāļ‡āđāļžāļ„āđ€āļāļˆāļ›āļĢāļ°āđ€āļ āļ—āđ€āļ”āļĩāļĒāļ§āļāļąāļ™ (āļžāļīāļĄāļžāđŒ) +If non standard port (e.g. 587),āļ–āđ‰āļēāļžāļ­āļĢāđŒāļ•āļĄāļēāļ•āļĢāļāļēāļ™āđ„āļĄāđˆ (āđ€āļŠāđˆāļ™ 587) +If not applicable please enter: NA,āļ–āđ‰āļēāđ„āļĄāđˆāļŠāļēāļĄāļēāļĢāļ–āđƒāļŠāđ‰āđ„āļ”āđ‰āđ‚āļ›āļĢāļ”āļ›āđ‰āļ­āļ™: NA +"If not checked, the list will have to be added to each Department where it has to be applied.",āļ–āđ‰āļēāđ„āļĄāđˆāđ„āļ”āđ‰āļ•āļĢāļ§āļˆāļŠāļ­āļšāļĢāļēāļĒāļŠāļ·āđˆāļ­āļˆāļ°āļ•āđ‰āļ­āļ‡āļĄāļĩāļāļēāļĢāđ€āļžāļīāđˆāļĄāđāļ•āđˆāļĨāļ°āđāļœāļ™āļāļ—āļĩāđˆāļĄāļąāļ™āļˆāļ°āļ•āđ‰āļ­āļ‡āļĄāļĩāļāļēāļĢāđƒāļŠāđ‰ +"If not, create a",āļ–āđ‰āļēāđ„āļĄāđˆāļŠāļĢāđ‰āļēāļ‡ +"If set, data entry is only allowed for specified users. Else, entry is allowed for all users with requisite permissions.",āļŦāļēāļāļ•āļąāđ‰āļ‡āļāļēāļĢāļ›āđ‰āļ­āļ™āļ‚āđ‰āļ­āļĄāļđāļĨāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļāļēāļ•āđ€āļ‰āļžāļēāļ°āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āđƒāļŠāđ‰āļ—āļĩāđˆāļĢāļ°āļšāļļ āļ­āļ·āđˆāļ™āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļāļēāļ•āļŠāļģāļŦāļĢāļąāļšāļœāļđāđ‰āđƒāļŠāđ‰āļ—āļąāđ‰āļ‡āļŦāļĄāļ”āļ—āļĩāđˆāļĄāļĩāļŠāļīāļ—āļ˜āļīāđŒāļ—āļĩāđˆāļˆāļģāđ€āļ›āđ‡āļ™ +"If specified, send the newsletter using this email address",āļ–āđ‰āļēāļĢāļ°āļšāļļāļŠāđˆāļ‡āļˆāļ”āļŦāļĄāļēāļĒāđ‚āļ”āļĒāđƒāļŠāđ‰āļ—āļĩāđˆāļ­āļĒāļđāđˆāļ­āļĩāđ€āļĄāļĨāļ™āļĩāđ‰ +"If the 'territory' Link Field exists, it will give you an option to select it",āļ–āđ‰āļēāļŸāļīāļĨāļ”āđŒ 'āļ”āļīāļ™āđāļ”āļ™' āđāļĨāđ‰āļ§āļāđ‡āļˆāļ°āđƒāļŦāđ‰āļ„āļļāļ“āđ€āļĨāļ·āļ­āļāļ—āļĩāđˆāļˆāļ°āđ€āļĨāļ·āļ­āļ +"If the account is frozen, entries are allowed for the ""Account Manager"" only.",āļŦāļēāļāļšāļąāļāļŠāļĩāļ–āļđāļāđāļŠāđˆāđāļ‚āđ‡āļ‡āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāđ„āļ”āđ‰āļĢāļąāļšāļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰ "Account Manager" āđ€āļ—āđˆāļēāļ™āļąāđ‰āļ™ +"If this Account represents a Customer, Supplier or Employee, set it here.",āļŦāļēāļāļšāļąāļāļŠāļĩāļ™āļĩāđ‰āđ€āļ›āđ‡āļ™āļĨāļđāļāļ„āđ‰āļēāļ‚āļ­āļ‡āļœāļđāđ‰āļœāļĨāļīāļ•āļŦāļĢāļ·āļ­āļžāļ™āļąāļāļ‡āļēāļ™āļāļģāļŦāļ™āļ”āđ„āļ”āđ‰āļ—āļĩāđˆāļ™āļĩāđˆ +If you follow Quality Inspection
    Enables item QA Required and QA No in Purchase Receipt,āļ–āđ‰āļēāļ„āļļāļ“āļ—āļģāļ•āļēāļĄāļāļēāļĢāļ•āļĢāļ§āļˆāļŠāļ­āļšāļ„āļļāļ“āļ āļēāļž
    āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāđ„āļĄāđˆāļˆāļģāđ€āļ›āđ‡āļ™āļ•āđ‰āļ­āļ‡āđāļĨāļ° QA QA āđƒāļ™āđƒāļšāđ€āļŠāļĢāđ‡āļˆāļĢāļąāļšāđ€āļ‡āļīāļ™āļ‹āļ·āđ‰āļ­ +If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,āļŦāļēāļāļ„āļļāļ“āļĄāļĩāļāļēāļĢāļ‚āļēāļĒāđāļĨāļ°āļ—āļĩāļĄāļŦāļļāđ‰āļ™āļŠāđˆāļ§āļ™āļ‚āļēāļĒ (āļ•āļąāļ§āđāļ—āļ™āļˆāļģāļŦāļ™āđˆāļēāļĒ) āļžāļ§āļāđ€āļ‚āļēāļŠāļēāļĄāļēāļĢāļ–āļ•āļīāļ”āđāļ—āđ‡āļāđāļĨāļ°āļĢāļąāļāļĐāļēāļœāļĨāļ‡āļēāļ™āļ‚āļ­āļ‡āļžāļ§āļāđ€āļ‚āļēāđƒāļ™āļāļīāļˆāļāļĢāļĢāļĄāļāļēāļĢāļ‚āļēāļĒ +"If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",āļ–āđ‰āļēāļ„āļļāļ“āđ„āļ”āđ‰āļŠāļĢāđ‰āļēāļ‡āđāļĄāđˆāđāļšāļšāļĄāļēāļ•āļĢāļāļēāļ™āđƒāļ™āļ āļēāļĐāļĩāļ‹āļ·āđ‰āļ­āđāļĨāļ°āļ›āļĢāļīāļāļāļēāđ‚āļ—āļ„āđˆāļēāđ€āļĨāļ·āļ­āļāļŦāļ™āļķāđˆāļ‡āđāļĨāļ°āļ„āļĨāļīāļāļ—āļĩāđˆāļ›āļļāđˆāļĄāļ”āđ‰āļēāļ™āļĨāđˆāļēāļ‡ +"If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.",āļ–āđ‰āļēāļ„āļļāļ“āđ„āļ”āđ‰āļŠāļĢāđ‰āļēāļ‡āđāļĄāđˆāđāļšāļšāļĄāļēāļ•āļĢāļāļēāļ™āđƒāļ™āļ āļēāļĐāļĩāļ‚āļēāļĒāđāļĨāļ°āļ›āļĢāļīāļāļāļēāđ‚āļ—āļ„āđˆāļēāđ€āļĨāļ·āļ­āļāļŦāļ™āļķāđˆāļ‡āđāļĨāļ°āļ„āļĨāļīāļāļ—āļĩāđˆāļ›āļļāđˆāļĄāļ”āđ‰āļēāļ™āļĨāđˆāļēāļ‡ +"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",āļŦāļēāļāļ„āļļāļ“āļĄāļĩāļ„āļ§āļēāļĄāļĒāļēāļ§āļžāļīāļĄāļžāđŒāļĢāļđāļ›āđāļšāļšāļ„āļļāļ“āļĨāļąāļāļĐāļ“āļ°āļ™āļĩāđ‰āļŠāļēāļĄāļēāļĢāļ–āđƒāļŠāđ‰āđƒāļ™āļāļēāļĢāđāļĒāļāļŦāļ™āđ‰āļēāđ€āļ§āđ‡āļšāļ—āļĩāđˆāļˆāļ°āļžāļīāļĄāļžāđŒāļšāļ™āļŦāļ™āđ‰āļēāđ€āļ§āđ‡āļšāļŦāļĨāļēāļĒāļŦāļ™āđ‰āļēāļāļąāļšāļŠāđˆāļ§āļ™āļŦāļąāļ§āđāļĨāļ°āļ—āđ‰āļēāļĒāļāļĢāļ°āļ”āļēāļĐāļ—āļąāđ‰āļ‡āļŦāļĄāļ”āđƒāļ™āđāļ•āđˆāļĨāļ°āļŦāļ™āđ‰āļē +If you involve in manufacturing activity
    Enables item Is Manufactured,āļŦāļēāļāļ„āļļāļ“āļĄāļĩāļŠāđˆāļ§āļ™āļĢāđˆāļ§āļĄāđƒāļ™āļāļīāļˆāļāļĢāļĢāļĄāļāļēāļĢāļœāļĨāļīāļ•
    āļŠāđˆāļ§āļĒāđƒāļŦāđ‰āļĢāļēāļĒāļāļēāļĢāļ—āļĩāđˆāļœāļĨāļīāļ• +Ignore,āđ„āļĄāđˆāļŠāļ™āđƒāļˆ +Image,āļ āļēāļž +Image View,āļ”āļđāļ āļēāļž +Implementation Partner,āļžāļąāļ™āļ˜āļĄāļīāļ•āļĢāļāļēāļĢāļ”āļģāđ€āļ™āļīāļ™āļ‡āļēāļ™ +Import,āļ™āļģāđ€āļ‚āđ‰āļē +Import Date Format ,āļĢāļđāļ›āđāļšāļšāļ§āļąāļ™āļ—āļĩāđˆāļ™āļģāđ€āļ‚āđ‰āļē +Import Log,āļ™āļģāđ€āļ‚āđ‰āļēāļŠāļđāđˆāļĢāļ°āļšāļš +Import Log1,āļ™āļģāđ€āļ‚āđ‰āļē Log1 +Import data from spreadsheet (csv) files,āļ™āļģāđ€āļ‚āđ‰āļēāļ‚āđ‰āļ­āļĄāļđāļĨāļˆāļēāļāđ„āļŸāļĨāđŒāļŠāđ€āļ›āļĢāļ”āļŠāļĩāļ• (CSV) +Important dates and commitments in your project life cycle,āļ§āļąāļ™āļ—āļĩāđˆāļĄāļĩāļ„āļ§āļēāļĄāļŠāļģāļ„āļąāļāđāļĨāļ°āļĄāļĩāļ„āļ§āļēāļĄāļĄāļļāđˆāļ‡āļĄāļąāđˆāļ™āđƒāļ™āļ§āļ‡āļˆāļĢāļŠāļĩāļ§āļīāļ•āļ‚āļ­āļ‡āđ‚āļ„āļĢāļ‡āļāļēāļĢ +Imports,āļāļēāļĢāļ™āļģāđ€āļ‚āđ‰āļē +In Dialog,āđƒāļ™āļāļĨāđˆāļ­āļ‡āđ‚āļ•āđ‰āļ•āļ­āļš +In Filter,āļāļĢāļ­āļ‡ +In List View,āđƒāļ™āļĄāļļāļĄāļĄāļ­āļ‡āļĢāļēāļĒāļāļēāļĢ +In Process,āđƒāļ™āļāļĢāļ°āļšāļ§āļ™āļāļēāļĢ +In Report Filter,āđƒāļ™āļĢāļēāļĒāļ‡āļēāļ™āļāļĢāļ­āļ‡ +In Store,āđƒāļ™āļĢāđ‰āļēāļ™āļ„āđ‰āļē +In Words,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡ +In Words (Export),āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡ (āļŠāđˆāļ‡āļ­āļ­āļ) +In Words (Export) will be visible once you save the Delivery Note.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡ (āļŠāđˆāļ‡āļ­āļ­āļ) āļˆāļ°āļ›āļĢāļēāļāļāđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +In Words (Import),āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡ (āļ™āļģāđ€āļ‚āđ‰āļē) +In Words will be visible once you save the Delivery Note.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāļŦāļĄāļēāļĒāđ€āļŦāļ•āļļāļˆāļąāļ”āļŠāđˆāļ‡āļŠāļīāļ™āļ„āđ‰āļē +In Words will be visible once you save the Purchase Invoice.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāđƒāļšāļāļģāļāļąāļšāļ‹āļ·āđ‰āļ­ +In Words will be visible once you save the Purchase Order.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāđƒāļšāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­ +In Words will be visible once you save the Purchase Receipt.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāļĢāļąāļšāļ‹āļ·āđ‰āļ­ +In Words will be visible once you save the Quotation.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāđƒāļšāđ€āļŠāļ™āļ­āļĢāļēāļ„āļē +In Words will be visible once you save the Sales Invoice.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāđƒāļšāđāļˆāđ‰āļ‡āļŦāļ™āļĩāđ‰āļāļēāļĢāļ‚āļēāļĒ +In Words will be visible once you save the Sales Order.,āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡āļˆāļ°āļŠāļēāļĄāļēāļĢāļ–āļĄāļ­āļ‡āđ€āļŦāđ‡āļ™āđ„āļ”āđ‰āđ€āļĄāļ·āđˆāļ­āļ„āļļāļ“āļšāļąāļ™āļ—āļķāļāļāļēāļĢāļŠāļąāđˆāļ‡āļ‹āļ·āđ‰āļ­āļāļēāļĢāļ‚āļēāļĒ +In Words(Import),āđƒāļ™āļ„āļģāļžāļđāļ”āļ‚āļ­āļ‡ (āļ™āļģāđ€āļ‚āđ‰āļē) +In response to,āđƒāļ™āļāļēāļĢāļ•āļ­āļšāļŠāļ™āļ­āļ‡āļ•āđˆāļ­ +"In the Permission Manager, click on the button in the 'Condition' column for the Role you want to restrict.",āđƒāļ™āļ•āļąāļ§āļˆāļąāļ”āļāļēāļĢāļāļēāļĢāļ­āļ™āļļāļāļēāļ•āđƒāļŦāđ‰āļ„āļĨāļīāļāļ—āļĩāđˆāļ›āļļāđˆāļĄāđƒāļ™ 'āļŠāļ āļēāļž' āļ„āļ­āļĨāļąāļĄāļ™āđŒāļšāļ—āļšāļēāļ—āļ—āļĩāđˆāļ„āļļāļ“āļ•āđ‰āļ­āļ‡āļāļēāļĢ āļˆāļģāļāļąāļ” +Inactive,āđ€āļ‰āļ·āđˆāļ­āļĒāļŠāļē +Incentives,āđāļĢāļ‡āļˆāļđāļ‡āđƒāļˆ +Incharge Name,incharge āļŠāļ·āđˆāļ­ +Income,āđ€āļ‡āļīāļ™āđ„āļ”āđ‰ +Income Account,āļšāļąāļāļŠāļĩāļĢāļēāļĒāđ„āļ”āđ‰ +Income Year to Date,āļ›āļĩāļĢāļēāļĒāđ„āļ”āđ‰āđƒāļŦāđ‰āļāļąāļšāļ§āļąāļ™āļ—āļĩāđˆ +Incoming,āļ‚āļēāđ€āļ‚āđ‰āļē +Incoming Mail Setting,āļāļēāļĢāļ•āļąāđ‰āļ‡āļ„āđˆāļēāļ­āļĩāđ€āļĄāļĨāļ‚āļēāđ€āļ‚āđ‰āļē +Incoming Rate,āļ­āļąāļ•āļĢāļēāđ€āļ‚āđ‰āļē +Incoming Time,āđ€āļ§āļĨāļēāļ—āļĩāđˆāđ€āļ‚āđ‰āļēāļĄāļē +Incoming quality inspection.,āļāļēāļĢāļ•āļĢāļ§āļˆāļŠāļ­āļšāļ„āļļāļ“āļ āļēāļžāļ—āļĩāđˆāđ€āļ‚āđ‰āļēāļĄāļē +Indent,āļĒāđˆāļ­āļŦāļ™āđ‰āļē +Index,āļ”āļąāļŠāļ™āļĩ +Indicates that the package is a part of this delivery,āđāļŠāļ”āļ‡āđƒāļŦāđ‰āđ€āļŦāđ‡āļ™āļ§āđˆāļēāđāļžāļ„āđ€āļāļˆāđ€āļ›āđ‡āļ™āļŠāđˆāļ§āļ™āļŦāļ™āļķāđˆāļ‡āļ‚āļ­āļ‡āļāļēāļĢāļˆāļąāļ”āļŠāđˆāļ‡āļ™āļĩāđ‰ diff --git a/utilities/cleanup_data.py b/utilities/cleanup_data.py index 8c3b00acb96..a9cc5c340e8 100644 --- a/utilities/cleanup_data.py +++ b/utilities/cleanup_data.py @@ -24,7 +24,7 @@ def delete_transactions(): 'Stock Entry','Sales Order','Salary Slip','Sales Invoice','Quotation', 'Quality Inspection', \ 'Purchase Receipt','Purchase Order','Production Order', 'POS Setting','Period Closing Voucher', \ 'Purchase Invoice','Maintenance Visit','Maintenance Schedule','Leave Application', \ - 'Leave Allocation', 'Lead', 'Journal Voucher', 'Installation Note','Purchase Request', \ + 'Leave Allocation', 'Lead', 'Journal Voucher', 'Installation Note','Material Request', \ 'GL Entry','Expense Claim','Opportunity','Delivery Note','Customer Issue','Bin', \ 'Authorization Rule','Attendance', 'C-Form', 'Form 16A', 'Lease Agreement', \ 'Lease Installment', 'TDS Payment', 'TDS Return Acknowledgement', 'Appraisal', \ diff --git a/utilities/doctype/contact/locale/_messages_doc.json b/utilities/doctype/contact/locale/_messages_doc.json index 6e2c5bcd35c..c6a0750aaa7 100644 --- a/utilities/doctype/contact/locale/_messages_doc.json +++ b/utilities/doctype/contact/locale/_messages_doc.json @@ -1,23 +1,26 @@ [ - "Customer", "Trash Reason", - "Enter designation of this Contact", - "Designation", - "Enter department to which this Contact belongs", - "Phone", - "Last Name", - "Communication HTML", "Is Primary Contact", - "Utilities", - "Department", "First Name", + "Unsubscribed", + "Department", + "Supplier Name", + "Status", + "Enter department to which this Contact belongs", + "Utilities", + "Phone", + "Enter designation of this Contact", + "Customer", + "Designation", "Contact", "Customer Name", - "Unsubscribed", "Mobile No", - "Supplier", - "Contact Details", "Sales Partner", - "Supplier Name", + "Replied", + "Supplier", + "Last Name", + "Communication HTML", + "Contact Details", + "Open", "Email Id" ] \ No newline at end of file diff --git a/utilities/doctype/contact/locale/ar-doc.json b/utilities/doctype/contact/locale/ar-doc.json index be5d1fd9fe1..c4669634cbc 100644 --- a/utilities/doctype/contact/locale/ar-doc.json +++ b/utilities/doctype/contact/locale/ar-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "\u0647\u0648 \u0627\u0644\u0627\u062a\u0635\u0627\u0644 \u0627\u0644\u0623\u0648\u0644\u064a\u0629", "Last Name": "\u0627\u0633\u0645 \u0627\u0644\u0639\u0627\u0626\u0644\u0629", "Mobile No": "\u0631\u0642\u0645 \u0627\u0644\u062c\u0648\u0627\u0644", + "Open": "\u0641\u062a\u062d", "Phone": "\u0647\u0627\u062a\u0641", + "Replied": "\u0631\u062f", "Sales Partner": "\u0645\u0628\u064a\u0639\u0627\u062a \u0627\u0644\u0634\u0631\u064a\u0643", + "Status": "\u062d\u0627\u0644\u0629", "Supplier": "\u0645\u0632\u0648\u062f", "Supplier Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0648\u0631\u062f", "Trash Reason": "\u0627\u0644\u0633\u0628\u0628 \u0627\u0644\u0642\u0645\u0627\u0645\u0629", diff --git a/utilities/doctype/contact/locale/es-doc.json b/utilities/doctype/contact/locale/es-doc.json index 3298deca783..e923801df2e 100644 --- a/utilities/doctype/contact/locale/es-doc.json +++ b/utilities/doctype/contact/locale/es-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "Es el contacto principal", "Last Name": "Apellido", "Mobile No": "Mobile No", + "Open": "Abierto", "Phone": "Tel\u00e9fono", + "Replied": "Respondidos", "Sales Partner": "Sales Partner", + "Status": "Estado", "Supplier": "Proveedor", "Supplier Name": "Nombre del proveedor", "Trash Reason": "Trash Raz\u00f3n", diff --git a/utilities/doctype/contact/locale/fr-doc.json b/utilities/doctype/contact/locale/fr-doc.json index 198748a2ca9..87ebc68ebfd 100644 --- a/utilities/doctype/contact/locale/fr-doc.json +++ b/utilities/doctype/contact/locale/fr-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "Est-ressource principale", "Last Name": "Nom de famille", "Mobile No": "Aucun mobile", + "Open": "Ouvert", "Phone": "T\u00e9l\u00e9phone", + "Replied": "R\u00e9pondu", "Sales Partner": "Sales Partner", + "Status": "Statut", "Supplier": "Fournisseur", "Supplier Name": "Nom du fournisseur", "Trash Reason": "Raison Corbeille", diff --git a/utilities/doctype/contact/locale/hi-doc.json b/utilities/doctype/contact/locale/hi-doc.json index 91b65d350a3..77e426fe72f 100644 --- a/utilities/doctype/contact/locale/hi-doc.json +++ b/utilities/doctype/contact/locale/hi-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "\u092a\u094d\u0930\u093e\u0925\u092e\u093f\u0915 \u0938\u0902\u092a\u0930\u094d\u0915", "Last Name": "\u0938\u0930\u0928\u0947\u092e", "Mobile No": "\u0928\u0939\u0940\u0902 \u092e\u094b\u092c\u093e\u0907\u0932", + "Open": "\u0916\u0941\u0932\u093e", "Phone": "\u092b\u093c\u094b\u0928", + "Replied": "\u0909\u0924\u094d\u0924\u0930", "Sales Partner": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0938\u093e\u0925\u0940", + "Status": "\u0939\u0948\u0938\u093f\u092f\u0924", "Supplier": "\u092a\u094d\u0930\u0926\u093e\u092f\u0915", "Supplier Name": "\u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0928\u093e\u092e", "Trash Reason": "\u091f\u094d\u0930\u0948\u0936 \u0915\u093e\u0930\u0923", diff --git a/utilities/doctype/contact/locale/hr-doc.json b/utilities/doctype/contact/locale/hr-doc.json index 15507256db5..72ddf89593c 100644 --- a/utilities/doctype/contact/locale/hr-doc.json +++ b/utilities/doctype/contact/locale/hr-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "Je Primarna Kontakt", "Last Name": "Prezime", "Mobile No": "Mobitel Nema", + "Open": "Otvoreno", "Phone": "Telefon", + "Replied": "Odgovorio", "Sales Partner": "Prodaja partner", + "Status": "Status", "Supplier": "Dobavlja\u010d", "Supplier Name": "Dobavlja\u010d Ime", "Trash Reason": "Otpad Razlog", diff --git a/utilities/doctype/contact/locale/nl-doc.json b/utilities/doctype/contact/locale/nl-doc.json index 93ce4e36f25..4f821f2d509 100644 --- a/utilities/doctype/contact/locale/nl-doc.json +++ b/utilities/doctype/contact/locale/nl-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "Is Primaire contactpersoon", "Last Name": "Achternaam", "Mobile No": "Mobiel Nog geen", + "Open": "Open", "Phone": "Telefoon", + "Replied": "Beantwoord", "Sales Partner": "Sales Partner", + "Status": "Staat", "Supplier": "Leverancier", "Supplier Name": "Leverancier Naam", "Trash Reason": "Trash Reden", diff --git a/utilities/doctype/contact/locale/pt-doc.json b/utilities/doctype/contact/locale/pt-doc.json index bf048a57c06..6aaa8726c74 100644 --- a/utilities/doctype/contact/locale/pt-doc.json +++ b/utilities/doctype/contact/locale/pt-doc.json @@ -13,8 +13,11 @@ "Is Primary Contact": "\u00c9 Contato Principal", "Last Name": "Sobrenome", "Mobile No": "No m\u00f3vel", + "Open": "Abrir", "Phone": "Telefone", + "Replied": "Respondeu", "Sales Partner": "Parceiro de vendas", + "Status": "Estado", "Supplier": "Fornecedor", "Supplier Name": "Nome do Fornecedor", "Trash Reason": "Raz\u00e3o lixo", diff --git a/utilities/doctype/profile_control/profile_control.py b/utilities/doctype/profile_control/profile_control.py index 5f6b4d55300..340293dc600 100644 --- a/utilities/doctype/profile_control/profile_control.py +++ b/utilities/doctype/profile_control/profile_control.py @@ -20,7 +20,7 @@ import webnotes from webnotes.utils import cstr from webnotes.model import db_exists from webnotes.model.doc import Document -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist sql = webnotes.conn.sql diff --git a/utilities/doctype/sms_control/sms_control.js b/utilities/doctype/sms_control/sms_control.js index 4af96b3619b..f470f960ff8 100644 --- a/utilities/doctype/sms_control/sms_control.js +++ b/utilities/doctype/sms_control/sms_control.js @@ -89,7 +89,7 @@ cur_frm.cscript.send_sms = function(doc,dt,dn) { + (doc.po_no ? (' for your PO: ' + doc.po_no) : ''), 'Sales Invoice': 'Invoice ' + doc.name + ' has been sent via email ' + (doc.po_no ? (' for your PO: ' + doc.po_no) : ''), - 'Purchase Request' : 'Purchase Request ' + doc.name + ' has been raised in the system', + 'Material Request' : 'Material Request ' + doc.name + ' has been raised in the system', 'Purchase Order' : 'Purchase Order ' + doc.name + ' has been sent via email', 'Purchase Receipt' : 'Items has been received against purchase receipt: ' + doc.name } @@ -102,6 +102,6 @@ cur_frm.cscript.send_sms = function(doc,dt,dn) { sms_man.show('', '', '', doc.mobile_no, default_msg[doc.doctype]); else if (doc.doctype == 'Opportunity') sms_man.show('', '', '', doc.contact_no, default_msg[doc.doctype]); - else if (doc.doctype == 'Purchase Request') + else if (doc.doctype == 'Material Request') sms_man.show('', '', '', '', default_msg[doc.doctype]); } diff --git a/utilities/doctype/sms_control/sms_control.py b/utilities/doctype/sms_control/sms_control.py index 61b45b1a768..857dfdb1a56 100644 --- a/utilities/doctype/sms_control/sms_control.py +++ b/utilities/doctype/sms_control/sms_control.py @@ -21,7 +21,7 @@ from webnotes.utils import load_json, nowdate, cstr from webnotes.model.code import get_obj from webnotes.model.doc import Document from webnotes import msgprint -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.bean import getlist, copy_doclist sql = webnotes.conn.sql diff --git a/utilities/doctype/trash_control/trash_control.py b/utilities/doctype/trash_control/trash_control.py index 50edbf57043..341f8370314 100644 --- a/utilities/doctype/trash_control/trash_control.py +++ b/utilities/doctype/trash_control/trash_control.py @@ -19,7 +19,7 @@ import webnotes from webnotes.utils import now from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist +from webnotes.model.bean import copy_doclist from webnotes.model.code import get_obj sql = webnotes.conn.sql diff --git a/utilities/module_def/utilities/locale/_messages_doc.json b/utilities/module_def/utilities/locale/_messages_doc.json index 9289abe2b80..9427834691d 100644 --- a/utilities/module_def/utilities/locale/_messages_doc.json +++ b/utilities/module_def/utilities/locale/_messages_doc.json @@ -6,6 +6,5 @@ "question-view", "WIP Monitor", "questions", - "Calendar", "Trash" ] \ No newline at end of file diff --git a/website/css/website.css b/website/css/website.css index d1be219caa6..0b2dce44cbd 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -5,12 +5,18 @@ div#body_div { padding: 0px; min-height: 400px; - margin: 40px auto; + margin: 40px auto 10px auto; box-shadow: 1px 1px 3px 3px #bbb; border-radius: 5px; overflow: hidden; } +footer { + text-align: left; + width: 720px; + margin: auto; +} + .navbar-inner { border: 0px; border-bottom: 1px solid #ddd; @@ -33,9 +39,21 @@ p, li { padding: 30px; } -.web-footer-menu { - margin-bottom: 7px; +.social-icons { + font-size: 120%; + float: right; + text-align: right; } +.social-icons a:hover { + text-decoration: none; +} +.social-icons a i:hover { + text-decoration: none; +} +.social-icons i { + margin-left: 5px; +} + .web-footer-menu ul { list-style: none; @@ -45,16 +63,8 @@ p, li { .web-footer-menu ul li { display: inline; - padding: 2px 15px; - border-right: 1px solid #999; -} - -.web-footer-menu ul li:first-child { - padding-left: 0px; -} - -.web-footer-menu ul li:last-child { - border-right: 0px solid #777 !important; + padding: 2px 14px 2px 0px; + margin: 0px; } .two-column { diff --git a/website/doctype/contact_us_settings/contact_us_settings.py b/website/doctype/contact_us_settings/contact_us_settings.py index 8e6ef294746..740b651a178 100644 --- a/website/doctype/contact_us_settings/contact_us_settings.py +++ b/website/doctype/contact_us_settings/contact_us_settings.py @@ -14,7 +14,7 @@ class DocType: else: self.doc.query_options = ["Sales", "Support", "General"] if self.doc.address: - self.address = webnotes.model_wrapper("Address", self.doc.address).doc + self.address = webnotes.bean("Address", self.doc.address).doc def on_update(self): from website.utils import clear_cache diff --git a/website/doctype/product/locale/_messages_doc.json b/website/doctype/product/locale/_messages_doc.json deleted file mode 100644 index 186d902e671..00000000000 --- a/website/doctype/product/locale/_messages_doc.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "Website", - "Product", - "A Product is shown on the website and is linked to an item." -] \ No newline at end of file diff --git a/website/doctype/product/locale/ar-doc.json b/website/doctype/product/locale/ar-doc.json deleted file mode 100644 index 6e0779e4eea..00000000000 --- a/website/doctype/product/locale/ar-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "\u0648\u064a\u0631\u062f \u0627\u0644\u0645\u0646\u062a\u062c \u0639\u0644\u0649 \u0627\u0644\u0645\u0648\u0642\u0639 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u060c \u0648\u064a\u0631\u062a\u0628\u0637 \u0625\u0644\u0649 \u0639\u0646\u0635\u0631.", - "Product": "\u0646\u062a\u0627\u062c", - "Website": "\u0627\u0644\u0645\u0648\u0642\u0639" -} \ No newline at end of file diff --git a/website/doctype/product/locale/es-doc.json b/website/doctype/product/locale/es-doc.json deleted file mode 100644 index eef18d29216..00000000000 --- a/website/doctype/product/locale/es-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "Un producto se muestra en la p\u00e1gina web y est\u00e1 vinculada a un elemento.", - "Product": "Producto", - "Website": "Sitio web" -} \ No newline at end of file diff --git a/website/doctype/product/locale/fr-doc.json b/website/doctype/product/locale/fr-doc.json deleted file mode 100644 index 19d489df195..00000000000 --- a/website/doctype/product/locale/fr-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "Un produit est indiqu\u00e9 sur le site et il est li\u00e9 \u00e0 un \u00e9l\u00e9ment.", - "Product": "Produit", - "Website": "Site Web" -} \ No newline at end of file diff --git a/website/doctype/product/locale/hi-doc.json b/website/doctype/product/locale/hi-doc.json deleted file mode 100644 index 036faf2d3f5..00000000000 --- a/website/doctype/product/locale/hi-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "\u090f\u0915 \u0909\u0924\u094d\u092a\u093e\u0926 \u0915\u0940 \u0935\u0947\u092c\u0938\u093e\u0907\u091f \u092a\u0930 \u0926\u093f\u0916\u093e\u092f\u093e \u091c\u093e\u0924\u093e \u0939\u0948 \u0914\u0930 \u090f\u0915 \u0906\u0907\u091f\u092e \u0915\u0947 \u0932\u093f\u090f \u091c\u0941\u0921\u093c\u093e \u0939\u0941\u0906 \u0939\u0948.", - "Product": "\u0909\u0924\u094d\u092a\u093e\u0926", - "Website": "\u0935\u0947\u092c\u0938\u093e\u0907\u091f" -} \ No newline at end of file diff --git a/website/doctype/product/locale/hr-doc.json b/website/doctype/product/locale/hr-doc.json deleted file mode 100644 index 48bb0fab666..00000000000 --- a/website/doctype/product/locale/hr-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "Proizvod je prikazan na web stranici, a povezana je s to\u010dkom.", - "Product": "Proizvod", - "Website": "Website" -} \ No newline at end of file diff --git a/website/doctype/product/locale/nl-doc.json b/website/doctype/product/locale/nl-doc.json deleted file mode 100644 index 84d57af83c9..00000000000 --- a/website/doctype/product/locale/nl-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "Een product wordt getoond op de website en is gekoppeld aan een item.", - "Product": "Product", - "Website": "Website" -} \ No newline at end of file diff --git a/website/doctype/product/locale/pt-doc.json b/website/doctype/product/locale/pt-doc.json deleted file mode 100644 index 4fd2107ce1a..00000000000 --- a/website/doctype/product/locale/pt-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "Um produto \u00e9 mostrado no site e est\u00e1 ligada a um item.", - "Product": "Produto", - "Website": "Site" -} \ No newline at end of file diff --git a/website/doctype/product/locale/sr-doc.json b/website/doctype/product/locale/sr-doc.json deleted file mode 100644 index 4f287a43376..00000000000 --- a/website/doctype/product/locale/sr-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434 \u0441\u0435 \u043f\u0440\u0438\u043a\u0430\u0437\u0443\u0458\u0435 \u043d\u0430 \u0441\u0430\u0458\u0442\u0443 \u0438 \u043f\u043e\u0432\u0435\u0437\u0430\u043d \u0441\u0430 \u0441\u0442\u0430\u0432\u043a\u043e\u043c.", - "Product": "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434", - "Website": "\u0412\u0435\u0431\u0441\u0430\u0458\u0442" -} \ No newline at end of file diff --git a/website/doctype/product/locale/ta-doc.json b/website/doctype/product/locale/ta-doc.json deleted file mode 100644 index 68a3f98e379..00000000000 --- a/website/doctype/product/locale/ta-doc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "A Product is shown on the website and is linked to an item.": "\u0b92\u0bb0\u0bc1 \u0ba4\u0baf\u0bbe\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b87\u0ba3\u0bc8\u0baf\u0ba4\u0bb3\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bbe\u0ba3\u0bb2\u0bbe\u0bae\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf \u0b87\u0ba3\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc1\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1.", - "Product": "\u0bb5\u0bbf\u0bb3\u0bc8\u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd", - "Website": "\u0b87\u0ba3\u0bc8\u0baf\u0ba4\u0bb3\u0bae\u0bcd" -} \ No newline at end of file diff --git a/website/doctype/product_settings/product_settings.py b/website/doctype/product_settings/product_settings.py index 4e72be6be30..980f1238da3 100644 --- a/website/doctype/product_settings/product_settings.py +++ b/website/doctype/product_settings/product_settings.py @@ -13,5 +13,5 @@ class DocType: clear_cache() if self.doc.default_product_category: - webnotes.model_wrapper("Item Group", + webnotes.bean("Item Group", self.doc.default_product_category).save() \ No newline at end of file diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt index 78bc533b482..6af0575a360 100644 --- a/website/doctype/website_settings/website_settings.txt +++ b/website/doctype/website_settings/website_settings.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:33", + "creation": "2013-01-25 11:35:10", "docstatus": 0, - "modified": "2013-01-22 14:59:43", + "modified": "2013-02-21 10:05:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -24,17 +24,14 @@ "permlevel": 0 }, { - "create": 1, "doctype": "DocPerm", "name": "__common__", "parent": "Website Settings", "parentfield": "permissions", "parenttype": "DocType", - "permlevel": 0, "read": 1, "report": 0, - "submit": 0, - "write": 1 + "submit": 0 }, { "doctype": "DocType", @@ -128,6 +125,55 @@ "label": "Footer Items", "options": "Top Bar Item" }, + { + "doctype": "DocField", + "fieldname": "integrations", + "fieldtype": "Section Break", + "label": "Integrations" + }, + { + "description": "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.", + "doctype": "DocField", + "fieldname": "google_analytics_id", + "fieldtype": "Data", + "label": "Google Analytics ID" + }, + { + "doctype": "DocField", + "fieldname": "column_break_17", + "fieldtype": "Column Break" + }, + { + "doctype": "DocField", + "fieldname": "google_plus_one", + "fieldtype": "Check", + "label": "Google Plus One" + }, + { + "doctype": "DocField", + "fieldname": "facebook_share", + "fieldtype": "Check", + "label": "Facebook Share" + }, + { + "doctype": "DocField", + "fieldname": "linked_in_share", + "fieldtype": "Check", + "label": "Linked In Share" + }, + { + "doctype": "DocField", + "fieldname": "twitter_share", + "fieldtype": "Check", + "label": "Twitter Share" + }, + { + "description": "Tweet will be shared via your user account (if specified)", + "doctype": "DocField", + "fieldname": "twitter_share_via", + "fieldtype": "Data", + "label": "Twitter Share via" + }, { "doctype": "DocField", "fieldname": "misc_section", @@ -170,11 +216,25 @@ "print_hide": 1 }, { + "create": 1, "doctype": "DocPerm", - "role": "System Manager" + "permlevel": 0, + "role": "System Manager", + "write": 1 }, { + "create": 1, "doctype": "DocPerm", - "role": "Website Manager" + "permlevel": 0, + "role": "Website Manager", + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "permlevel": 1, + "role": "All" } ] \ No newline at end of file diff --git a/website/helpers/make_web_include_files.py b/website/helpers/make_web_include_files.py index 3bbc5636310..62b8c66cd29 100644 --- a/website/helpers/make_web_include_files.py +++ b/website/helpers/make_web_include_files.py @@ -1,11 +1,11 @@ # Copyright (c) 2012 Web Notes Technologies Pvt Ltd. # License: GNU General Public License (v3). For more information see license.txt +import os +import webnotes +import website.utils + def make(): - import os - import webnotes - import website.utils - import startup.event_handlers if not webnotes.conn: webnotes.connect() @@ -16,17 +16,45 @@ def make(): if os.path.basename(os.path.abspath('.'))!='public': fname = os.path.join('public', fname) - if hasattr(startup.event_handlers, 'get_web_script'): - with open(fname, 'w') as f: - script = 'window.home_page = "%s";\n' % home_page - script += startup.event_handlers.get_web_script() - f.write(script) + with open(fname, 'w') as f: + f.write(get_web_script()) fname = 'css/wn-web.css' if os.path.basename(os.path.abspath('.'))!='public': fname = os.path.join('public', fname) # style - wn.css - if hasattr(startup.event_handlers, 'get_web_style'): - with open(fname, 'w') as f: - f.write(startup.event_handlers.get_web_style()) \ No newline at end of file + with open(fname, 'w') as f: + f.write(get_web_style()) + +def get_web_script(): + """returns web startup script""" + user_script = "" + + ws = webnotes.doc("Website Settings", "Website Settings") + + if ws.google_analytics_id: + user_script += google_analytics_template % ws.google_analytics_id + + user_script += (webnotes.conn.get_value('Website Script', None, 'javascript') or '') + + return user_script + +def get_web_style(): + """returns web css""" + return webnotes.conn.get_value('Style Settings', None, 'custom_css') or '' + +google_analytics_template = """ + +// Google Analytics template + +window._gaq = window._gaq || []; +window._gaq.push(['_setAccount', '%s']); +window._gaq.push(['_trackPageview']); + +(function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); +})(); +""" \ No newline at end of file diff --git a/website/helpers/slideshow.py b/website/helpers/slideshow.py index 2c2ae4ba053..0afd80a0a3d 100644 --- a/website/helpers/slideshow.py +++ b/website/helpers/slideshow.py @@ -17,7 +17,7 @@ import webnotes def get_slideshow(obj): - slideshow = webnotes.model_wrapper("Website Slideshow", obj.doc.slideshow) + slideshow = webnotes.bean("Website Slideshow", obj.doc.slideshow) obj.slides = slideshow.doclist.get({"doctype":"Website Slideshow Item"}) obj.doc.slideshow_header = slideshow.doc.header or "" for s in obj.slides: diff --git a/website/module_def/website/locale/_messages_doc.json b/website/module_def/website/locale/_messages_doc.json index 7e41f2b659a..c33eada80ed 100644 --- a/website/module_def/website/locale/_messages_doc.json +++ b/website/module_def/website/locale/_messages_doc.json @@ -3,7 +3,6 @@ "", "Settings for Contact Us Page", "Cross Listing of Item in multiple groups", - "A Product is shown on the website and is linked to an item.", "Product Category for website", "Slideshow like display for the website", "Page to show on the website", diff --git a/website/templates/html/base.html b/website/templates/html/base.html index 995d3b7b0f8..2724e578ede 100644 --- a/website/templates/html/base.html +++ b/website/templates/html/base.html @@ -1,7 +1,7 @@ - {% block title %}{% endblock %} + {{ title }} diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html index 322ce604895..02a61acfa5c 100644 --- a/website/templates/html/outer.html +++ b/website/templates/html/outer.html @@ -13,7 +13,7 @@ style="margin-bottom: 0px;">
    - {{ brand_html }} + {{ brand_html }}
      {% for page in top_bar_items %} {% if not page.parent_label %} @@ -54,7 +54,7 @@
    @@ -67,6 +67,29 @@
    + {% if facebook_share or google_plus_one or twitter_share or linked_in_share %} + + {% endif %} +

    + ERPNext Powered

    diff --git a/website/templates/html/product_group.html b/website/templates/html/product_group.html index a5038821afc..1dd853fe6be 100644 --- a/website/templates/html/product_group.html +++ b/website/templates/html/product_group.html @@ -1,7 +1,5 @@ {% extends "html/page.html" %} -{% block title %}{{ name }}{% endblock %} - {% block content %}
    diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html index a574cf646f2..14fecfbf3a3 100644 --- a/website/templates/html/product_page.html +++ b/website/templates/html/product_page.html @@ -8,14 +8,6 @@ {% include "css/product_page.css" %} {% endblock %} -{% block title %} - {% if item_name != name %} - {{ item_name }} [{{ name }}] - {% else %} - {{ item_name or name }} - {% endif %} -{% endblock %} - {% block content %}
    diff --git a/website/templates/pages/404.html b/website/templates/pages/404.html index 04584d9a72c..8a676ce524f 100644 --- a/website/templates/pages/404.html +++ b/website/templates/pages/404.html @@ -1,5 +1,7 @@ {% extends "html/outer.html" %} +{% set title="Not Found" %} + {% block content %}
    diff --git a/website/templates/pages/about.html b/website/templates/pages/about.html index 7ccfa77769e..1a60b33c2d5 100644 --- a/website/templates/pages/about.html +++ b/website/templates/pages/about.html @@ -1,8 +1,6 @@ {% extends "html/page.html" %} -{% block title %} -About Us -{% endblock %} +{% set title="About Us" %} {% block content %}
    diff --git a/website/templates/pages/attributions.html b/website/templates/pages/attributions.html index bc9d3689216..e587484377a 100644 --- a/website/templates/pages/attributions.html +++ b/website/templates/pages/attributions.html @@ -8,9 +8,7 @@ {% endblock %} -{% block title %} - ERPNext - Web Based, Open Source ERP -{% endblock %} +{% set title="ERPNext - Web Based, Open Source ERP" %} {% block content %}
    diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html index f31af42222d..3ad9e0af561 100644 --- a/website/templates/pages/blog.html +++ b/website/templates/pages/blog.html @@ -8,7 +8,7 @@ {% include "css/blog.css" %} {% endblock %} -{% block title %}Blog{% endblock %} +{% set title="Blog" %} {% block content %}
    diff --git a/website/templates/pages/contact.html b/website/templates/pages/contact.html index 005d36a6818..f876da1d6ab 100644 --- a/website/templates/pages/contact.html +++ b/website/templates/pages/contact.html @@ -4,9 +4,7 @@ {% include "js/contact.js" %} {% endblock %} -{% block title %} -Contact Us -{% endblock %} +{% set title="Contact Us" %} {% block content %}
    diff --git a/website/templates/pages/error.html b/website/templates/pages/error.html index 4fe394f66bc..2be810d40a2 100644 --- a/website/templates/pages/error.html +++ b/website/templates/pages/error.html @@ -1,5 +1,7 @@ {% extends "html/outer.html" %} +{% set title="Error" %} + {% block content %}
    diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html index 9dcff269e8e..ef9b7bbce4f 100644 --- a/website/templates/pages/login.html +++ b/website/templates/pages/login.html @@ -7,9 +7,7 @@ {% include "css/login.css" %} {% endblock %} -{% block title %} - Login Page -{% endblock %} +{% set title="Login" %} {% block body %}
    diff --git a/website/templates/pages/product_search.html b/website/templates/pages/product_search.html index e573f7eb815..90c248949c0 100644 --- a/website/templates/pages/product_search.html +++ b/website/templates/pages/product_search.html @@ -1,6 +1,6 @@ {% extends "html/page.html" %} -{% block title %}Product Search{% endblock %} +{% set title="Product Search" %} {% block javascript %} {% include "js/product_list.js" %} diff --git a/website/templates/pages/unsubscribed.html b/website/templates/pages/unsubscribed.html index 3dc7df9e438..42441fe771a 100644 --- a/website/templates/pages/unsubscribed.html +++ b/website/templates/pages/unsubscribed.html @@ -1,5 +1,7 @@ {% extends "html/outer.html" %} +{% set title="Unsubscribed" %} + {% block content %}
    diff --git a/website/utils.py b/website/utils.py index 48ca844ae9f..16d8505664d 100644 --- a/website/utils.py +++ b/website/utils.py @@ -155,14 +155,14 @@ def prepare_args(page_name): 'name': page_name, }) if page_name in page_settings_map: - args.obj = webnotes.model_wrapper(page_settings_map[page_name]).obj + args.obj = webnotes.bean(page_settings_map[page_name]).obj else: args = get_doc_fields(page_name) if not args: return False - args.update(get_outer_env()) + get_outer_env(page_name, args) return args @@ -203,7 +203,10 @@ def get_source_doc(page_name): return None, None -def get_outer_env(): +def get_outer_env(page_name, args): + from webnotes.utils import get_request_site_address + from urllib import quote + all_top_items = webnotes.conn.sql("""\ select * from `tabTop Bar Item` where parent='Website Settings' and parentfield='top_bar_items' @@ -242,16 +245,23 @@ def get_outer_env(): 'int':int }) + args.update(ret) + settings = webnotes.doc("Website Settings", "Website Settings") - for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon"]: + for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon", + "facebook_share", "google_plus_one", "twitter_share", "linked_in_share", "twitter_share_via"]: if k in settings.fields: - ret[k] = settings.fields[k] + args[k] = settings.fields.get(k) - if not ret.brand_html: - ret.brand_html = "ERPNext" - if not ret.top_bar_background: - ret.top_bar_background = "Black" - return ret + if not args.brand_html: + args.brand_html = "ERPNext" + if not args.top_bar_background: + args.top_bar_background = "Black" + + args.url = quote(str(get_request_site_address(full_address=True)), str("")) + args.encoded_title = quote(str(args.title or ""), str("")) + + return args def get_home_page(): doc_name = webnotes.conn.get_value('Website Settings', None, 'home_page')