From e71fa9210febc5825170774499c8c1e047f96aa8 Mon Sep 17 00:00:00 2001 From: creador Date: Sun, 14 Feb 2016 11:58:21 +0200 Subject: [PATCH 01/49] Allow reorder_level to be set to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For items you don’t want to keep in stock, you can set the reorder_level to 0 and define reorder_qty. If there is e.g. a sales order for that item, the projected quantity will fall below 0, which will trigger an automatic material request. --- erpnext/stock/reorder_item.py | 2 +- erpnext/stock/report/stock_projected_qty/stock_projected_qty.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index cca2456d8f..c637a12781 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -48,7 +48,7 @@ def _reorder_item(): # projected_qty will be 0 if Bin does not exist projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse)) - if reorder_level and projected_qty <= reorder_level: + if (reorder_level or reorder_qty) and projected_qty < reorder_level: deficiency = reorder_level - projected_qty if deficiency > reorder_qty: reorder_qty = deficiency diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py index fd9ff5d585..9560709809 100644 --- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py @@ -47,7 +47,7 @@ def get_data(filters): re_order_level = d.warehouse_reorder_level re_order_qty = d.warehouse_reorder_qty - shortage_qty = re_order_level - flt(bin.projected_qty) if re_order_level else 0 + shortage_qty = re_order_level - flt(bin.projected_qty) if (re_order_level or re_order_qty) else 0 data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse, item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, From e156cd637986d9f623e0933d75be32cb50ae91ae Mon Sep 17 00:00:00 2001 From: creador Date: Sun, 14 Feb 2016 12:22:10 +0200 Subject: [PATCH 02/49] Product Bundle improvement This change allows addition of multiple instances of the same product inside a product bundle, if each has a different description in the bundle list (thus no duplicates). We use product bundles to include scrap material into our stock calculations. Here we need to enter the same product with different quantities into the same bundle. We explicitly specify scrap in the description of each line in product bundle. --- .../doctype/packed_item/packed_item.json | 26 +++++++++++++++++++ .../stock/doctype/packed_item/packed_item.py | 9 ++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json index b09765df43..24cd09b054 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.json +++ b/erpnext/stock/doctype/packed_item/packed_item.json @@ -523,6 +523,32 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "packing_description", + "fieldtype": "Text Editor", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Packing Description", + "length": 0, + "no_copy": 0, + "oldfieldname": "packing_description", + "oldfieldtype": "Text", + "permlevel": 0, + "print_hide": 0, + "print_width": "300px", + "read_only": 1, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0, + "width": "300px" } ], "hide_heading": 0, diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py index 0b69d317c0..af2d554b36 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.py +++ b/erpnext/stock/doctype/packed_item/packed_item.py @@ -14,7 +14,7 @@ class PackedItem(Document): pass def get_product_bundle_items(item_code): - return frappe.db.sql("""select t1.item_code, t1.qty, t1.uom + return frappe.db.sql("""select t1.item_code, t1.qty, t1.uom, t1.description from `tabProduct Bundle Item` t1, `tabProduct Bundle` t2 where t2.new_item_code=%s and t1.parent = t2.name""", item_code, as_dict=1) @@ -27,14 +27,14 @@ def get_bin_qty(item, warehouse): where item_code = %s and warehouse = %s""", (item, warehouse), as_dict = 1) return det and det[0] or frappe._dict() -def update_packing_list_item(doc, packing_item_code, qty, main_item_row): +def update_packing_list_item(doc, packing_item_code, qty, main_item_row, packing_description): bin = get_bin_qty(packing_item_code, main_item_row.warehouse) item = get_packing_item_details(packing_item_code) # check if exists exists = 0 for d in doc.get("packed_items"): - if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and d.parent_detail_docname == main_item_row.name: + if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and d.parent_detail_docname == main_item_row.name and d.packing_description == packing_description: pi, exists = d, 1 break @@ -50,6 +50,7 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row): pi.qty = flt(qty) pi.actual_qty = flt(bin.get("actual_qty")) pi.projected_qty = flt(bin.get("projected_qty")) + pi.packing_description = packing_description if not pi.warehouse: pi.warehouse = main_item_row.warehouse if not pi.batch_no: @@ -66,7 +67,7 @@ def make_packing_list(doc): for d in doc.get("items"): if frappe.db.get_value("Product Bundle", {"new_item_code": d.item_code}): for i in get_product_bundle_items(d.item_code): - update_packing_list_item(doc, i.item_code, flt(i.qty)*flt(d.qty), d) + update_packing_list_item(doc, i.item_code, flt(i.qty)*flt(d.qty), d, i.description) if [d.item_code, d.name] not in parent_items: parent_items.append([d.item_code, d.name]) From ddcd8c58bf6c81e493792f2a66736a5ae0f44426 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 19 Feb 2016 16:09:02 +0530 Subject: [PATCH 03/49] minor fix --- erpnext/setup/doctype/company/delete_company_transactions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py index 00ac76c619..d32e14fcc1 100644 --- a/erpnext/setup/doctype/company/delete_company_transactions.py +++ b/erpnext/setup/doctype/company/delete_company_transactions.py @@ -29,7 +29,7 @@ def delete_company_transactions(company_name): else: # un-set company - frappe.db.sql('update `tab{0}` set company="" where company=%s', company_name) + frappe.db.sql('update `tab{0}` set company="" where company=%s'.format(doctype), company_name) # Clear notification counts clear_notifications() From 68eb6894501b0886dc853f485e22679b2ac33e1d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 22 Feb 2016 16:14:35 +0530 Subject: [PATCH 04/49] [fix] UOM fixed in Item-wise Purchase History report --- .../item_wise_purchase_history.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json b/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json index 4cfda963b6..4659b36bca 100644 --- a/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json +++ b/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json @@ -2,17 +2,18 @@ "add_total_row": 1, "apply_user_permissions": 1, "creation": "2013-05-03 14:55:53", + "disabled": 0, "docstatus": 0, "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2016-01-28 15:36:46.837095", + "modified": "2016-02-22 11:27:39.445257", "modified_by": "Administrator", "module": "Buying", "name": "Item-wise Purchase History", "owner": "Administrator", - "query": "select\n po_item.item_code as \"Item Code:Link/Item:120\",\n\tpo_item.item_name as \"Item Name::120\",\n po_item.item_group as \"Item Group:Link/Item Group:120\",\n\tpo_item.description as \"Description::150\",\n\tpo_item.qty as \"Qty:Float:100\",\n\tpo_item.stock_uom as \"UOM:Link/UOM:80\",\n\tpo_item.base_rate as \"Rate:Currency:120\",\n\tpo_item.base_amount as \"Amount:Currency:120\",\n\tpo.name as \"Purchase Order:Link/Purchase Order:120\",\n\tpo.transaction_date as \"Transaction Date:Date:140\",\n\tpo.supplier as \"Supplier:Link/Supplier:130\",\n sup.supplier_name as \"Supplier Name::150\",\n\tpo_item.project_name as \"Project:Link/Project:130\",\n\tifnull(po_item.received_qty, 0) as \"Received Qty:Float:120\",\n\tpo.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order` po, `tabPurchase Order Item` po_item, `tabSupplier` sup\nwhere\n\tpo.name = po_item.parent and po.supplier = sup.name and po.docstatus = 1\norder by po.name desc", + "query": "select\n po_item.item_code as \"Item Code:Link/Item:120\",\n\tpo_item.item_name as \"Item Name::120\",\n po_item.item_group as \"Item Group:Link/Item Group:120\",\n\tpo_item.description as \"Description::150\",\n\tpo_item.qty as \"Qty:Float:100\",\n\tpo_item.uom as \"UOM:Link/UOM:80\",\n\tpo_item.base_rate as \"Rate:Currency:120\",\n\tpo_item.base_amount as \"Amount:Currency:120\",\n\tpo.name as \"Purchase Order:Link/Purchase Order:120\",\n\tpo.transaction_date as \"Transaction Date:Date:140\",\n\tpo.supplier as \"Supplier:Link/Supplier:130\",\n sup.supplier_name as \"Supplier Name::150\",\n\tpo_item.project_name as \"Project:Link/Project:130\",\n\tifnull(po_item.received_qty, 0) as \"Received Qty:Float:120\",\n\tpo.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order` po, `tabPurchase Order Item` po_item, `tabSupplier` sup\nwhere\n\tpo.name = po_item.parent and po.supplier = sup.name and po.docstatus = 1\norder by po.name desc", "ref_doctype": "Purchase Order", "report_name": "Item-wise Purchase History", "report_type": "Query Report" -} +} \ No newline at end of file From db746f5bc73ff194cfb0de600fd594af0ccac8ea Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 22 Feb 2016 16:16:58 +0530 Subject: [PATCH 05/49] [fix] Condition for Payment and Return button visibility --- .../doctype/purchase_invoice/purchase_invoice.js | 6 ++++-- .../accounts/doctype/sales_invoice/sales_invoice.js | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index d3a72d64d4..b158ea296a 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -24,11 +24,13 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ if(!doc.is_return) { if(doc.docstatus==1) { - if(doc.outstanding_amount != 0) { + if(doc.outstanding_amount < 0) { this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make")); cur_frm.page.set_inner_btn_group_as_primary(__("Make")); } - cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make")); + if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) { + cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make")); + } } if(doc.docstatus===0) { diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 26a9fa61c9..7b9b803945 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -57,10 +57,12 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte return item.is_delivered_by_supplier ? true : false; }) - cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'), - this.make_sales_return, __("Make")); - cur_frm.page.set_inner_btn_group_as_primary(__("Make")); - + if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) { + cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'), + this.make_sales_return, __("Make")); + cur_frm.page.set_inner_btn_group_as_primary(__("Make")); + } + if(cint(doc.update_stock)!=1) { // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note var from_delivery_note = false; @@ -75,7 +77,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte } } - if(doc.outstanding_amount!=0 && !cint(doc.is_return)) { + if(doc.outstanding_amount>0 && !cint(doc.is_return)) { cur_frm.add_custom_button(__('Payment Request'), this.make_payment_request, __("Make")); cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make")); } From 38be62c7e3e668cef8b1c633cea2e310368a83d2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 22 Feb 2016 16:24:23 +0530 Subject: [PATCH 06/49] [fix] Allow auto reorder based on reorder qty, even if reordeer level is zero --- erpnext/stock/reorder_item.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index c637a12781..ff341c3daf 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -48,7 +48,8 @@ def _reorder_item(): # projected_qty will be 0 if Bin does not exist projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse)) - if (reorder_level or reorder_qty) and projected_qty < reorder_level: + if ((reorder_level and projected_qty <= reorder_level) + or (not reorder_level and reorder_qty and projected_qty < 0)): deficiency = reorder_level - projected_qty if deficiency > reorder_qty: reorder_qty = deficiency From bf2b5119882611eb7db7260b740c936e6d777297 Mon Sep 17 00:00:00 2001 From: patilsangram Date: Mon, 22 Feb 2016 16:24:23 +0530 Subject: [PATCH 07/49] [Removed Stop Button from SO and PO] --- .../doctype/journal_entry/journal_entry.py | 6 ++-- .../doctype/payment_tool/payment_tool.py | 2 +- .../purchase_invoice/purchase_invoice.js | 2 +- .../purchase_invoice/purchase_invoice.py | 8 ++--- .../doctype/sales_invoice/sales_invoice.js | 2 +- .../doctype/sales_invoice/sales_invoice.py | 4 +-- .../ordered_items_to_be_billed.json | 2 +- .../purchase_order_items_to_be_billed.json | 2 +- .../purchase_common/purchase_common.py | 4 +-- .../doctype/purchase_order/purchase_order.js | 18 +++++------- .../purchase_order/purchase_order.json | 2 +- .../doctype/purchase_order/purchase_order.py | 18 ++++++------ .../purchase_order/purchase_order_list.js | 24 ++++++--------- erpnext/controllers/recurring_document.py | 2 +- erpnext/controllers/selling_controller.py | 4 +-- erpnext/controllers/status_updater.py | 2 -- erpnext/controllers/stock_controller.py | 4 +-- .../doctype/sales_order/sales_order.js | 18 ++++-------- .../doctype/sales_order/sales_order.json | 2 +- .../doctype/sales_order/sales_order.py | 14 ++++----- .../sales_order/sales_order_calendar.js | 2 +- .../doctype/sales_order/sales_order_list.js | 29 +++++++------------ .../doctype/sales_order/test_sales_order.py | 12 ++++---- erpnext/startup/notifications.py | 4 +-- .../doctype/delivery_note/delivery_note.js | 2 +- .../doctype/delivery_note/delivery_note.py | 4 +-- .../material_request/material_request.js | 2 +- .../material_request/material_request.py | 2 +- .../purchase_receipt/purchase_receipt.js | 2 +- .../purchase_receipt/purchase_receipt.py | 14 ++++----- erpnext/stock/stock_balance.py | 6 ++-- 31 files changed, 97 insertions(+), 122 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 4b5ce43857..afb9b85fb9 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -203,7 +203,7 @@ class JournalEntry(AccountsController): self.validate_invoices() def validate_orders(self): - """Validate totals, stopped and docstatus for orders""" + """Validate totals, closed and docstatus for orders""" for reference_name, total in self.reference_totals.iteritems(): reference_type = self.reference_types[reference_name] account = self.reference_accounts[reference_name] @@ -217,8 +217,8 @@ class JournalEntry(AccountsController): if flt(order.per_billed) >= 100: frappe.throw(_("{0} {1} is fully billed").format(reference_type, reference_name)) - if cstr(order.status) == "Stopped": - frappe.throw(_("{0} {1} is stopped").format(reference_type, reference_name)) + if cstr(order.status) == "Closed": + frappe.throw(_("{0} {1} is closed").format(reference_type, reference_name)) account_currency = get_account_currency(account) if account_currency == self.company_currency: diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.py b/erpnext/accounts/doctype/payment_tool/payment_tool.py index 36483067a1..ef8ffb1b93 100644 --- a/erpnext/accounts/doctype/payment_tool/payment_tool.py +++ b/erpnext/accounts/doctype/payment_tool/payment_tool.py @@ -133,7 +133,7 @@ def get_orders_to_be_billed(party_type, party, party_account_currency, company_c where {party_type} = %s and docstatus = 1 - and ifnull(status, "") != "Stopped" + and ifnull(status, "") != "Closed" and {ref_field} > advance_paid and abs(100 - per_billed) > 0.01 """.format(**{ diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index d3a72d64d4..2de99930c2 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -39,7 +39,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ get_query_filters: { supplier: cur_frm.doc.supplier || undefined, docstatus: 1, - status: ["not in", ["Stopped", "Closed"]], + status: ["!=", "Closed"], per_billed: ["<", 99.99], company: cur_frm.doc.company } diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 6d61abe4cc..d88a11e03d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -49,7 +49,7 @@ class PurchaseInvoice(BuyingController): self.check_conversion_rate() self.validate_credit_to_acc() self.clear_unallocated_advances("Purchase Invoice Advance", "advances") - self.check_for_stopped_or_closed_status() + self.check_for_closed_status() self.validate_with_previous_doc() self.validate_uom_is_integer("uom", "qty") self.set_against_expense_account() @@ -104,14 +104,14 @@ class PurchaseInvoice(BuyingController): self.party_account_currency = account.account_currency - def check_for_stopped_or_closed_status(self): + def check_for_closed_status(self): check_list = [] pc_obj = frappe.get_doc('Purchase Common') for d in self.get('items'): if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt: check_list.append(d.purchase_order) - pc_obj.check_for_stopped_or_closed_status('Purchase Order', d.purchase_order) + pc_obj.check_for_closed_status('Purchase Order', d.purchase_order) def validate_with_previous_doc(self): super(PurchaseInvoice, self).validate_with_previous_doc({ @@ -405,7 +405,7 @@ class PurchaseInvoice(BuyingController): make_gl_entries(gl_entries, cancel=(self.docstatus == 2)) def on_cancel(self): - self.check_for_stopped_or_closed_status() + self.check_for_closed_status() if not self.is_return: from erpnext.accounts.utils import remove_against_link_from_jv diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 26a9fa61c9..e717089a1e 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -114,7 +114,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte source_doctype: "Sales Order", get_query_filters: { docstatus: 1, - status: ["not in", ["Stopped", "Closed"]], + status: ["!=", "Closed"], per_billed: ["<", 99.99], customer: cur_frm.doc.customer || undefined, company: cur_frm.doc.company diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 3c60bfbb70..e120f18b3a 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -53,7 +53,7 @@ class SalesInvoice(SellingController): self.validate_proj_cust() self.validate_with_previous_doc() self.validate_uom_is_integer("stock_uom", "qty") - self.check_stop_or_close_sales_order("sales_order") + self.check_close_sales_order("sales_order") self.validate_debit_to_acc() self.validate_fixed_asset_account() self.clear_unallocated_advances("Sales Invoice Advance", "advances") @@ -121,7 +121,7 @@ class SalesInvoice(SellingController): if cint(self.update_stock) == 1: self.update_stock_ledger() - self.check_stop_or_close_sales_order("sales_order") + self.check_close_sales_order("sales_order") from erpnext.accounts.utils import remove_against_link_from_jv remove_against_link_from_jv(self.doctype, self.name) diff --git a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json index cdbd5c1c01..f50d334d63 100644 --- a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json +++ b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json @@ -12,7 +12,7 @@ "module": "Accounts", "name": "Ordered Items To Be Billed", "owner": "Administrator", - "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`.base_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`.base_amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\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 not in (\"Stopped\", \"Closed\")\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.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`.base_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`.base_amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\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 not in (\"Closed\")\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.amount,0)\norder by `tabSales Order`.transaction_date asc", "ref_doctype": "Sales Invoice", "report_name": "Ordered Items To Be Billed", "report_type": "Query Report" diff --git a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json index 38361fb19b..991e5994f3 100644 --- a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json +++ b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json @@ -12,7 +12,7 @@ "module": "Accounts", "name": "Purchase Order Items To Be Billed", "owner": "Administrator", - "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status not in (\"Stopped\", \"Closed\")\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 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\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status not in (\"Closed\")\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 0)\norder by `tabPurchase Order`.transaction_date asc", "ref_doctype": "Purchase Invoice", "report_name": "Purchase Order Items To Be Billed", "report_type": "Query Report" diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py index a86b330630..df63e291ba 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.py +++ b/erpnext/buying/doctype/purchase_common/purchase_common.py @@ -80,10 +80,10 @@ class PurchaseCommon(BuyingController): frappe.msgprint(_("Warning: Same item has been entered multiple times.")) - def check_for_stopped_or_closed_status(self, doctype, docname): + def check_for_closed_status(self, doctype, docname): status = frappe.db.get_value(doctype, docname, "status") - if status in ("Stopped", "Closed"): + if status == "Closed": frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError) def check_docstatus(self, check, doctype, docname, detail_doctype = ''): diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index e23b0d440a..2c1d709043 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -38,13 +38,13 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( cur_frm.set_df_property("drop_ship", "hidden", !is_drop_ship); - if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) { + if(doc.docstatus == 1 && !in_list(["Closed", "Delivered"], doc.status)) { if (this.frm.has_perm("submit")) { if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) { - cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order, __("Status")); + cur_frm.add_custom_button(__('Close'), this.close_purchase_order, __("Status")); } - cur_frm.add_custom_button(__('Close'), this.close_purchase_order, __("Status")); + } @@ -58,13 +58,13 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( cur_frm.cscript.add_from_mappers(); } - if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) { + if(doc.docstatus == 1 && in_list(["Closed", "Delivered"], doc.status)) { if (this.frm.has_perm("submit")) { - cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order, __("Status")); + cur_frm.add_custom_button(__('Re-open'), this.unclose_purchase_order, __("Status")); } } - if(doc.docstatus == 1 && !in_list(["Stopped", "Closed"], doc.status)) { + if(doc.docstatus == 1 && !in_list(["Closed"], doc.status)) { if(flt(doc.per_received, 2) < 100 && allow_receipt) { cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt, __("Make")); @@ -192,11 +192,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( }); }, - stop_purchase_order: function(){ - cur_frm.cscript.update_status('Stop', 'Stopped') - }, - - unstop_purchase_order: function(){ + unclose_purchase_order: function(){ cur_frm.cscript.update_status('Re-open', 'Submitted') }, diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 70070cc104..a3628be922 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -1907,7 +1907,7 @@ "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", - "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nStopped\nCancelled\nClosed\nDelivered", + "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nCancelled\nClosed\nDelivered", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index caefe53ac3..d4474b657b 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -39,7 +39,7 @@ class PurchaseOrder(BuyingController): self.set_status() pc_obj = frappe.get_doc('Purchase Common') pc_obj.validate_for_items(self) - self.check_for_stopped_or_closed_status(pc_obj) + self.check_for_closed_status(pc_obj) self.validate_uom_is_integer("uom", "qty") self.validate_uom_is_integer("stock_uom", ["qty", "required_qty"]) @@ -113,13 +113,13 @@ class PurchaseOrder(BuyingController): d.base_price_list_rate = d.base_rate = d.price_list_rate \ = d.rate = item_last_purchase_rate - # Check for Stopped status - def check_for_stopped_or_closed_status(self, pc_obj): + # Check for Closed status + def check_for_closed_status(self, pc_obj): check_list =[] for d in self.get('items'): if d.meta.get_field('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list: check_list.append(d.prevdoc_docname) - pc_obj.check_for_stopped_or_closed_status( d.prevdoc_doctype, d.prevdoc_docname) + pc_obj.check_for_closed_status( d.prevdoc_doctype, d.prevdoc_docname) def update_requested_qty(self): material_request_map = {} @@ -193,7 +193,7 @@ class PurchaseOrder(BuyingController): self.update_delivered_qty_in_sales_order() pc_obj = frappe.get_doc('Purchase Common') - self.check_for_stopped_or_closed_status(pc_obj) + self.check_for_closed_status(pc_obj) # Check if Purchase Receipt has been submitted against current Purchase Order pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Receipt', docname = self.name, detail_doctype = 'Purchase Receipt Item') @@ -253,7 +253,7 @@ class PurchaseOrder(BuyingController): item.received_qty = item.qty @frappe.whitelist() -def stop_or_unstop_purchase_orders(names, status): +def close_or_unclose_purchase_orders(names, status): if not frappe.has_permission("Purchase Order", "write"): frappe.throw(_("Not permitted"), frappe.PermissionError) @@ -261,11 +261,11 @@ def stop_or_unstop_purchase_orders(names, status): for name in names: po = frappe.get_doc("Purchase Order", name) if po.docstatus == 1: - if status in ("Stopped", "Closed"): - if po.status not in ("Stopped", "Cancelled", "Closed") and (po.per_received < 100 or po.per_billed < 100): + if status == "Closed": + if po.status not in ( "Cancelled", "Closed") and (po.per_received < 100 or po.per_billed < 100): po.update_status(status) else: - if po.status in ("Stopped", "Closed"): + if po.status == "Closed": po.update_status("Draft") frappe.local.message_log = [] diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js index 253eb4bccd..f6e7eeba27 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -2,37 +2,31 @@ frappe.listview_settings['Purchase Order'] = { add_fields: ["base_grand_total", "company", "currency", "supplier", "supplier_name", "per_received", "per_billed", "status"], get_indicator: function(doc) { - if(doc.status==="Stopped") { - return [__("Stopped"), "darkgrey", "status,=,Stopped"]; - } else if(doc.status==="Closed"){ + if(doc.status==="Closed"){ return [__("Closed"), "green", "status,=,Closed"]; } else if (doc.status==="Delivered") { return [__("Delivered"), "green", "status,=,Closed"]; - }else if(flt(doc.per_received, 2) < 100 && doc.status!=="Stopped") { + }else if(flt(doc.per_received, 2) < 100 && doc.status!=="Closed") { if(flt(doc.per_billed, 2) < 100) { return [__("To Receive and Bill"), "orange", - "per_received,<,100|per_billed,<,100|status,!=,Stopped"]; + "per_received,<,100|per_billed,<,100|status,!=,Closed"]; } else { return [__("To Receive"), "orange", - "per_received,<,100|per_billed,=,100|status,!=,Stopped"]; + "per_received,<,100|per_billed,=,100|status,!=,Closed"]; } - } else if(flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) < 100 && doc.status!=="Stopped") { - return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Stopped"]; - } else if(flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) == 100 && doc.status!=="Stopped") { - return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Stopped"]; + } else if(flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) < 100 && doc.status!=="Closed") { + return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Closed"]; + } else if(flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) == 100 && doc.status!=="Closed") { + return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Closed"]; } }, onload: function(listview) { - var method = "erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders"; + var method = "erpnext.buying.doctype.purchase_order.purchase_order.close_or_unclose_purchase_orders"; listview.page.add_menu_item(__("Close"), function() { listview.call_for_selected_items(method, {"status": "Closed"}); }); - listview.page.add_menu_item(__("Stop"), function() { - listview.call_for_selected_items(method, {"status": "Stopped"}); - }); - listview.page.add_menu_item(__("Re-open"), function() { listview.call_for_selected_items(method, {"status": "Submitted"}); }); diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py index 013a70e0ac..3ecbe5f119 100644 --- a/erpnext/controllers/recurring_document.py +++ b/erpnext/controllers/recurring_document.py @@ -34,7 +34,7 @@ def manage_recurring_documents(doctype, next_date=None, commit=True): date_field = date_field_map[doctype] - condition = " and ifnull(status, '') != 'Stopped'" if doctype in ("Sales Order", "Purchase Order") else "" + condition = " and ifnull(status, '') != 'Closed'" if doctype in ("Sales Order", "Purchase Order") else "" recurring_documents = frappe.db.sql("""select name, recurring_id from `tab{0}` where is_recurring=1 diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index f340f91104..09a8c94b9e 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -219,11 +219,11 @@ class SellingController(StockController): so_warehouse = so_item and so_item[0]["warehouse"] or "" return so_qty, so_warehouse - def check_stop_or_close_sales_order(self, ref_fieldname): + def check_close_sales_order(self, ref_fieldname): for d in self.get("items"): if d.get(ref_fieldname): status = frappe.db.get_value("Sales Order", d.get(ref_fieldname), "status") - if status in ("Stopped", "Closed"): + if status == "Closed": frappe.throw(_("Sales Order {0} is {1}").format(d.get(ref_fieldname), status)) def check_active_sales_items(obj): diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 32724a9f95..5c5719e7be 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -35,7 +35,6 @@ status_map = { ["To Deliver", "eval:self.per_delivered < 100 and self.per_billed == 100 and self.docstatus == 1"], ["Completed", "eval:self.per_delivered == 100 and self.per_billed == 100 and self.docstatus == 1"], ["Completed", "eval:self.order_type == 'Maintenance' and self.per_billed == 100 and self.docstatus == 1"], - ["Stopped", "eval:self.status=='Stopped'"], ["Cancelled", "eval:self.docstatus==2"], ["Closed", "eval:self.status=='Closed'"], ], @@ -46,7 +45,6 @@ status_map = { ["To Receive", "eval:self.per_received < 100 and self.per_billed == 100 and self.docstatus == 1"], ["Completed", "eval:self.per_received == 100 and self.per_billed == 100 and self.docstatus == 1"], ["Delivered", "eval:self.status=='Delivered'"], - ["Stopped", "eval:self.status=='Stopped'"], ["Cancelled", "eval:self.docstatus==2"], ["Closed", "eval:self.status=='Closed'"], ], diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 4c6a320158..10bf2f2b74 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -243,8 +243,8 @@ class StockController(AccountsController): if so and so_item_rows: sales_order = frappe.get_doc("Sales Order", so) - if sales_order.status in ["Stopped", "Cancelled"]: - frappe.throw(_("{0} {1} is cancelled or stopped").format(_("Sales Order"), so), + if sales_order.status in ["Closed", "Cancelled"]: + frappe.throw(_("{0} {1} is cancelled or closed").format(_("Sales Order"), so), frappe.InvalidStatusError) sales_order.update_reserved_qty(so_item_rows) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 9dae2b974d..b7dff77a6d 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -19,7 +19,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( var allow_delivery = false; if(doc.docstatus==1) { - if(doc.status != 'Stopped' && doc.status != 'Closed') { + if(doc.status != 'Closed') { for (var i in cur_frm.doc.items) { var item = cur_frm.doc.items[i]; @@ -42,13 +42,10 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } if (this.frm.has_perm("submit")) { - // stop + // close if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) { - cur_frm.add_custom_button(__('Stop'), this.stop_sales_order, __("Status")) + cur_frm.add_custom_button(__('Close'), this.close_sales_order, __("Status")) } - - - cur_frm.add_custom_button(__('Close'), this.close_sales_order, __("Status")) } // delivery note @@ -87,8 +84,8 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } else { if (this.frm.has_perm("submit")) { - // un-stop - cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Sales Order'], __("Status")); + // un-close + cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unclose Sales Order'], __("Status")); } } } @@ -220,9 +217,6 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( }); dialog.show(); }, - stop_sales_order: function(){ - cur_frm.cscript.update_status("Stop", "Stopped") - }, close_sales_order: function(){ cur_frm.cscript.update_status("Close", "Closed") } @@ -263,7 +257,7 @@ cur_frm.cscript.update_status = function(label, status){ }); } -cur_frm.cscript['Unstop Sales Order'] = function() { +cur_frm.cscript['Unclose Sales Order'] = function() { cur_frm.cscript.update_status('Re-open', 'Draft') } diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 8049a674a1..5c57f4584f 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -2201,7 +2201,7 @@ "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", - "options": "\nDraft\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nStopped\nCancelled\nClosed", + "options": "\nDraft\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nCancelled\nClosed", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index e692d6bb0e..d735bea01b 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -160,9 +160,9 @@ class SalesOrder(SellingController): self.update_prevdoc_status('submit') def on_cancel(self): - # Cannot cancel stopped SO - if self.status == 'Stopped': - frappe.throw(_("Stopped order cannot be cancelled. Unstop to cancel.")) + # Cannot cancel closed SO + if self.status == 'Closed': + frappe.throw(_("Closed order cannot be cancelled. Unclose to cancel.")) self.check_nextdoc_docstatus() self.update_reserved_qty() @@ -317,7 +317,7 @@ def get_list_context(context=None): return list_context @frappe.whitelist() -def stop_or_unstop_sales_orders(names, status): +def close_or_unclose_sales_orders(names, status): if not frappe.has_permission("Sales Order", "write"): frappe.throw(_("Not permitted"), frappe.PermissionError) @@ -325,11 +325,11 @@ def stop_or_unstop_sales_orders(names, status): for name in names: so = frappe.get_doc("Sales Order", name) if so.docstatus == 1: - if status in ("Stopped", "Closed"): - if so.status not in ("Stopped", "Cancelled", "Closed") and (so.per_delivered < 100 or so.per_billed < 100): + if status == "Closed": + if so.status not in ("Cancelled", "Closed") and (so.per_delivered < 100 or so.per_billed < 100): so.update_status(status) else: - if so.status in ("Stopped", "Closed"): + if so.status == "Closed": so.update_status('Draft') frappe.local.message_log = [] diff --git a/erpnext/selling/doctype/sales_order/sales_order_calendar.js b/erpnext/selling/doctype/sales_order/sales_order_calendar.js index 8724daae80..7a38f90079 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_calendar.js +++ b/erpnext/selling/doctype/sales_order/sales_order_calendar.js @@ -32,7 +32,7 @@ frappe.views.calendar["Sales Order"] = { ], get_events_method: "erpnext.selling.doctype.sales_order.sales_order.get_events", get_css_class: function(data) { - if(data.status=="Stopped") { + if(data.status=="Closed") { return ""; } if(data.delivery_status=="Not Delivered") { return "danger"; diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index ff9ff91beb..3b60af4672 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -2,58 +2,51 @@ frappe.listview_settings['Sales Order'] = { add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date", "per_delivered", "per_billed", "status", "order_type"], get_indicator: function(doc) { - if(doc.status==="Stopped") { - return [__("Stopped"), "darkgrey", "status,=,Stopped"]; - - } else if(doc.status==="Closed"){ + if(doc.status==="Closed"){ return [__("Closed"), "green", "status,=,Closed"]; } else if (doc.order_type !== "Maintenance" && flt(doc.per_delivered, 2) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) { // to bill & overdue - return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"]; + return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"]; } else if (doc.order_type !== "Maintenance" - && flt(doc.per_delivered, 2) < 100 && doc.status!=="Stopped") { + && flt(doc.per_delivered, 2) < 100 && doc.status!=="Closed") { // not delivered if(flt(doc.per_billed, 2) < 100) { // not delivered & not billed return [__("To Deliver and Bill"), "orange", - "per_delivered,<,100|per_billed,<,100|status,!=,Stopped"]; + "per_delivered,<,100|per_billed,<,100|status,!=,Closed"]; } else { // not billed return [__("To Deliver"), "orange", - "per_delivered,<,100|per_billed,=,100|status,!=,Stopped"]; + "per_delivered,<,100|per_billed,=,100|status,!=,Closed"]; } } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100) - && flt(doc.per_billed, 2) < 100 && doc.status!=="Stopped") { + && flt(doc.per_billed, 2) < 100 && doc.status!=="Closed") { // to bill - return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped"]; + return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"]; } else if((doc.order_type === "Maintenance" || flt(doc.per_delivered, 2) == 100) - && flt(doc.per_billed, 2) == 100 && doc.status!=="Stopped") { + && flt(doc.per_billed, 2) == 100 && doc.status!=="Closed") { - return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"]; + return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"]; } }, onload: function(listview) { - var method = "erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders"; + var method = "erpnext.selling.doctype.sales_order.sales_order.close_or_unclose_sales_orders"; listview.page.add_menu_item(__("Close"), function() { listview.call_for_selected_items(method, {"status": "Closed"}); }); - listview.page.add_menu_item(__("Stop"), function() { - listview.call_for_selected_items(method, {"status": "Stoped"}); - }); - listview.page.add_menu_item(__("Re-open"), function() { - listview.call_for_selected_items(method, {"status": "Unstop"}); + listview.call_for_selected_items(method, {"status": "Unclose"}); }); } diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index c6ea618eb0..edd7cdfc4d 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -93,12 +93,12 @@ class TestSalesOrder(unittest.TestCase): dn = create_dn_against_so(so.name) self.assertEqual(get_reserved_qty(), existing_reserved_qty + 5) - # stop so + # close so so.load_from_db() - so.update_status("Stopped") + so.update_status("Closed") self.assertEqual(get_reserved_qty(), existing_reserved_qty) - # unstop so + # unclose so so.load_from_db() so.update_status('Draft') self.assertEqual(get_reserved_qty(), existing_reserved_qty + 5) @@ -143,14 +143,14 @@ class TestSalesOrder(unittest.TestCase): self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 10) - # stop so + # close so so.load_from_db() - so.update_status("Stopped") + so.update_status("Closed") self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1) self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2) - # unstop so + # unclose so so.load_from_db() so.update_status('Draft') diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py index 3acf63c5f0..181a969aaf 100644 --- a/erpnext/startup/notifications.py +++ b/erpnext/startup/notifications.py @@ -15,7 +15,7 @@ def get_notification_config(): "Opportunity": {"status": "Open"}, "Quotation": {"docstatus": 0}, "Sales Order": { - "status": ("not in", ("Stopped", "Completed", "Closed")), + "status": ("not in", ("Completed", "Closed")), "docstatus": ("<", 2) }, "Journal Entry": {"docstatus": 0}, @@ -29,7 +29,7 @@ def get_notification_config(): "Stock Entry": {"docstatus": 0}, "Material Request": {"docstatus": 0}, "Purchase Order": { - "status": ("not in", ("Stopped", "Completed", "Closed")), + "status": ("not in", ("Completed", "Closed")), "docstatus": ("<", 2) }, "Production Order": { "status": "In Process" }, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 0b6f47e09f..679d9105f7 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -34,7 +34,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( source_doctype: "Sales Order", get_query_filters: { docstatus: 1, - status: ["not in", ["Stopped", "Closed"]], + status: ["!=", "Closed"], per_delivered: ["<", 99.99], project_name: cur_frm.doc.project_name || undefined, customer: cur_frm.doc.customer || undefined, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 0dabfa13e1..2db350974c 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -98,7 +98,7 @@ class DeliveryNote(SellingController): self.set_status() self.so_required() self.validate_proj_cust() - self.check_stop_or_close_sales_order("against_sales_order") + self.check_close_sales_order("against_sales_order") self.validate_for_items() self.validate_warehouse() self.validate_uom_is_integer("stock_uom", "qty") @@ -195,7 +195,7 @@ class DeliveryNote(SellingController): self.make_gl_entries() def on_cancel(self): - self.check_stop_or_close_sales_order("against_sales_order") + self.check_close_sales_order("against_sales_order") self.check_next_docstatus() self.update_prevdoc_status() diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 922eb5a435..e22e3cd6c5 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -70,7 +70,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten source_doctype: "Sales Order", get_query_filters: { docstatus: 1, - status: ["!=", "Stopped"], + status: ["!=", "Closed"], per_delivered: ["<", 99.99], company: cur_frm.doc.company } diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 6f6f78e2a0..60bfb8cf46 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -101,7 +101,7 @@ class MaterialRequest(BuyingController): def on_cancel(self): pc_obj = frappe.get_doc('Purchase Common') - pc_obj.check_for_stopped_or_closed_status(self.doctype, self.name) + pc_obj.check_for_closed_status(self.doctype, self.name) pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Order', docname = self.name, detail_doctype = 'Purchase Order Item') self.update_requested_qty() diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 7cf7ae9f88..a4df2d8c76 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -46,7 +46,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend get_query_filters: { supplier: cur_frm.doc.supplier || undefined, docstatus: 1, - status: ["not in", ["Stopped", "Closed"]], + status: ["!=", "Closed"], per_received: ["<", 99.99], company: cur_frm.doc.company } diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 1d872388f3..454b386948 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -61,7 +61,7 @@ class PurchaseReceipt(BuyingController): pc_obj = frappe.get_doc('Purchase Common') pc_obj.validate_for_items(self) - self.check_for_stopped_or_closed_status(pc_obj) + self.check_for_closed_status(pc_obj) # sub-contracting self.validate_for_subcontracting() @@ -177,8 +177,8 @@ class PurchaseReceipt(BuyingController): if po and po_item_rows: po_obj = frappe.get_doc("Purchase Order", po) - if po_obj.status in ["Stopped", "Cancelled"]: - frappe.throw(_("{0} {1} is cancelled or stopped").format(_("Purchase Order"), po), + if po_obj.status in ["Closed", "Cancelled"]: + frappe.throw(_("{0} {1} is cancelled or closed").format(_("Purchase Order"), po), frappe.InvalidStatusError) po_obj.update_ordered_qty(po_item_rows) @@ -212,13 +212,13 @@ class PurchaseReceipt(BuyingController): if self.docstatus==1: raise frappe.ValidationError - # Check for Stopped status - def check_for_stopped_or_closed_status(self, pc_obj): + # Check for Closed status + def check_for_closed_status(self, pc_obj): check_list =[] for d in self.get('items'): if d.meta.get_field('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list: check_list.append(d.prevdoc_docname) - pc_obj.check_for_stopped_or_closed_status(d.prevdoc_doctype, d.prevdoc_docname) + pc_obj.check_for_closed_status(d.prevdoc_doctype, d.prevdoc_docname) # on submit def on_submit(self): @@ -256,7 +256,7 @@ class PurchaseReceipt(BuyingController): def on_cancel(self): pc_obj = frappe.get_doc('Purchase Common') - self.check_for_stopped_or_closed_status(pc_obj) + self.check_for_closed_status(pc_obj) # Check if Purchase Invoice has been submitted against current Purchase Order submitted = frappe.db.sql("""select t1.name from `tabPurchase Invoice` t1,`tabPurchase Invoice Item` t2 diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index b9e3cd2e82..24c23d4d3c 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -92,7 +92,7 @@ def get_reserved_qty(item_code, warehouse): and parenttype="Sales Order" and item_code != parent_item and exists (select * from `tabSales Order` so - where name = dnpi_in.parent and docstatus = 1 and status not in ('Stopped','Closed')) + where name = dnpi_in.parent and docstatus = 1 and status not in ('Closed')) ) dnpi) union (select qty as dnpi_qty, qty as so_item_qty, @@ -102,7 +102,7 @@ def get_reserved_qty(item_code, warehouse): and (so_item.delivered_by_supplier is null or so_item.delivered_by_supplier = 0) and exists(select * from `tabSales Order` so where so.name = so_item.parent and so.docstatus = 1 - and so.status not in ('Stopped','Closed'))) + and so.status not in ('Closed'))) ) tab where so_item_qty >= so_item_delivered_qty @@ -125,7 +125,7 @@ def get_ordered_qty(item_code, warehouse): from `tabPurchase Order Item` po_item, `tabPurchase Order` po where po_item.item_code=%s and po_item.warehouse=%s and po_item.qty > po_item.received_qty and po_item.parent=po.name - and po.status not in ('Stopped', 'Closed', 'Delivered') and po.docstatus=1 + and po.status not in ('Closed', 'Delivered') and po.docstatus=1 and po_item.delivered_by_supplier = 0""", (item_code, warehouse)) return flt(ordered_qty[0][0]) if ordered_qty else 0 From e32f9c3a24abbad79ac81fd89ccb2c7bfb60e36b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 22 Feb 2016 16:50:13 +0530 Subject: [PATCH 08/49] Update reorder_item.py --- erpnext/stock/reorder_item.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index ff341c3daf..c637a12781 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -48,8 +48,7 @@ def _reorder_item(): # projected_qty will be 0 if Bin does not exist projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse)) - if ((reorder_level and projected_qty <= reorder_level) - or (not reorder_level and reorder_qty and projected_qty < 0)): + if (reorder_level or reorder_qty) and projected_qty < reorder_level: deficiency = reorder_level - projected_qty if deficiency > reorder_qty: reorder_qty = deficiency From b17d4035c1382861e69e0a31152b3016e45b818d Mon Sep 17 00:00:00 2001 From: sbkolate Date: Mon, 22 Feb 2016 17:16:34 +0530 Subject: [PATCH 09/49] better validation example for developer throw "past date selected" will freeze the form and user can not correct value of from_date. but validated false will just throw the pop-up and user can correct value of from_date and save the form. Example changed from Event to Task because same is available in Custom Script Help for desk user --- .../custom-scripts/custom-script-examples/date-validation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md index 0d080af7c0..d68ab565f6 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md @@ -1,10 +1,10 @@ # Date Validation - frappe.ui.form.on("Event", "validate", function(frm) { + frappe.ui.form.on("Task", "validate", function(frm) { if (frm.doc.from_date < get_today()) { msgprint(__("You can not select past date in From Date")); - throw "past date selected" + validated = false; } }); From 8a59c33e2f93d6f8e824492bbd6d3ae335cc658c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 23 Feb 2016 15:23:24 +0530 Subject: [PATCH 10/49] [fix] Sales Person target variance report: based on lft and rgt of item group --- ..._person_target_variance_item_group_wise.py | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py index d27816cf71..c7baf0cc91 100644 --- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py @@ -87,14 +87,12 @@ def get_target_distribution_details(filters): return target_details #Get achieved details from sales order -def get_achieved_details(filters, sales_person, item_groups): +def get_achieved_details(filters, sales_person, all_sales_persons, target_item_group, item_groups): start_date, end_date = get_fiscal_year(fiscal_year = filters["fiscal_year"])[1:] - lft, rgt = frappe.get_value("Sales Person", sales_person, ["lft", "rgt"]) - item_details = frappe.db.sql(""" select - soi.item_code, sum(soi.qty * (st.allocated_percentage/100)) as qty, + sum(soi.qty * (st.allocated_percentage/100)) as qty, sum(soi.base_net_amount * (st.allocated_percentage/100)) as amount, st.sales_person, MONTHNAME(so.transaction_date) as month_name from @@ -103,35 +101,36 @@ def get_achieved_details(filters, sales_person, item_groups): soi.parent=so.name and so.docstatus=1 and st.parent=so.name and so.transaction_date>=%s and so.transaction_date<=%s and exists(select name from `tabSales Person` where lft >= %s and rgt <= %s and name=st.sales_person) + and exists(select name from `tabItem Group` where lft >= %s and rgt <= %s and name=soi.item_group) group by - sales_person, item_code, month_name + sales_person, month_name """, - (start_date, end_date, lft, rgt), as_dict=1) + (start_date, end_date, all_sales_persons[sales_person].lft, all_sales_persons[sales_person].rgt, + item_groups[target_item_group].lft, item_groups[target_item_group].rgt), as_dict=1) - item_actual_details = {} + actual_details = {} for d in item_details: - item_group = item_groups[d.item_code] - item_actual_details.setdefault(item_group, frappe._dict()).setdefault(d.month_name,\ - frappe._dict({ - "quantity" : 0, - "amount" : 0 - })) + actual_details.setdefault(d.month_name, frappe._dict({ + "quantity" : 0, + "amount" : 0 + })) - value_dict = item_actual_details[item_group][d.month_name] + value_dict = actual_details[d.month_name] value_dict.quantity += flt(d.qty) value_dict.amount += flt(d.amount) - return item_actual_details + return actual_details def get_salesperson_item_month_map(filters): import datetime salesperson_details = get_salesperson_details(filters) tdd = get_target_distribution_details(filters) item_groups = get_item_groups() + sales_persons = get_sales_persons() sales_person_achievement_dict = {} for sd in salesperson_details: - achieved_details = get_achieved_details(filters, sd.name, item_groups) + achieved_details = get_achieved_details(filters, sd.name, sales_persons, sd.item_group, item_groups) for month_id in range(1, 13): month = datetime.date(2013, month_id, 1).strftime('%B') @@ -149,10 +148,26 @@ def get_salesperson_item_month_map(filters): else: sales_target_achieved.target = flt(sd.target_amount) * month_percentage / 100 - sales_target_achieved.achieved = achieved_details.get(sd.item_group, frappe._dict()).\ - get(month, frappe._dict()).get(filters["target_on"].lower()) + sales_target_achieved.achieved = achieved_details.get(month, frappe._dict())\ + .get(filters["target_on"].lower()) return sales_person_achievement_dict def get_item_groups(): - return dict(frappe.get_all("Item", fields=["name", "item_group"], as_list=True)) + item_groups = frappe._dict() + for d in frappe.get_all("Item Group", fields=["name", "lft", "rgt"]): + item_groups.setdefault(d.name, frappe._dict({ + "lft": d.lft, + "rgt": d.rgt + })) + return item_groups + +def get_sales_persons(): + sales_persons = frappe._dict() + for d in frappe.get_all("Sales Person", fields=["name", "lft", "rgt"]): + sales_persons.setdefault(d.name, frappe._dict({ + "lft": d.lft, + "rgt": d.rgt + })) + return sales_persons + \ No newline at end of file From dcb72c6be7cb949053c3a2b1363134df818ab07b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 17 Feb 2016 15:05:05 +0530 Subject: [PATCH 11/49] [enhance] Displaying stock balance while creating quotation --- .../selling/doctype/quotation/quotation.js | 8 ++ .../selling/doctype/quotation/quotation.py | 3 +- .../quotation_item/quotation_item.json | 124 +++++++++++++++++- erpnext/stock/get_item_details.py | 8 ++ 4 files changed, 141 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index 83cec04635..2cc7c63c9c 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -47,6 +47,7 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({ } this.toggle_reqd_lead_customer(); + }, quotation_to: function() { @@ -162,3 +163,10 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) { frappe.ui.form.on("Quotation Item", "items_on_form_rendered", function(frm, cdt, cdn) { // enable tax_amount field if Actual }) + +frappe.ui.form.on("Quotation Item", "stock_balance", function(frm, cdt, cdn) { + console.log("here") + var d = locals[cdt][cdn]; + frappe.route_options = {"item_code": d.item_code}; + frappe.set_route("query-report", "Stock Balance"); +}) \ No newline at end of file diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 3c8add44f7..37ac412ad0 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -106,7 +106,8 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False): "Quotation Item": { "doctype": "Sales Order Item", "field_map": { - "parent": "prevdoc_docname" + "parent": "prevdoc_docname", + "warehouse": "warehouse" } }, "Sales Taxes and Charges": { diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index 0146f38133..cf5f2dc2ac 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -693,6 +693,128 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.actual_qty", + "fieldname": "item_balance", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Item Balance", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "warehouse", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Warehouse", + "length": 0, + "no_copy": 1, + "options": "Warehouse", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "column_break_30", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "description": "", + "fieldname": "actual_qty", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Actual Qty", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "stock_balance", + "fieldtype": "Button", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Stock Balance", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -910,7 +1032,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-08 08:02:06.257910", + "modified": "2016-02-17 14:48:49.320786", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 22dbe5195f..6da2838a3d 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -165,6 +165,7 @@ def get_basic_details(args, item): "discount_percentage": 0.0, "supplier": item.default_supplier, "delivered_by_supplier": item.delivered_by_supplier, + "actual_qty": get_item_balance_qty_for_default_warehouse(item) }) # if default specified in item is for another company, fetch from company @@ -463,3 +464,10 @@ def get_default_bom(item_code=None): return bom else: frappe.throw(_("No default BOM exists for Item {0}").format(item_code)) + + +def get_item_balance_qty_for_default_warehouse(item): + item = frappe.get_doc("Item", item.name) + + return frappe.db.get_value("Bin", {"item_code": item.name, "warehouse": item.default_warehouse}, + ["actual_qty"], as_dict=True) or {"actual_qty": 0} From 3724448cd346ad81004afc2da30398a50ccd6476 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 18 Feb 2016 17:38:56 +0530 Subject: [PATCH 12/49] [fixes] typo-fixes and fix in balance qty fetching --- erpnext/selling/doctype/quotation/quotation.js | 3 +-- erpnext/stock/get_item_details.py | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index 2cc7c63c9c..3e90b97dd3 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -165,8 +165,7 @@ frappe.ui.form.on("Quotation Item", "items_on_form_rendered", function(frm, cdt, }) frappe.ui.form.on("Quotation Item", "stock_balance", function(frm, cdt, cdn) { - console.log("here") - var d = locals[cdt][cdn]; + var d = frappe.model.get_doc(cdt, cdn); frappe.route_options = {"item_code": d.item_code}; frappe.set_route("query-report", "Stock Balance"); }) \ No newline at end of file diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 6da2838a3d..8d7f23ea11 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -165,7 +165,7 @@ def get_basic_details(args, item): "discount_percentage": 0.0, "supplier": item.default_supplier, "delivered_by_supplier": item.delivered_by_supplier, - "actual_qty": get_item_balance_qty_for_default_warehouse(item) + "actual_qty": get_available_qty(item.name, user_default_warehouse or args.warehouse or item.default_warehouse) }) # if default specified in item is for another company, fetch from company @@ -464,10 +464,3 @@ def get_default_bom(item_code=None): return bom else: frappe.throw(_("No default BOM exists for Item {0}").format(item_code)) - - -def get_item_balance_qty_for_default_warehouse(item): - item = frappe.get_doc("Item", item.name) - - return frappe.db.get_value("Bin", {"item_code": item.name, "warehouse": item.default_warehouse}, - ["actual_qty"], as_dict=True) or {"actual_qty": 0} From ac3372465645e738d81762f5891d732efa763858 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 23 Feb 2016 18:16:06 +0530 Subject: [PATCH 13/49] [fixes] removed no copy for warehouse field --- erpnext/selling/doctype/quotation/quotation.py | 3 +-- erpnext/selling/doctype/quotation_item/quotation_item.json | 4 ++-- erpnext/stock/get_item_details.py | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 37ac412ad0..3c8add44f7 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -106,8 +106,7 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False): "Quotation Item": { "doctype": "Sales Order Item", "field_map": { - "parent": "prevdoc_docname", - "warehouse": "warehouse" + "parent": "prevdoc_docname" } }, "Sales Taxes and Charges": { diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index cf5f2dc2ac..b1bb6f752e 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -730,7 +730,7 @@ "in_list_view": 0, "label": "Warehouse", "length": 0, - "no_copy": 1, + "no_copy": 0, "options": "Warehouse", "permlevel": 0, "precision": "", @@ -1032,7 +1032,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-17 14:48:49.320786", + "modified": "2016-02-23 18:12:49.939175", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 8d7f23ea11..686048612d 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -164,8 +164,7 @@ def get_basic_details(args, item): "net_amount": 0.0, "discount_percentage": 0.0, "supplier": item.default_supplier, - "delivered_by_supplier": item.delivered_by_supplier, - "actual_qty": get_available_qty(item.name, user_default_warehouse or args.warehouse or item.default_warehouse) + "delivered_by_supplier": item.delivered_by_supplier }) # if default specified in item is for another company, fetch from company From 3353b5ee627d6253680e8a715bf5ff1526daa8ec Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 19 Jan 2016 17:26:49 +0530 Subject: [PATCH 14/49] Added material request type Manufacture --- erpnext/stock/doctype/material_request/material_request.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index 41b667291d..723452255d 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -70,7 +70,7 @@ "label": "Type", "length": 0, "no_copy": 0, - "options": "Purchase\nMaterial Transfer\nMaterial Issue", + "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -554,7 +554,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2015-12-01 00:49:28.148834", + "modified": "2016-01-19 06:56:12.592797", "modified_by": "Administrator", "module": "Stock", "name": "Material Request", From 966e5643c9d94e709fa3d139567fab17b9268cda Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 21 Jan 2016 16:00:46 +0530 Subject: [PATCH 15/49] Added Material Request Link to Production Order --- .../production_order/production_order.json | 77 +++++++++++++++++-- 1 file changed, 70 insertions(+), 7 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json index ee39e04931..997a6179e0 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.json +++ b/erpnext/manufacturing/doctype/production_order/production_order.json @@ -24,6 +24,7 @@ "options": "icon-gift", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -48,6 +49,7 @@ "options": "PRO-", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -75,6 +77,7 @@ "options": "\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -100,6 +103,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -127,6 +131,7 @@ "options": "BOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -151,6 +156,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -173,6 +179,7 @@ "oldfieldtype": "Column Break", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -199,6 +206,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -225,6 +233,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -252,6 +261,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -275,6 +285,7 @@ "options": "icon-building", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -298,6 +309,7 @@ "options": "Warehouse", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -319,6 +331,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -344,6 +357,7 @@ "options": "Warehouse", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -368,6 +382,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -391,6 +406,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -415,6 +431,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -438,6 +455,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -460,6 +478,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -483,6 +502,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -506,6 +526,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -531,6 +552,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -556,6 +578,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -581,6 +604,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -605,6 +629,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -629,6 +654,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -653,6 +679,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -675,6 +702,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -699,6 +727,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -722,6 +751,7 @@ "options": "icon-file-text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -744,6 +774,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -770,6 +801,7 @@ "options": "UOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -777,6 +809,32 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Company", + "length": 0, + "no_copy": 0, + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -791,6 +849,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -817,6 +876,7 @@ "options": "Project", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -841,6 +901,7 @@ "options": "Sales Order", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -852,23 +913,24 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "company", + "description": "Manufacture against Material Request", + "fieldname": "material_request", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Company", + "label": "Material Request", "length": 0, "no_copy": 0, - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", + "options": "Material Request", "permlevel": 0, + "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -891,6 +953,7 @@ "options": "Production Order", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -909,7 +972,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-11-16 06:29:52.334735", + "modified": "2016-01-21 04:30:33.561347", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order", From cc23bc054978a7b0ba137fa1edc04654e636f065 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 21 Jan 2016 16:01:17 +0530 Subject: [PATCH 16/49] Removed Material Request type validation --- erpnext/stock/doctype/material_request/material_request.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 6f6f78e2a0..bd1f4d9c27 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -70,9 +70,7 @@ class MaterialRequest(BuyingController): from erpnext.controllers.status_updater import validate_status validate_status(self.status, ["Draft", "Submitted", "Stopped", "Cancelled"]) - - self.validate_value("material_request_type", "in", ["Purchase", "Material Transfer", "Material Issue"]) - + pc_obj = frappe.get_doc('Purchase Common') pc_obj.validate_for_items(self) From 9739dc3639545c2816e8a6785111883e40780b85 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 27 Jan 2016 12:19:51 +0530 Subject: [PATCH 17/49] Added make Production Order button against Material Request --- .../production_order/production_order.js | 18 +++--- .../material_request/material_request.js | 64 ++++++++++++++++++- .../material_request/material_request.py | 20 ++++++ 3 files changed, 93 insertions(+), 9 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js index ad8b7760c3..399d576a6b 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.js +++ b/erpnext/manufacturing/doctype/production_order/production_order.js @@ -139,16 +139,18 @@ erpnext.production_order = { }, set_default_warehouse: function(frm) { - frappe.call({ - method: "erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse", + if (!(frm.doc.wip_warehouse || frm.doc.fg_warehouse)) { + frappe.call({ + method: "erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse", - callback: function(r) { - if(!r.exe) { - frm.set_value("wip_warehouse", r.message.wip_warehouse); - frm.set_value("fg_warehouse", r.message.fg_warehouse) + callback: function(r) { + if(!r.exe) { + frm.set_value("wip_warehouse", r.message.wip_warehouse); + frm.set_value("fg_warehouse", r.message.fg_warehouse) + } } - } - }); + }); + } } } diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 922eb5a435..29968d8d68 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -52,7 +52,11 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten if(doc.material_request_type === "Purchase") cur_frm.add_custom_button(__("Supplier Quotation"), this.make_supplier_quotation, __("Make")); - + + if(doc.material_request_type === "Manufacture" && doc.status === "Submitted") + cur_frm.add_custom_button(__("Production Order"), + this.make_production_order, __("Make")); + cur_frm.page.set_inner_btn_group_as_primary(__("Make")); // stop @@ -165,6 +169,64 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten method: "erpnext.stock.doctype.material_request.material_request.make_stock_entry", frm: cur_frm }); + }, + + + make_production_order: function() { + var items = [] + $.each(cur_frm.doc["items"] || [], function(i, d) { + items.push(d.item_code); + }); + var d = new frappe.ui.Dialog({ + title: __("Production Order"), + fields: [ + { + "fieldtype": "Link", + "label": __("Production Item"), + "fieldname": "item", + "options": "Item", + "reqd": 1, + "get_query": function() { + return { + "filters": [ + ['item_code', 'in', items], + ] + } + } + } + ] + + }); + + d.set_primary_action(__("Make"), function() { + frappe.call({ + method:"erpnext.stock.doctype.material_request.material_request.validate_production_item", + args: { + "item_code": d.get_values().item + }, + callback: function(r) { + if(!r.message) { + msgprint("Cannot create Production Order for selected Item.") + } + else { + frappe.call({ + method:"erpnext.stock.doctype.material_request.material_request.make_production_order", + args: { + "source_name": cur_frm.doc.name, + "item_code": d.get_values().item, + }, + callback: function(r) { + if(!r.exe) { + var doclist = frappe.model.sync(r.message); + frappe.set_route("Form", doclist[0].doctype, doclist[0].name); + } + } + }); + } + } + }); + }); + d.show(); } }); diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index bd1f4d9c27..2fcf91d9a2 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -327,3 +327,23 @@ def make_stock_entry(source_name, target_doc=None): }, target_doc, set_missing_values) return doclist + + +@frappe.whitelist() +def validate_production_item(item_code): + return frappe.db.get_value("Item", item_code, "is_pro_applicable") + +@frappe.whitelist() +def make_production_order(source_name, item_code): + material_request= frappe.get_doc("Material Request", source_name) + prod_order = frappe.new_doc("Production Order") + prod_order.production_item = item_code + prod_order.qty = 0 + for d in material_request.items: + if d.item_code == item_code: + prod_order.qty = d.qty - d.ordered_qty + prod_order.fg_warehouse = d.warehouse + prod_order.expected_delivery_date = d.schedule_date + prod_order.sales_order = d.sales_order_no + prod_order.material_request = material_request.name + return prod_order From e9cd22aff9965a690ae4bd2863885aba1ac40250 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 28 Jan 2016 15:56:59 +0530 Subject: [PATCH 18/49] Fixed make Prod_order from Material Request --- erpnext/stock/doctype/material_request/material_request.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 2fcf91d9a2..c6c6fe5a6a 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -12,6 +12,7 @@ from frappe import _ from frappe.model.mapper import get_mapped_doc from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty from erpnext.controllers.buying_controller import BuyingController +from erpnext.manufacturing.doctype.production_order.production_order import get_item_details form_grid_templates = { @@ -343,7 +344,10 @@ def make_production_order(source_name, item_code): if d.item_code == item_code: prod_order.qty = d.qty - d.ordered_qty prod_order.fg_warehouse = d.warehouse + prod_order.description = d.description + prod_order.stock_uom = d.uom prod_order.expected_delivery_date = d.schedule_date prod_order.sales_order = d.sales_order_no + prod_order.bom_no = get_item_details(item_code).bom_no prod_order.material_request = material_request.name return prod_order From 695bf47a1d0a518e0b7f15167eee0b1696e5c4a2 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 29 Jan 2016 16:40:15 +0530 Subject: [PATCH 19/49] changed image feild (type attach) to attach image, removed Image view --- .../material_request_item.json | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index 3e26065637..74792697db 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -26,6 +26,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -49,6 +50,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -73,6 +75,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -98,6 +101,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -122,6 +126,7 @@ "oldfieldtype": "Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "250px", "read_only": 0, "report_hide": 0, @@ -146,6 +151,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -158,8 +164,8 @@ "bold": 0, "collapsible": 0, "fieldname": "image", - "fieldtype": "Attach", - "hidden": 1, + "fieldtype": "Attach Image", + "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, @@ -169,31 +175,8 @@ "permlevel": 0, "precision": "", "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "image_view", - "fieldtype": "Image", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Image View", - "length": 0, - "no_copy": 0, - "options": "image", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "read_only": 0, + "print_hide_if_no_value": 0, + "read_only": 1, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -215,6 +198,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -239,6 +223,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "80px", "read_only": 0, "report_hide": 0, @@ -266,6 +251,7 @@ "options": "UOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "70px", "read_only": 1, "report_hide": 0, @@ -293,6 +279,7 @@ "options": "Warehouse", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -316,6 +303,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -340,6 +328,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -364,6 +353,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -390,6 +380,7 @@ "options": "Item Group", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -415,6 +406,7 @@ "options": "Brand", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 1, "report_hide": 0, @@ -441,6 +433,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -464,6 +457,7 @@ "options": "Sales Order", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -485,6 +479,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -509,6 +504,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "70px", "read_only": 1, "report_hide": 0, @@ -535,6 +531,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "70px", "read_only": 1, "report_hide": 0, @@ -561,6 +558,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -585,6 +583,7 @@ "oldfieldtype": "Check", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -602,12 +601,13 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:50.238167", + "modified": "2016-01-29 06:03:41.424851", "modified_by": "Administrator", "module": "Stock", "name": "Material Request Item", "owner": "Administrator", "permissions": [], "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "sort_order": "DESC" } \ No newline at end of file From 0b40ccc43c772cb139f30fa8d13723e0d8115672 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 3 Feb 2016 18:32:44 +0530 Subject: [PATCH 20/49] Removed unwanted code --- .../doctype/delivery_note/delivery_note.js | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 0b6f47e09f..3365fa2a95 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -193,48 +193,6 @@ cur_frm.cscript.print_without_amount = function(doc, cdt, cdn) { erpnext.stock.delivery_note.set_print_hide(doc, cdt, cdn); } - -//****************** For print sales order no and date************************* -cur_frm.pformat.sales_order_no= function(doc, cdt, cdn){ - //function to make row of table - - var make_row = function(title,val1, val2, bold){ - var bstart = ''; var bend = ''; - - return ''+(bold?bstart:'')+title+(bold?bend:'')+'' - +''+val1+(val2?' ('+dateutil.str_to_user(val2)+')':'')+'' - +'' - } - - out =''; - - var cl = doc.items || []; - - // outer table - var out='
- + - - - - - - - - - + @@ -158,7 +144,7 @@ - + @@ -170,7 +156,7 @@ - + @@ -191,7 +177,7 @@ - + @@ -212,7 +198,7 @@ - + @@ -224,7 +210,7 @@ - + @@ -236,7 +222,7 @@ - + @@ -248,7 +234,7 @@ - + @@ -269,7 +255,7 @@ - + @@ -290,7 +276,7 @@ - + @@ -302,7 +288,7 @@ - + @@ -323,7 +309,7 @@ - + @@ -335,7 +321,7 @@ - + @@ -347,7 +333,7 @@ - + @@ -359,7 +345,7 @@ - + @@ -371,7 +357,7 @@ - + diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 80ec589d46..c1a5281100 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -355,6 +355,7 @@ def raise_production_orders(source_name): prod_order.material_request = material_request.name prod_order.material_request_item = d.name prod_order.planned_start_date = material_request.transaction_date + prod_order.company = material_request.company prod_order.save() production_orders.append(prod_order.name) else: @@ -364,4 +365,5 @@ def raise_production_orders(source_name): (p, p) for p in production_orders] msgprint(_("Production Orders {0} created").format(comma_and(message))) if errors: - msgprint(_("Could not Raise Production Orders for {0}").format(comma_and(errors))) \ No newline at end of file + msgprint(_("Could not Raise Production Orders for {0}").format(comma_and(errors))) + return production_orders \ No newline at end of file diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py index 37d985edb0..c675224ceb 100644 --- a/erpnext/stock/doctype/material_request/test_material_request.py +++ b/erpnext/stock/doctype/material_request/test_material_request.py @@ -7,6 +7,7 @@ from __future__ import unicode_literals import frappe, unittest from frappe.utils import flt +from erpnext.stock.doctype.material_request.material_request import raise_production_orders class TestMaterialRequest(unittest.TestCase): def setUp(self): @@ -436,6 +437,25 @@ class TestMaterialRequest(unittest.TestCase): #testing bin requested qty after issuing stock against material request self.assertEquals(_get_requested_qty(), existing_requested_qty) + + def test_completed_qty_for__manufacture(self): + mr = frappe.copy_doc(test_records[1]).insert() + mr = frappe.get_doc("Material Request", mr.name) + mr.submit() + completed_qty = mr.items[0].ordered_qty + + prod_order = raise_production_orders(mr.name) + po = frappe.get_doc("Production Order", prod_order[0]) + po.wip_warehouse = "_Test Warehouse 1 - _TC" + po.submit() + + mr = frappe.get_doc("Material Request", mr.name) + self.assertEquals(completed_qty + po.qty, mr.items[0].ordered_qty) + + po.cancel() + mr = frappe.get_doc("Material Request", mr.name) + self.assertEquals(completed_qty, mr.items[0].ordered_qty) + test_dependencies = ["Currency Exchange"] test_records = frappe.get_test_records('Material Request') diff --git a/erpnext/stock/doctype/material_request/test_records.json b/erpnext/stock/doctype/material_request/test_records.json index 152d1443a3..09d1912ed7 100644 --- a/erpnext/stock/doctype/material_request/test_records.json +++ b/erpnext/stock/doctype/material_request/test_records.json @@ -30,5 +30,26 @@ "material_request_type": "Purchase", "naming_series": "_T-Material Request-", "transaction_date": "2013-02-18" + }, + { + "company": "_Test Company", + "doctype": "Material Request", + "fiscal_year": "_Test Fiscal Year 2013", + "items": [ + { + "description": "_Test FG Item", + "doctype": "Material Request Item", + "item_code": "_Test FG Item", + "item_name": "_Test FG Item", + "parentfield": "items", + "qty": 5, + "schedule_date": "2013-02-18", + "uom": "_Test UOM 1", + "warehouse": "_Test Warehouse - _TC" + } + ], + "material_request_type": "Manufacture", + "naming_series": "_T-Material Request-", + "transaction_date": "2013-02-18" } ] \ No newline at end of file From 0dd850039385978af51176db9fa9a8b5e00c0c49 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 16 Feb 2016 18:08:25 +0530 Subject: [PATCH 27/49] Fixed Documentation --- erpnext/docs/assets/img/manufacturing/ppt.png | Bin 99277 -> 75749 bytes .../tools/production-planning-tool.md | 30 +++++++++------ .../user/manual/en/stock/material-request.md | 1 + .../production_order/production_order.py | 3 +- .../production_planning_tool.json | 22 ++++++----- .../production_planning_tool.py | 36 +++++++++--------- 6 files changed, 51 insertions(+), 41 deletions(-) diff --git a/erpnext/docs/assets/img/manufacturing/ppt.png b/erpnext/docs/assets/img/manufacturing/ppt.png index f5018b75499fd0f8b2c0ae2dfb3ee8c8ab6444ac..30096fff83617eaef4ef81f16ad74820fd0fbf2d 100644 GIT binary patch literal 75749 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 H2H*Y~9MI9Hck^06L+CkdVBDkPyDSqn)XR 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 rQ7~gVxC6ULm`&zLw8b^;61kB+zK? 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

K-UyWjD7s;@miz2 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 +#### Step 1: Specify source to get Production Items + +* You can select Sales Order or Material Request according to where you want to source the items from +* If you plan to add items manually, keep the "Get items from" field empty -#### Step 1: Select and get Sales Order -* Select sales orders for MRP using filters (Time, Item, and Customer) -* Click on Get Sales Order to generate a list. +#### Step 2: Select and get Sales Order / Material Request + +* Use filters to get the Sales Order / Material Request +* Click on Get Sales Order / Get Material Requests to generate a list. Production Planing Tool -#### Step 2: Get Item from Sales Orders. +#### Step 3: Get Items -You can add/remove or change quantity of these Items. +* Get the items for the Sales Order / Material request list +* You can add/remove or change quantity of these Items. Production Planing Tool -#### Step 3: Create Production Orders +#### Step 4: Create Production Orders Production Planing Tool -#### Step 4: Create Material Request +#### Step 5: Create Material Request Create Material Request for Items with projected shortfall. @@ -46,11 +52,11 @@ Create Material Request for Items with projected shortfall. The Production Planning Tool is used in two stages: - * Selection of Open Sales Orders for the period based on “Expected Delivery Date”. - * Selection of Items from those Sales Orders. + * Selection of open Sales Orders / pending Material Request for the period based on “Expected Delivery Date”. + * Selection of Items from those Sales Orders / Material Requests -The tool will update if you have already created Production Orders for a -particular Item against its Sales Order (“Planned Quantity”). +The tool will update if you have already created Production Orde rs for a +particular Item against its Sales Order (“Planned Quantity”) or Material Request. You can always edit the Item list and increase / reduce quantities to plan your production. diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md index a609756d3e..8afda60173 100644 --- a/erpnext/docs/user/manual/en/stock/material-request.md +++ b/erpnext/docs/user/manual/en/stock/material-request.md @@ -23,6 +23,7 @@ A Material Request can be of type: * Purchase - If the request material is to be purchased. * Material Transfer - If the requested material is to be shifted from one warehouse to another. * Material Issue - If the requested material is to be Issued. +* Manufacture - If the requested material is to be Produced. > Info: Material Request is not mandatory. It is ideal if you have centralized buying so that you can collect this information from various departments. diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py index ead8105a92..b1678f15b7 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.py +++ b/erpnext/manufacturing/doctype/production_order/production_order.py @@ -314,7 +314,8 @@ class ProductionOrder(Document): def set_actual_dates(self): if self.get("operations"): - actual_date = frappe.db.sql("""select min(actual_start_time) as start_date, max(actual_end_time) as end_date from `tabProduction Order Operation` + actual_date = frappe.db.sql("""select min(actual_start_time) as start_date, + max(actual_end_time) as end_date from `tabProduction Order Operation` where parent = %s and docstatus=1""", self.name, as_dict=1)[0] self.actual_start_date = actual_date.start_date self.actual_end_date = actual_date.end_date diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json index 19b5fd9784..699fb2a583 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json @@ -13,16 +13,16 @@ "bold": 0, "collapsible": 0, "default": "Sales Order", - "fieldname": "plan_using", + "fieldname": "get_items_from", "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Plan Using", + "label": "Get Items From", "length": 0, "no_copy": 0, - "options": "Sales Order\nMaterial Request", + "options": "\nSales Order\nMaterial Request", "permlevel": 0, "precision": "", "print_hide": 0, @@ -38,7 +38,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "", + "depends_on": "get_items_from", "description": "", "fieldname": "filters", "fieldtype": "Section Break", @@ -87,7 +87,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval: doc.plan_using == \"Sales Order\"", + "depends_on": "eval: doc.get_items_from == \"Sales Order\"", "fieldname": "customer", "fieldtype": "Link", "hidden": 0, @@ -112,7 +112,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval: doc.plan_using == \"Material Request\"", + "depends_on": "eval: doc.get_items_from == \"Material Request\"", "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -138,7 +138,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval: doc.plan_using == \"Sales Order\"", + "depends_on": "eval: doc.get_items_from == \"Sales Order\"", "fieldname": "company", "fieldtype": "Link", "hidden": 0, @@ -232,7 +232,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval: doc.plan_using == \"Sales Order\"", + "depends_on": "eval: doc.get_items_from == \"Sales Order\"", "fieldname": "section_break1", "fieldtype": "Section Break", "hidden": 0, @@ -305,7 +305,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval: doc.plan_using == \"Material Request\"", + "depends_on": "eval: doc.get_items_from == \"Material Request\"", "fieldname": "section_break_16", "fieldtype": "Section Break", "hidden": 0, @@ -403,6 +403,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "get_items_from", "fieldname": "get_items", "fieldtype": "Button", "hidden": 0, @@ -428,6 +429,7 @@ "bold": 0, "collapsible": 0, "default": "1", + "depends_on": "get_items_from", "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.", "fieldname": "use_multi_level_bom", "fieldtype": "Check", @@ -629,7 +631,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2016-02-11 06:18:45.077263", + "modified": "2016-02-16 06:56:08.244906", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Planning Tool", diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index bec97d1c03..ee5e4e7590 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -115,9 +115,9 @@ class ProductionPlanningTool(Document): mr.material_request_date = cstr(r['transaction_date']) def get_items(self): - if self.plan_using == "Sales Order": + if self.get_items_from == "Sales Order": self.get_so_items() - elif self.plan_using == "Material Request": + elif self.get_items_from == "Material Request": self.get_mr_items() def get_so_items(self): @@ -191,9 +191,9 @@ class ProductionPlanningTool(Document): pi.planned_qty = flt(p['pending_qty']) pi.pending_qty = flt(p['pending_qty']) - if self.plan_using == "Sales Order": + if self.get_items_from == "Sales Order": pi.sales_order = p['parent'] - elif self.plan_using == "Material Request": + elif self.get_items_from == "Material Request": pi.material_request = p['parent'] pi.material_request_item = p['name'] @@ -252,18 +252,18 @@ class ProductionPlanningTool(Document): } """ Club similar BOM and item for processing in case of Sales Orders """ - if self.plan_using == "Sales Order": + if self.get_items_from == "Material Request": + item_details.update({ + "qty": d.planned_qty + }) + item_dict[(d.item_code, d.material_request_item, d.warehouse)] = item_details + + else: item_details.update({ "qty":flt(item_dict.get((d.item_code, d.sales_order, d.warehouse),{}) .get("qty")) + flt(d.planned_qty) }) item_dict[(d.item_code, d.sales_order, d.warehouse)] = item_details - - elif self.plan_using == "Material Request": - item_details.update({ - "qty": d.planned_qty - }) - item_dict[(d.item_code, d.material_request_item, d.warehouse)] = item_details return item_dict @@ -293,11 +293,12 @@ class ProductionPlanningTool(Document): """ bom_dict = {} for d in self.get("items"): - if self.plan_using == "Sales Order": - bom_dict.setdefault(d.bom_no, []).append({d.sales_order: flt(d.planned_qty)}) - elif self.plan_using == "Material Request": - bom_dict.setdefault(d.bom_no, []).append({d.material_request_item: flt(d.planned_qty)}) - + if self.get_items_from == "Material Request": + bom_dict.setdefault(d.bom_no, []).append([d.material_request_item, flt(d.planned_qty)]) + else: + bom_dict.setdefault(d.bom_no, []).append([d.sales_order, flt(d.planned_qty)]) + return bom_dict + def download_raw_materials(self): """ Create csv data for required raw material to produce finished goods""" self.validate_data() @@ -341,7 +342,6 @@ class ProductionPlanningTool(Document): and item.is_stock_item = 1 group by item_code""", bom, as_dict=1): bom_wise_item_details.setdefault(d.item_code, d) - for item, item_details in bom_wise_item_details.items(): for so_qty in so_wise_qty: item_list.append([item, flt(item_details.qty) * so_qty[1], item_details.description, @@ -405,7 +405,7 @@ class ProductionPlanningTool(Document): for item_details in so_item_qty: if requested_qty: sales_order = item_details[4] or "No Sales Order" - if self.plan_using == "Material Request": + if self.get_items_from == "Material Request": sales_order = "No Sales Order" if requested_qty <= item_details[0]: adjusted_qty = requested_qty From f79760ce2d4c953f7bfd626b592924be7899c1bb Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 23 Feb 2016 18:35:20 +0530 Subject: [PATCH 28/49] Mumtiple fixes --- .../production_order/production_order.json | 4 +- .../production_order/production_order.py | 4 +- .../production_plan_material_request.json | 6 +- .../production_plan_sales_order.json | 16 ++--- .../production_planning_tool.js | 62 ++++++++++++++++--- .../production_planning_tool.json | 14 ++--- .../production_planning_tool.py | 16 ++--- .../v6_21/rename_material_request_fields.py | 7 ++- .../doctype/sales_order/sales_order.py | 12 +--- .../material_request/material_request.js | 2 +- .../material_request/material_request.py | 18 +++--- .../material_request/test_material_request.py | 15 ++++- .../maintenance_schedule.py | 6 +- .../maintenance_schedule_item.json | 21 +++++-- 14 files changed, 134 insertions(+), 69 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json index 2ad2a3ba28..4a809cf439 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.json +++ b/erpnext/manufacturing/doctype/production_order/production_order.json @@ -928,7 +928,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 1, + "read_only": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -996,7 +996,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-08 04:36:35.071206", + "modified": "2016-02-23 07:29:38.091748", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order", diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py index b1678f15b7..210597ee98 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.py +++ b/erpnext/manufacturing/doctype/production_order/production_order.py @@ -155,16 +155,16 @@ class ProductionOrder(Document): frappe.db.set(self,'status', 'Submitted') self.make_time_logs() - self.update_planned_qty() self.update_completed_qty_in_material_request() + self.update_planned_qty() def on_cancel(self): self.validate_cancel() frappe.db.set(self,'status', 'Cancelled') self.delete_time_logs() - self.update_planned_qty() self.update_completed_qty_in_material_request() + self.update_planned_qty() def validate_cancel(self): if self.status == "Stopped": diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json index 1a7c89485c..739c97f943 100644 --- a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json +++ b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json @@ -66,7 +66,7 @@ "bold": 0, "collapsible": 0, "fieldname": "material_request_date", - "fieldtype": "Read Only", + "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -76,7 +76,7 @@ "no_copy": 0, "oldfieldname": "document_date", "oldfieldtype": "Date", - "options": "material_request.transaction_date", + "options": "", "permlevel": 0, "precision": "", "print_hide": 0, @@ -100,7 +100,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-02-11 04:21:34.372317", + "modified": "2016-02-23 02:06:15.169120", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Material Request", diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json index 85bf7d6d60..5eaa274610 100644 --- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json +++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json @@ -41,7 +41,7 @@ "bold": 0, "collapsible": 0, "fieldname": "sales_order_date", - "fieldtype": "Read Only", + "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -51,12 +51,12 @@ "no_copy": 0, "oldfieldname": "document_date", "oldfieldtype": "Date", - "options": "sales_order.transaction_date", + "options": "", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, "print_width": "120px", - "read_only": 0, + "read_only": 1, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -92,7 +92,7 @@ "bold": 0, "collapsible": 0, "fieldname": "customer", - "fieldtype": "Read Only", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -100,7 +100,7 @@ "label": "Customer", "length": 0, "no_copy": 0, - "options": "sales_order.customer", + "options": "Customer", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -119,7 +119,7 @@ "collapsible": 0, "default": "", "fieldname": "grand_total", - "fieldtype": "Read Only", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -127,7 +127,7 @@ "label": "Grand Total", "length": 0, "no_copy": 0, - "options": "sales_order.base_grand_total", + "options": "", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -150,7 +150,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-02-11 04:17:42.849873", + "modified": "2016-02-23 02:13:07.340323", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Sales Order", diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js index 3fa1160d7e..6824013d68 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js @@ -3,7 +3,7 @@ frappe.require("assets/erpnext/js/utils.js"); -cur_frm.cscript.onload = function(doc, cdt, cdn) { +cur_frm.cscript.onload = function(doc) { cur_frm.set_value("company", frappe.defaults.get_user_default("Company")) } @@ -11,6 +11,58 @@ cur_frm.cscript.refresh = function(doc) { cur_frm.disable_save(); } +cur_frm.add_fetch("material_request", "transaction_date", "material_request_date"); + +cur_frm.add_fetch("sales_order", "transaction_date", "sales_order_date"); +cur_frm.add_fetch("sales_order", "customer", "customer"); +cur_frm.add_fetch("sales_order", "base_grand_total", "grand_total"); + +frappe.ui.form.on("Production Planning Tool", { + get_sales_orders: function(frm) { + frappe.call({ + doc: frm.doc, + method: "get_open_sales_orders", + callback: function(r) { + refresh_field("sales_orders"); + } + }); + }, + + get_material_request: function(frm) { + frappe.call({ + doc: frm.doc, + method: "get_pending_material_requests", + callback: function(r) { + refresh_field("material_requests"); + } + }); + }, + + get_items: function(frm) { + frappe.call({ + doc: frm.doc, + method: "get_items", + callback: function(r) { + refresh_field("items"); + } + }); + }, + + create_production_order: function(frm) { + frappe.call({ + doc: frm.doc, + method: "raise_production_orders" + }); + }, + + create_material_requests: function(frm) { + frappe.call({ + doc: frm.doc, + method: "raise_material_requests" + }); + } +}); + cur_frm.cscript.item_code = function(doc,cdt,cdn) { var d = locals[cdt][cdn]; if (d.item_code) { @@ -27,13 +79,6 @@ cur_frm.cscript.item_code = function(doc,cdt,cdn) { } } -cur_frm.cscript.raise_purchase_request = function(doc, cdt, cdn) { - return frappe.call({ - method: "raise_purchase_request", - doc:doc - }) -} - cur_frm.cscript.download_materials_required = function(doc, cdt, cdn) { return $c_obj(doc, 'validate_data', '', function(r, rt) { if (!r['exc']) @@ -41,7 +86,6 @@ cur_frm.cscript.download_materials_required = function(doc, cdt, cdn) { }); } - cur_frm.fields_dict['sales_orders'].grid.get_field('sales_order').get_query = function(doc) { var args = { "docstatus": 1 }; if(doc.customer) { diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json index 699fb2a583..9ccd55e9ae 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json @@ -266,7 +266,7 @@ "label": "Get Sales Orders", "length": 0, "no_copy": 0, - "options": "get_open_sales_orders", + "options": "", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -339,7 +339,7 @@ "label": "Get Material Request", "length": 0, "no_copy": 0, - "options": "get_pending_material_requests", + "options": "", "permlevel": 0, "precision": "", "print_hide": 0, @@ -413,7 +413,7 @@ "label": "Get Items", "length": 0, "no_copy": 0, - "options": "get_items", + "options": "", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -503,7 +503,7 @@ "bold": 0, "collapsible": 0, "description": "Separate production order will be created for each finished good item.", - "fieldname": "raise_production_order", + "fieldname": "create_production_order", "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, @@ -512,7 +512,7 @@ "label": "Create Production Orders", "length": 0, "no_copy": 0, - "options": "raise_production_orders", + "options": "", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -576,7 +576,7 @@ "bold": 0, "collapsible": 0, "description": "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty", - "fieldname": "raise_purchase_request", + "fieldname": "create_material_requests", "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, @@ -631,7 +631,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2016-02-16 06:56:08.244906", + "modified": "2016-02-23 02:37:51.260645", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Planning Tool", diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index ee5e4e7590..ea7e660dd5 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -63,7 +63,7 @@ class ProductionPlanningTool(Document): """ Add sales orders in the table""" self.clear_table("sales_orders") - so_list = [d.sales_order for d in self.get('sales_orders')] + so_list = [] for r in open_so: if cstr(r['name']) not in so_list: pp_so = self.append('sales_orders', {}) @@ -107,7 +107,7 @@ class ProductionPlanningTool(Document): """ Add Material Requests in the table""" self.clear_table("material_requests") - mr_list = [d.material_request for d in self.get('material_requests')] + mr_list = [] for r in pending_mr: if cstr(r['name']) not in mr_list: mr = self.append('material_requests', {}) @@ -121,7 +121,7 @@ class ProductionPlanningTool(Document): self.get_mr_items() def get_so_items(self): - so_list = filter(None, [d.sales_order for d in self.get('sales_orders')]) + so_list = [d.sales_order for d in self.get('sales_orders') if d.sales_order] if not so_list: msgprint(_("Please enter Sales Orders in the above table")) return [] @@ -157,14 +157,14 @@ class ProductionPlanningTool(Document): self.add_items(items + packed_items) def get_mr_items(self): - mr_list = filter(None, [d.material_request for d in self.get('material_requests')]) + mr_list = [d.material_request for d in self.get('material_requests') if d.material_request] if not mr_list: msgprint(_("Please enter Material Requests in the above table")) return [] item_condition = "" if self.fg_item: - item_condition = ' and mr_item.item_code = "' + self.fg_item + '"' + item_condition = ' and mr_item.item_code = "' + frappe.db.escape(self.fg_item, percent=False) + '"' items = frappe.db.sql("""select distinct parent, name, item_code, warehouse, (qty - ordered_qty) as pending_qty @@ -371,7 +371,7 @@ class ProductionPlanningTool(Document): return item_list - def raise_purchase_request(self): + def raise_material_requests(self): """ Raise Material Request if projected qty is less than qty required Requested qty should be shortage qty considering minimum order qty @@ -384,7 +384,7 @@ class ProductionPlanningTool(Document): self.get_raw_materials(bom_dict) if self.item_dict: - self.insert_purchase_request() + self.create_material_request() def get_requested_items(self): item_projected_qty = self.get_projected_qty() @@ -433,7 +433,7 @@ class ProductionPlanningTool(Document): return dict(item_projected_qty) - def insert_purchase_request(self): + def create_material_request(self): items_to_be_requested = self.get_requested_items() material_request_list = [] diff --git a/erpnext/patches/v6_21/rename_material_request_fields.py b/erpnext/patches/v6_21/rename_material_request_fields.py index a65b2eb26e..07be27a5d6 100644 --- a/erpnext/patches/v6_21/rename_material_request_fields.py +++ b/erpnext/patches/v6_21/rename_material_request_fields.py @@ -6,6 +6,9 @@ import frappe from frappe.model.utils.rename_field import rename_field def execute(): - frappe.reload_doc('Stock', 'doctype', 'material_request_item') - rename_field("Material Request Item", "sales_order", "sales_order") + frappe.reload_doc('stock', 'doctype', 'material_request_item') + rename_field("Material Request Item", "sales_order_no", "sales_order") + + frappe.reload_doc('support', 'doctype', 'maintenance_schedule_item') + rename_field("Maintenance Schedule Item", "prevdoc_docname", "sales_order") \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index bafdb34ecc..ac5e21edc9 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -193,7 +193,7 @@ class SalesOrder(SellingController): #check maintenance schedule submit_ms = frappe.db.sql_list("""select t1.name from `tabMaintenance Schedule` t1, `tabMaintenance Schedule Item` t2 - where t2.parent=t1.name and t2.prevdoc_docname = %s and t1.docstatus = 1""", self.name) + where t2.parent=t1.name and t2.sales_order = %s and t1.docstatus = 1""", self.name) if submit_ms: frappe.throw(_("Maintenance Schedule {0} must be cancelled before cancelling this Sales Order").format(comma_and(submit_ms))) @@ -464,15 +464,12 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False): def make_maintenance_schedule(source_name, target_doc=None): maint_schedule = frappe.db.sql("""select t1.name from `tabMaintenance Schedule` t1, `tabMaintenance Schedule Item` t2 - where t2.parent=t1.name and t2.prevdoc_docname=%s and t1.docstatus=1""", source_name) + where t2.parent=t1.name and t2.sales_order=%s and t1.docstatus=1""", source_name) if not maint_schedule: doclist = get_mapped_doc("Sales Order", source_name, { "Sales Order": { "doctype": "Maintenance Schedule", - "field_map": { - "name": "sales_order" - }, "validation": { "docstatus": ["=", 1] } @@ -480,7 +477,7 @@ def make_maintenance_schedule(source_name, target_doc=None): "Sales Order Item": { "doctype": "Maintenance Schedule Item", "field_map": { - "parent": "prevdoc_docname" + "parent": "sales_order" }, "add_if_empty": True } @@ -499,9 +496,6 @@ def make_maintenance_visit(source_name, target_doc=None): doclist = get_mapped_doc("Sales Order", source_name, { "Sales Order": { "doctype": "Maintenance Visit", - "field_map": { - "name": "sales_order" - }, "validation": { "docstatus": ["=", 1] } diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 559b954963..3f3eb99784 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -176,7 +176,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten frappe.call({ method:"erpnext.stock.doctype.material_request.material_request.raise_production_orders", args: { - "source_name": cur_frm.doc.name + "material_request": cur_frm.doc.name } }); } diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index c1a5281100..ff280fd835 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -7,7 +7,7 @@ from __future__ import unicode_literals import frappe -from frappe.utils import cstr, flt, getdate, comma_and +from frappe.utils import cstr, flt, getdate, new_line_sep from frappe import msgprint, _ from frappe.model.mapper import get_mapped_doc from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty @@ -336,11 +336,11 @@ def make_stock_entry(source_name, target_doc=None): return doclist @frappe.whitelist() -def raise_production_orders(source_name): - material_request= frappe.get_doc("Material Request", source_name) +def raise_production_orders(material_request): + mr= frappe.get_doc("Material Request", material_request) errors =[] production_orders = [] - for d in material_request.items: + for d in mr.items: if (d.qty - d.ordered_qty) >0 : if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): prod_order = frappe.new_doc("Production Order") @@ -352,10 +352,10 @@ def raise_production_orders(source_name): prod_order.expected_delivery_date = d.schedule_date prod_order.sales_order = d.sales_order prod_order.bom_no = get_item_details(d.item_code).bom_no - prod_order.material_request = material_request.name + prod_order.material_request = mr.name prod_order.material_request_item = d.name - prod_order.planned_start_date = material_request.transaction_date - prod_order.company = material_request.company + prod_order.planned_start_date = mr.transaction_date + prod_order.company = mr.company prod_order.save() production_orders.append(prod_order.name) else: @@ -363,7 +363,7 @@ def raise_production_orders(source_name): if production_orders: message = ["""%s""" % \ (p, p) for p in production_orders] - msgprint(_("Production Orders {0} created").format(comma_and(message))) + msgprint(_("The following Production Orders were created : \n {0} ").format(new_line_sep(message))) if errors: - msgprint(_("Could not Raise Production Orders for {0}").format(comma_and(errors))) + msgprint(_("Productions Orders cannot be raised for : \n {0}").format(new_line_sep(errors))) return production_orders \ No newline at end of file diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py index c675224ceb..ebdfa5a459 100644 --- a/erpnext/stock/doctype/material_request/test_material_request.py +++ b/erpnext/stock/doctype/material_request/test_material_request.py @@ -438,12 +438,14 @@ class TestMaterialRequest(unittest.TestCase): #testing bin requested qty after issuing stock against material request self.assertEquals(_get_requested_qty(), existing_requested_qty) - def test_completed_qty_for__manufacture(self): + def test_material_request_type_manufacture(self): mr = frappe.copy_doc(test_records[1]).insert() mr = frappe.get_doc("Material Request", mr.name) mr.submit() completed_qty = mr.items[0].ordered_qty - + requested_qty = frappe.db.sql("""select indented_qty from `tabBin` where \ + item_code= %s and warehouse= %s """, (mr.items[0].item_code, mr.items[0].warehouse))[0][0] + prod_order = raise_production_orders(mr.name) po = frappe.get_doc("Production Order", prod_order[0]) po.wip_warehouse = "_Test Warehouse 1 - _TC" @@ -451,11 +453,20 @@ class TestMaterialRequest(unittest.TestCase): mr = frappe.get_doc("Material Request", mr.name) self.assertEquals(completed_qty + po.qty, mr.items[0].ordered_qty) + + new_requested_qty = frappe.db.sql("""select indented_qty from `tabBin` where \ + item_code= %s and warehouse= %s """, (mr.items[0].item_code, mr.items[0].warehouse))[0][0] + + self.assertEquals(requested_qty - po.qty, new_requested_qty) po.cancel() mr = frappe.get_doc("Material Request", mr.name) self.assertEquals(completed_qty, mr.items[0].ordered_qty) + new_requested_qty = frappe.db.sql("""select indented_qty from `tabBin` where \ + item_code= %s and warehouse= %s """, (mr.items[0].item_code, mr.items[0].warehouse))[0][0] + self.assertEquals(requested_qty, new_requested_qty) + test_dependencies = ["Currency Exchange"] test_records = frappe.get_test_records('Material Request') diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py index 14cad8e787..d7ba1463d5 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -158,12 +158,12 @@ class MaintenanceSchedule(TransactionBase): def validate_sales_order(self): for d in self.get('items'): - if d.prevdoc_docname: + if d.sales_order: chk = frappe.db.sql("""select ms.name from `tabMaintenance Schedule` ms, `tabMaintenance Schedule Item` msi where msi.parent=ms.name and - msi.prevdoc_docname=%s and ms.docstatus=1""", d.prevdoc_docname) + msi.sales_order=%s and ms.docstatus=1""", d.sales_order) if chk: - throw(_("Maintenance Schedule {0} exists against {0}").format(chk[0][0], d.prevdoc_docname)) + throw(_("Maintenance Schedule {0} exists against {0}").format(chk[0][0], d.sales_order)) def validate(self): self.validate_maintenance_detail() diff --git a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json index f20cccb22c..6879f0675b 100644 --- a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json +++ b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json @@ -26,6 +26,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -50,6 +51,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -74,6 +76,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 1, "report_hide": 0, @@ -98,6 +101,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -122,6 +126,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -146,6 +151,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -171,6 +177,7 @@ "options": "\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -195,6 +202,7 @@ "oldfieldtype": "Int", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -220,6 +228,7 @@ "options": "Sales Person", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -242,6 +251,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -266,6 +276,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -277,19 +288,21 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "prevdoc_docname", - "fieldtype": "Data", + "fieldname": "sales_order", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 0, - "label": "Against Docname", + "label": "Sales Order", "length": 0, "no_copy": 1, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Data", + "options": "Sales Order", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 1, "report_hide": 0, @@ -309,7 +322,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:49.903875", + "modified": "2016-02-23 04:59:32.924534", "modified_by": "Administrator", "module": "Support", "name": "Maintenance Schedule Item", From a812d67837ea97309ad3cd76c997fa2e56410f3e Mon Sep 17 00:00:00 2001 From: patilsangram Date: Tue, 23 Feb 2016 19:04:29 +0530 Subject: [PATCH 29/49] [fixes] --- .../ordered_items_to_be_billed.json | 4 ++-- .../purchase_order_items_to_be_billed.json | 4 ++-- erpnext/buying/doctype/purchase_order/purchase_order.js | 2 +- erpnext/selling/doctype/sales_order/sales_order_list.js | 2 +- erpnext/stock/stock_balance.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json index f50d334d63..a0be2571f2 100644 --- a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json +++ b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json @@ -7,12 +7,12 @@ "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2015-11-04 11:56:32.699103", + "modified": "2016-02-23 18:48:42.372321", "modified_by": "Administrator", "module": "Accounts", "name": "Ordered Items To Be Billed", "owner": "Administrator", - "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`.base_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`.base_amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\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 not in (\"Closed\")\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.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`.base_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`.base_amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\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 != \"Closed\"\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.amount,0)\norder by `tabSales Order`.transaction_date asc", "ref_doctype": "Sales Invoice", "report_name": "Ordered Items To Be Billed", "report_type": "Query Report" diff --git a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json index 991e5994f3..5f67309db4 100644 --- a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json +++ b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json @@ -7,12 +7,12 @@ "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2015-11-04 11:56:14.321664", + "modified": "2016-02-23 18:51:21.968327", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Order Items To Be Billed", "owner": "Administrator", - "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status not in (\"Closed\")\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 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\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Closed\"\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 0)\norder by `tabPurchase Order`.transaction_date asc", "ref_doctype": "Purchase Invoice", "report_name": "Purchase Order Items To Be Billed", "report_type": "Query Report" diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 2c1d709043..40a1c8bd9e 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -64,7 +64,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( } } - if(doc.docstatus == 1 && !in_list(["Closed"], doc.status)) { + if(doc.docstatus == 1 && doc.status != "Closed") { if(flt(doc.per_received, 2) < 100 && allow_receipt) { cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt, __("Make")); diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index 3b60af4672..53b2818274 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -46,7 +46,7 @@ frappe.listview_settings['Sales Order'] = { }); listview.page.add_menu_item(__("Re-open"), function() { - listview.call_for_selected_items(method, {"status": "Unclose"}); + listview.call_for_selected_items(method, {"status": "Submitted"}); }); } diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index 24c23d4d3c..708552c2ff 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -92,7 +92,7 @@ def get_reserved_qty(item_code, warehouse): and parenttype="Sales Order" and item_code != parent_item and exists (select * from `tabSales Order` so - where name = dnpi_in.parent and docstatus = 1 and status not in ('Closed')) + where name = dnpi_in.parent and docstatus = 1 and status != 'Closed') ) dnpi) union (select qty as dnpi_qty, qty as so_item_qty, @@ -102,7 +102,7 @@ def get_reserved_qty(item_code, warehouse): and (so_item.delivered_by_supplier is null or so_item.delivered_by_supplier = 0) and exists(select * from `tabSales Order` so where so.name = so_item.parent and so.docstatus = 1 - and so.status not in ('Closed'))) + and so.status != 'Closed')) ) tab where so_item_qty >= so_item_delivered_qty From 4b6b6fe5a8b4df5be2765e25d43908e2105eb70a Mon Sep 17 00:00:00 2001 From: creador Date: Tue, 23 Feb 2016 22:12:02 +0200 Subject: [PATCH 30/49] [fix] unify packing description and packed item description --- .../doctype/packed_item/packed_item.json | 26 ------------------- .../stock/doctype/packed_item/packed_item.py | 6 ++--- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json index 24cd09b054..b09765df43 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.json +++ b/erpnext/stock/doctype/packed_item/packed_item.json @@ -523,32 +523,6 @@ "search_index": 0, "set_only_once": 0, "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "packing_description", - "fieldtype": "Text Editor", - "hidden": 1, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Packing Description", - "length": 0, - "no_copy": 0, - "oldfieldname": "packing_description", - "oldfieldtype": "Text", - "permlevel": 0, - "print_hide": 0, - "print_width": "300px", - "read_only": 1, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "300px" } ], "hide_heading": 0, diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py index af2d554b36..2078eebded 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.py +++ b/erpnext/stock/doctype/packed_item/packed_item.py @@ -27,14 +27,14 @@ def get_bin_qty(item, warehouse): where item_code = %s and warehouse = %s""", (item, warehouse), as_dict = 1) return det and det[0] or frappe._dict() -def update_packing_list_item(doc, packing_item_code, qty, main_item_row, packing_description): +def update_packing_list_item(doc, packing_item_code, qty, main_item_row, description): bin = get_bin_qty(packing_item_code, main_item_row.warehouse) item = get_packing_item_details(packing_item_code) # check if exists exists = 0 for d in doc.get("packed_items"): - if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and d.parent_detail_docname == main_item_row.name and d.packing_description == packing_description: + if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and d.parent_detail_docname == main_item_row.name and d.description == description: pi, exists = d, 1 break @@ -50,7 +50,7 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row, packing pi.qty = flt(qty) pi.actual_qty = flt(bin.get("actual_qty")) pi.projected_qty = flt(bin.get("projected_qty")) - pi.packing_description = packing_description + pi.description = description if not pi.warehouse: pi.warehouse = main_item_row.warehouse if not pi.batch_no: From eeda0460d495a836e204bc01bd58cb1696d13c0d Mon Sep 17 00:00:00 2001 From: Agus Syahputra Date: Wed, 24 Feb 2016 07:26:06 +0700 Subject: [PATCH 31/49] Update multi-currency-accounting.md --- .../docs/user/manual/en/accounts/multi-currency-accounting.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md index 6080dcc71a..c5887bbdfc 100644 --- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md +++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md @@ -27,7 +27,7 @@ In case of multi-company setup, accounting currency of Party must be same for al In Sales Invoice, transaction currency must be same as accounting currency of Customer if Customer's accounting currency is other than Company Currency. Otherwise, you can select any currency in Invoice. On selection of Customer, system will fetch Receivable account from Customer / Company. The currency of receivable account must be same as Customer's accounting currency. -Now, in POS, Paid Amount will be enetered in transaction currency, instead of earlier Company Currency. Write Off Amount will also be entered in transaction currency. +Now, in POS, Paid Amount will be entered in transaction currency, instead of earlier Company Currency. Write Off Amount will also be entered in transaction currency. Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency. @@ -115,4 +115,4 @@ In General Ledger, system shows debit / credit amount in both currency if filter In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency. -Accounts Receivable Report \ No newline at end of file +Accounts Receivable Report From 6338f407d9fb293daa46dc8a927a5e245c82011b Mon Sep 17 00:00:00 2001 From: Agus Syahputra Date: Wed, 24 Feb 2016 07:28:46 +0700 Subject: [PATCH 32/49] Update opening-accounts.md --- erpnext/docs/user/manual/en/accounts/opening-accounts.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md index 214642d8d5..28ba0c293b 100644 --- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md +++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md @@ -32,7 +32,7 @@ You can select accounts based on the voucher type. In such a scenario, your bala A nice way to simplify opening is to use a temporary account just for opening. These accounts will become zero once all your old invoices and opening balances of bank, debt stock etc are entered. -In the standard chart of accounts, a **Temperory Opening** account is created under +In the standard chart of accounts, a **Temporary Opening** account is created under assets #### The Opening Entry @@ -63,8 +63,8 @@ This way, you can update opening balance in Asset and Liability accounts. You can make two Opening Journal Entrys: - * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temperory Opening** account. - * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temperory Opening** account. + * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account. + * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account. * In this method you can update opening balance of specific balancesheet accounts and not for all. * Opening entry is only for balance sheet accounts and not for expense or Income accounts. @@ -89,6 +89,6 @@ If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem. -Once all your invoices are entered, your **Temperory Opening** account will have a balance of zero! +Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero! {next} From acd1bcffdeec17ab6ccf0814bd1cc7d64bbb3ed0 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 22 Feb 2016 20:14:55 +0530 Subject: [PATCH 33/49] [fix] changed field type to Code --- .../purchase_invoice/purchase_invoice.json | 107 +++++++++++- .../purchase_invoice_item.json | 100 ++++++++++- .../purchase_taxes_and_charges.json | 46 ++++- .../doctype/sales_invoice/sales_invoice.json | 157 +++++++++++++++--- .../sales_taxes_and_charges.json | 42 ++++- .../purchase_order/purchase_order.json | 112 ++++++++++++- .../purchase_order_item.json | 57 ++++++- .../supplier_quotation.json | 73 +++++++- .../supplier_quotation_item.json | 84 +++++++++- .../installation_note/installation_note.json | 28 +++- .../selling/doctype/quotation/quotation.json | 85 +++++++++- .../quotation_item/quotation_item.json | 37 ++++- .../doctype/sales_order/sales_order.json | 120 ++++++++++++- .../sales_order_item/sales_order_item.json | 57 ++++++- .../doctype/email_digest/email_digest.json | 26 ++- .../purchase_receipt/purchase_receipt.json | 97 ++++++++++- .../purchase_receipt_item.json | 69 +++++++- erpnext/utilities/doctype/sms_log/sms_log.js | 8 + .../utilities/doctype/sms_log/sms_log.json | 26 ++- 19 files changed, 1267 insertions(+), 64 deletions(-) create mode 100644 erpnext/utilities/doctype/sms_log/sms_log.js diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index ee6c64f646..4a22de9e3c 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -18,6 +18,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -42,6 +43,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -68,6 +70,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier", @@ -95,6 +98,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Name", @@ -120,6 +124,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -143,6 +148,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -166,6 +172,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -186,14 +193,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -212,6 +221,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -237,6 +247,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -263,6 +274,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier Invoice No", @@ -288,6 +300,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier Invoice Date", @@ -313,6 +326,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -339,6 +353,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -365,6 +380,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Return", @@ -390,6 +406,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Return Against Purchase Invoice", @@ -415,6 +432,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -439,6 +457,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency", @@ -466,6 +485,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -492,6 +512,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -514,6 +535,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List", @@ -538,6 +560,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -562,6 +585,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -586,6 +610,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -609,6 +634,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -634,6 +660,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -660,6 +687,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -682,6 +710,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -708,6 +737,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -734,6 +764,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -756,6 +787,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -781,6 +813,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -807,6 +840,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -832,6 +866,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -858,6 +893,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Purchase Taxes and Charges", @@ -884,6 +920,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -908,6 +945,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -933,6 +971,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added (Company Currency)", @@ -959,6 +998,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted (Company Currency)", @@ -985,6 +1025,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -1011,6 +1052,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1034,6 +1076,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added", @@ -1060,6 +1103,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted", @@ -1086,6 +1130,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1112,6 +1157,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1137,6 +1183,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1162,6 +1209,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1187,6 +1235,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1210,6 +1259,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1234,6 +1284,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1259,6 +1310,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1282,6 +1334,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1309,6 +1362,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1334,6 +1388,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1358,6 +1413,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1384,6 +1440,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1409,6 +1466,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Advance", @@ -1435,6 +1493,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Outstanding Amount", @@ -1463,6 +1522,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off", @@ -1487,6 +1547,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Amount", @@ -1511,6 +1572,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Amount (Company Currency)", @@ -1536,6 +1598,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1560,6 +1623,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Account", @@ -1585,6 +1649,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Cost Center", @@ -1610,6 +1675,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Advance Payments", @@ -1635,6 +1701,7 @@ "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Get Advances Paid", @@ -1660,6 +1727,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Advances", @@ -1687,6 +1755,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1711,6 +1780,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -1735,6 +1805,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions1", @@ -1759,6 +1830,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Details", @@ -1783,6 +1855,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Address", @@ -1807,6 +1880,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1830,6 +1904,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Person", @@ -1854,6 +1929,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Printing Settings", @@ -1878,6 +1954,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -1903,6 +1980,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -1929,6 +2007,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -1955,6 +2034,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Credit To", @@ -1981,6 +2061,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Party Account Currency", @@ -2008,6 +2089,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Is Opening", @@ -2034,6 +2116,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Due Date", @@ -2059,6 +2142,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Against Expense Account", @@ -2084,6 +2168,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2106,6 +2191,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mode of Payment", @@ -2132,6 +2218,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -2158,6 +2245,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Remarks", @@ -2185,6 +2273,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Invoice", @@ -2211,6 +2300,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Recurring", @@ -2236,6 +2326,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Type", @@ -2262,6 +2353,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "From Date", @@ -2287,6 +2379,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "To Date", @@ -2312,6 +2405,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Repeat on Day of Month", @@ -2337,6 +2431,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "End Date", @@ -2360,6 +2455,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2385,6 +2481,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Next Date", @@ -2410,6 +2507,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Id", @@ -2432,14 +2530,16 @@ "depends_on": "eval:doc.is_recurring==1", "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", "fieldname": "notification_email_address", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Notification Email Address", "length": 0, "no_copy": 1, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -2459,6 +2559,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Print Format", @@ -2488,7 +2589,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-08 16:27:10.669373", + "modified": "2016-02-22 09:32:04.196291", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index b856d89a97..bccecb9162 100755 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -16,6 +16,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item", @@ -26,6 +27,7 @@ "options": "Item", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -41,12 +43,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -62,6 +66,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Name", @@ -71,6 +76,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -86,6 +92,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -94,6 +101,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -109,6 +117,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -118,6 +127,7 @@ "oldfieldtype": "Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 0, "report_hide": 0, @@ -135,6 +145,7 @@ "fieldtype": "Attach", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image", @@ -143,6 +154,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -158,6 +170,7 @@ "fieldtype": "Image", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image View", @@ -167,6 +180,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -182,6 +196,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quantity and Rate", @@ -189,6 +204,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -204,6 +220,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Qty", @@ -213,6 +230,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -228,12 +246,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -249,6 +269,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "UOM", @@ -257,6 +278,7 @@ "options": "UOM", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -272,6 +294,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Conversion Factor", @@ -279,6 +302,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -294,12 +318,14 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -315,6 +341,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate", @@ -323,6 +350,7 @@ "options": "currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -339,6 +367,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Discount on Price List Rate (%)", @@ -346,6 +375,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -361,12 +391,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -382,6 +414,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate (Company Currency)", @@ -390,6 +423,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -405,12 +439,14 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -426,6 +462,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate ", @@ -436,6 +473,7 @@ "options": "currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -451,6 +489,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -461,6 +500,7 @@ "options": "currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -476,12 +516,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -497,6 +539,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rate (Company Currency)", @@ -507,6 +550,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -522,6 +566,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -532,6 +577,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -547,6 +593,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Pricing Rule", @@ -555,6 +602,7 @@ "options": "Pricing Rule", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -570,6 +618,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -577,6 +626,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -592,6 +642,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate", @@ -601,6 +652,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -616,6 +668,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount", @@ -625,6 +678,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -640,6 +694,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -647,6 +702,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -662,6 +718,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate (Company Currency)", @@ -671,6 +728,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -686,6 +744,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount (Company Currency)", @@ -695,6 +754,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -710,6 +770,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Accounting", @@ -717,6 +778,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -732,6 +794,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Expense Head", @@ -742,6 +805,7 @@ "options": "Account", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "120px", "read_only": 0, "report_hide": 0, @@ -759,12 +823,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -780,6 +846,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Project Name", @@ -788,6 +855,7 @@ "options": "Project", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -804,6 +872,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Cost Center", @@ -814,6 +883,7 @@ "options": "Cost Center", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "120px", "read_only": 0, "report_hide": 0, @@ -831,6 +901,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference", @@ -838,6 +909,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -853,6 +925,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Brand", @@ -862,6 +935,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -878,6 +952,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Item Group", @@ -888,6 +963,7 @@ "options": "Item Group", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -901,9 +977,10 @@ "collapsible": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Rate", @@ -913,6 +990,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 1, "reqd": 0, @@ -928,6 +1006,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Amount", @@ -936,6 +1015,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 1, "report_hide": 0, @@ -953,6 +1033,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Purchase Order", @@ -963,6 +1044,7 @@ "options": "Purchase Order", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -978,12 +1060,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -999,6 +1083,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Purchase Order Item", @@ -1008,6 +1093,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -1023,6 +1109,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Purchase Receipt", @@ -1033,6 +1120,7 @@ "options": "Purchase Receipt", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -1048,6 +1136,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Page Break", @@ -1055,6 +1144,7 @@ "no_copy": 1, "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 1, "reqd": 0, @@ -1070,6 +1160,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "PR Detail", @@ -1079,6 +1170,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -1094,6 +1186,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Valuation Rate", @@ -1102,6 +1195,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -1117,6 +1211,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Raw Materials Supplied Cost", @@ -1125,6 +1220,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -1142,7 +1238,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:53.343792", + "modified": "2016-02-22 09:32:17.205040", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json index 2ce1ef7973..67982da428 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json @@ -17,6 +17,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Consider Tax or Charge for", @@ -27,6 +28,7 @@ "options": "Valuation and Total\nValuation\nTotal", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -43,6 +45,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Add or Deduct", @@ -53,6 +56,7 @@ "options": "Add\nDeduct", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -68,6 +72,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Type", @@ -78,6 +83,7 @@ "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -94,6 +100,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference Row #", @@ -103,6 +110,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -119,6 +127,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is this Tax included in Basic Rate?", @@ -127,6 +136,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 1, "reqd": 0, @@ -142,12 +152,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -163,6 +175,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Account Head", @@ -173,6 +186,7 @@ "options": "Account", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -189,6 +203,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Cost Center", @@ -199,6 +214,7 @@ "options": "Cost Center", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -214,6 +230,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Description", @@ -223,6 +240,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 0, "report_hide": 0, @@ -240,6 +258,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -247,6 +266,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -262,6 +282,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate", @@ -271,6 +292,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -286,6 +308,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -293,6 +316,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -308,6 +332,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -318,6 +343,7 @@ "options": "currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -333,6 +359,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Tax Amount After Discount Amount", @@ -342,6 +369,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -357,6 +385,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -367,6 +396,7 @@ "options": "currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -382,6 +412,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -389,6 +420,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -404,6 +436,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -413,6 +446,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -428,6 +462,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -437,6 +472,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -452,6 +488,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Tax Amount After Discount Amount", @@ -461,6 +498,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -473,9 +511,10 @@ "bold": 0, "collapsible": 0, "fieldname": "item_wise_tax_detail", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Wise Tax Detail ", @@ -485,6 +524,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -500,6 +540,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Parenttype", @@ -509,6 +550,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -526,7 +568,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:54.644704", + "modified": "2016-02-22 09:33:46.131818", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index dae22784f4..ab486aa070 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -18,6 +18,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -43,6 +44,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -67,6 +69,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -93,6 +96,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer", @@ -120,6 +124,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Name", @@ -145,6 +150,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -168,6 +174,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -191,6 +198,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -211,14 +219,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -237,6 +247,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is POS", @@ -263,6 +274,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Return", @@ -287,6 +299,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -311,6 +324,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -336,6 +350,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Payment Due Date", @@ -361,6 +376,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -387,6 +403,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -414,6 +431,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Return Against Sales Invoice", @@ -439,6 +457,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Shipping Address Name", @@ -464,6 +483,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Address", @@ -488,6 +508,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -512,6 +533,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency", @@ -539,6 +561,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -565,6 +588,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -588,6 +612,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List", @@ -614,6 +639,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -639,6 +665,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -663,6 +690,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -686,6 +714,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -711,6 +740,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Update Stock", @@ -736,6 +766,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -762,6 +793,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Packing List", @@ -786,6 +818,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Packed Items", @@ -810,6 +843,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Product Bundle Help", @@ -833,6 +867,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -855,6 +890,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -880,6 +916,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -906,6 +943,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -928,6 +966,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -953,6 +992,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -977,6 +1017,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1002,6 +1043,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -1028,6 +1070,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1050,6 +1093,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Rule", @@ -1075,6 +1119,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1097,6 +1142,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Taxes and Charges", @@ -1123,6 +1169,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -1147,6 +1194,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1169,6 +1217,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -1195,6 +1244,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1218,6 +1268,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1243,6 +1294,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1268,6 +1320,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1293,6 +1346,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1318,6 +1372,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1340,6 +1395,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1364,6 +1420,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1388,6 +1445,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1413,6 +1471,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1439,6 +1498,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total (Company Currency)", @@ -1466,6 +1526,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1491,6 +1552,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1515,6 +1577,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1541,6 +1604,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total", @@ -1567,6 +1631,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1592,6 +1657,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Advance", @@ -1618,6 +1684,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Outstanding Amount", @@ -1645,6 +1712,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Advance Payments", @@ -1670,6 +1738,7 @@ "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Get Advances Received", @@ -1695,6 +1764,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Advances", @@ -1723,6 +1793,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payments", @@ -1747,6 +1818,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mode of Payment", @@ -1774,6 +1846,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Cash/Bank Account", @@ -1801,6 +1874,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1825,6 +1899,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Paid Amount", @@ -1851,6 +1926,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Paid Amount (Company Currency)", @@ -1878,6 +1954,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off", @@ -1903,6 +1980,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Amount", @@ -1927,6 +2005,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Amount (Company Currency)", @@ -1953,6 +2032,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Outstanding Amount", @@ -1977,6 +2057,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2001,6 +2082,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Account", @@ -2026,6 +2108,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Write Off Cost Center", @@ -2051,6 +2134,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -2076,6 +2160,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -2102,6 +2187,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions Details", @@ -2127,6 +2213,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Printing Settings", @@ -2151,6 +2238,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -2177,6 +2265,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2200,6 +2289,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -2227,6 +2317,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -2251,6 +2342,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Project Name", @@ -2278,6 +2370,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Territory", @@ -2303,6 +2396,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer Group", @@ -2327,6 +2421,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2350,6 +2445,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Address", @@ -2374,6 +2470,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Person", @@ -2399,6 +2496,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Campaign", @@ -2425,6 +2523,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Source", @@ -2451,6 +2550,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Accounting Details", @@ -2477,6 +2577,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Debit To", @@ -2503,6 +2604,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Party Account Currency", @@ -2530,6 +2632,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Is Opening Entry", @@ -2556,6 +2659,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "C-Form Applicable", @@ -2580,6 +2684,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "C-Form No", @@ -2604,6 +2709,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2627,6 +2733,7 @@ "fieldtype": "Time", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Posting Time", @@ -2652,6 +2759,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -2678,6 +2786,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Remarks", @@ -2704,6 +2813,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Commission", @@ -2729,6 +2839,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Sales Partner", @@ -2755,6 +2866,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2779,6 +2891,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Commission Rate (%)", @@ -2804,6 +2917,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Commission", @@ -2831,6 +2945,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Team", @@ -2854,6 +2969,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Team1", @@ -2882,6 +2998,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring", @@ -2906,6 +3023,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2931,6 +3049,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Recurring", @@ -2956,6 +3075,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Type", @@ -2982,6 +3102,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "From Date", @@ -3007,6 +3128,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "To Date", @@ -3032,6 +3154,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Repeat on Day of Month", @@ -3057,6 +3180,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "End Date", @@ -3080,6 +3204,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -3105,6 +3230,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Next Date", @@ -3130,6 +3256,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Id", @@ -3152,14 +3279,16 @@ "depends_on": "eval:doc.is_recurring==1", "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", "fieldname": "notification_email_address", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Notification Email Address", "length": 0, "no_copy": 1, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -3179,6 +3308,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Print Format", @@ -3204,6 +3334,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Against Income Account", @@ -3233,7 +3364,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-08 16:23:46.560153", + "modified": "2016-02-22 09:34:35.695558", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", @@ -3319,26 +3450,6 @@ "share": 0, "submit": 0, "write": 1 - }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 1, - "print": 0, - "read": 1, - "report": 0, - "role": "All", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 } ], "read_only": 0, diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json index fe7f61586d..c3017eba70 100644 --- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json +++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json @@ -16,6 +16,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Type", @@ -26,6 +27,7 @@ "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -42,6 +44,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference Row #", @@ -51,6 +54,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -66,6 +70,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Account Head", @@ -76,6 +81,7 @@ "options": "Account", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -92,6 +98,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Cost Center", @@ -102,6 +109,7 @@ "options": "Cost Center", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -117,12 +125,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -139,6 +149,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Description", @@ -148,6 +159,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 0, "report_hide": 0, @@ -166,6 +178,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is this Tax included in Basic Rate?", @@ -173,6 +186,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 0, "report_hide": 1, @@ -190,6 +204,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -197,6 +212,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -212,6 +228,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate", @@ -221,6 +238,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -236,6 +254,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -243,6 +262,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -258,6 +278,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -267,6 +288,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -282,6 +304,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -291,6 +314,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -306,6 +330,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Tax Amount After Discount Amount", @@ -315,6 +340,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -330,6 +356,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -337,6 +364,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -352,6 +380,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -362,6 +391,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -377,6 +407,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -387,6 +418,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -403,6 +435,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Tax Amount After Discount Amount (Company Currency)", @@ -411,6 +444,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -423,9 +457,10 @@ "bold": 0, "collapsible": 0, "fieldname": "item_wise_tax_detail", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Wise Tax Detail", @@ -435,6 +470,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -450,6 +486,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Parenttype", @@ -459,6 +496,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -476,7 +514,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:57.263576", + "modified": "2016-02-22 09:35:25.423372", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Taxes and Charges", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index a3628be922..fb1781a417 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -42,6 +43,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -66,6 +68,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -93,6 +96,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier", @@ -120,6 +124,7 @@ "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Get Items from Open Material Requests", @@ -145,6 +150,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supply Raw Materials", @@ -169,6 +175,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Name", @@ -193,6 +200,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -216,6 +224,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -239,6 +248,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -259,14 +269,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -285,6 +297,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -310,6 +323,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -335,6 +349,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -362,6 +377,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -389,6 +405,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Drop Ship", @@ -414,6 +431,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer", @@ -440,6 +458,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Name", @@ -464,6 +483,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -488,6 +508,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Address", @@ -514,6 +535,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Contact", @@ -539,6 +561,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Address Display", @@ -563,6 +586,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Contact", @@ -587,6 +611,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Mobile No", @@ -608,14 +633,16 @@ "bold": 0, "collapsible": 0, "fieldname": "customer_contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "precision": "", "print_hide": 1, @@ -635,6 +662,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -659,6 +687,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency", @@ -686,6 +715,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -712,6 +742,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -734,6 +765,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List", @@ -758,6 +790,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -782,6 +815,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -806,6 +840,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -829,6 +864,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -854,6 +890,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -881,6 +918,7 @@ "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Get last purchase rate", @@ -905,6 +943,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -927,6 +966,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -952,6 +992,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -978,6 +1019,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1000,6 +1042,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -1025,6 +1068,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -1051,6 +1095,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1077,6 +1122,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -1103,6 +1149,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Purchase Taxes and Charges", @@ -1129,6 +1176,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -1153,6 +1201,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1178,6 +1227,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added (Company Currency)", @@ -1204,6 +1254,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted (Company Currency)", @@ -1230,6 +1281,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -1256,6 +1308,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1279,6 +1332,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added", @@ -1305,6 +1359,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted", @@ -1331,6 +1386,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1357,6 +1413,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1382,6 +1439,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1407,6 +1465,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1432,6 +1491,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1455,6 +1515,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1479,6 +1540,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1504,6 +1566,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1527,6 +1590,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1554,6 +1618,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1579,6 +1644,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total (Company Currency)", @@ -1605,6 +1671,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1628,6 +1695,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1654,6 +1722,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1679,6 +1748,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Advance Paid", @@ -1704,6 +1774,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1729,6 +1800,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -1755,6 +1827,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1781,6 +1854,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Details", @@ -1805,6 +1879,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier Address", @@ -1829,6 +1904,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1851,6 +1927,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Contact Person", @@ -1875,6 +1952,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -1900,6 +1978,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Status", @@ -1926,6 +2005,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -1952,6 +2032,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ref SQ", @@ -1977,6 +2058,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Party Account Currency", @@ -2002,6 +2084,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2027,6 +2110,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "% Received", @@ -2054,6 +2138,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "% Billed", @@ -2079,6 +2164,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Printing Settings", @@ -2105,6 +2191,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -2131,6 +2218,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -2159,6 +2247,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Raw Materials Supplied", @@ -2184,6 +2273,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplied Items", @@ -2211,6 +2301,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring", @@ -2235,6 +2326,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -2260,6 +2352,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Recurring", @@ -2284,6 +2377,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Type", @@ -2310,6 +2404,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "From Date", @@ -2335,6 +2430,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "To Date", @@ -2360,6 +2456,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Repeat on Day of Month", @@ -2385,6 +2482,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "End Date", @@ -2408,6 +2506,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -2433,6 +2532,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Next Date", @@ -2457,6 +2557,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Id", @@ -2479,14 +2580,16 @@ "depends_on": "eval:doc.is_recurring==1", "description": "Enter email id separated by commas, order will be mailed automatically on particular date", "fieldname": "notification_email_address", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Notification Email Address", "length": 0, "no_copy": 1, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -2506,6 +2609,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Print Format", @@ -2534,7 +2638,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-08 16:26:19.210634", + "modified": "2016-02-22 09:32:53.191526", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index 84afbe0c74..c8055fdabc 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -17,6 +17,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -44,6 +45,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Part Number", @@ -67,6 +69,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Name", @@ -92,6 +95,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -115,6 +119,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Reqd By Date", @@ -140,6 +145,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -164,6 +170,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -191,6 +198,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -213,6 +221,7 @@ "fieldtype": "Attach", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image", @@ -237,6 +246,7 @@ "fieldtype": "Image", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image View", @@ -262,6 +272,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quantity and Rate", @@ -285,6 +296,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Quantity", @@ -312,6 +324,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Stock UOM", @@ -340,6 +353,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -362,6 +376,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "UOM", @@ -390,6 +405,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "UOM Conversion Factor", @@ -417,6 +433,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -439,6 +456,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate", @@ -464,6 +482,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Discount on Price List Rate (%)", @@ -487,6 +506,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -509,6 +529,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate (Company Currency)", @@ -533,6 +554,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -555,6 +577,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate ", @@ -581,6 +604,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -607,6 +631,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -629,6 +654,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rate (Company Currency)", @@ -657,6 +683,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -683,6 +710,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Pricing Rule", @@ -707,6 +735,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -730,6 +759,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate", @@ -755,6 +785,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount", @@ -780,6 +811,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -803,6 +835,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate (Company Currency)", @@ -828,6 +861,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount (Company Currency)", @@ -853,6 +887,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Warehouse and Reference", @@ -876,6 +911,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Warehouse", @@ -902,6 +938,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Project Name", @@ -926,6 +963,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference Document Type", @@ -952,6 +990,7 @@ "fieldtype": "Dynamic Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Reference Name", @@ -980,6 +1019,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Material Request Detail No", @@ -1005,6 +1045,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Quotation", @@ -1029,6 +1070,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Quotation Item", @@ -1053,6 +1095,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "To be delivered to customer", @@ -1077,6 +1120,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1100,6 +1144,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Item Group", @@ -1126,6 +1171,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Brand", @@ -1152,6 +1198,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "BOM", @@ -1177,6 +1224,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Qty as per Stock UOM", @@ -1204,6 +1252,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Received Qty", @@ -1230,6 +1279,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Returned Qty", @@ -1254,6 +1304,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Billed Amt", @@ -1276,9 +1327,10 @@ "collapsible": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Rate", @@ -1304,6 +1356,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Page Break", @@ -1331,7 +1384,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-01-25 05:39:52.405200", + "modified": "2016-02-22 09:33:02.405537", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index b13205c5a9..0e2443b8a9 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -42,6 +43,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -66,6 +68,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -93,6 +96,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier", @@ -119,6 +123,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Name", @@ -142,6 +147,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -165,6 +171,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -188,6 +195,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -208,14 +216,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -234,6 +244,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -259,6 +270,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -284,6 +296,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -311,6 +324,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -337,6 +351,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -361,6 +376,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency", @@ -388,6 +404,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -414,6 +431,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -438,6 +456,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List", @@ -463,6 +482,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -488,6 +508,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -512,6 +533,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -535,6 +557,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -560,6 +583,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -586,6 +610,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -608,6 +633,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -633,6 +659,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -659,6 +686,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -681,6 +709,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -706,6 +735,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -732,6 +762,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -758,6 +789,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -784,6 +816,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Purchase Taxes and Charges", @@ -810,6 +843,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -834,6 +868,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -859,6 +894,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added (Company Currency)", @@ -885,6 +921,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted (Company Currency)", @@ -911,6 +948,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -937,6 +975,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -960,6 +999,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added", @@ -986,6 +1026,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted", @@ -1012,6 +1053,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1038,6 +1080,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1063,6 +1106,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1088,6 +1132,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1113,6 +1158,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1136,6 +1182,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1160,6 +1207,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1185,6 +1233,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1208,6 +1257,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1235,6 +1285,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1260,6 +1311,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total (Company Currency)", @@ -1286,6 +1338,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1309,6 +1362,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1335,6 +1389,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1361,6 +1416,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1386,6 +1442,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -1412,6 +1469,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1438,6 +1496,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Details", @@ -1462,6 +1521,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier Address", @@ -1486,6 +1546,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Contact Person", @@ -1510,6 +1571,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Printing Settings", @@ -1534,6 +1596,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -1560,6 +1623,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -1586,6 +1650,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -1611,6 +1676,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Status", @@ -1638,6 +1704,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Subcontracted", @@ -1662,6 +1729,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1684,6 +1752,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -1714,7 +1783,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-08 16:30:33.704770", + "modified": "2016-02-22 09:36:33.641326", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index 7ee47c45b7..874a1f6e3c 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -16,6 +16,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -26,6 +27,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -42,6 +44,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Part Number", @@ -49,6 +52,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -64,6 +68,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -71,6 +76,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -86,6 +92,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Name", @@ -95,6 +102,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -110,6 +118,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -118,6 +127,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -133,6 +143,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -142,6 +153,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 0, "report_hide": 0, @@ -159,12 +171,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -180,6 +194,7 @@ "fieldtype": "Attach", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image", @@ -188,6 +203,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -203,6 +219,7 @@ "fieldtype": "Image", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image View", @@ -212,6 +229,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -227,6 +245,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quantity and Rate", @@ -234,6 +253,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -249,6 +269,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Quantity", @@ -258,6 +279,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "60px", "read_only": 0, "report_hide": 0, @@ -275,6 +297,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate", @@ -283,6 +306,7 @@ "options": "currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -299,6 +323,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Discount on Price List Rate (%)", @@ -306,6 +331,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -321,12 +347,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -342,6 +370,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "UOM", @@ -352,6 +381,7 @@ "options": "UOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -369,6 +399,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate (Company Currency)", @@ -377,6 +408,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -392,12 +424,14 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -413,6 +447,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate ", @@ -423,6 +458,7 @@ "options": "currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -438,6 +474,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -448,6 +485,7 @@ "options": "currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -463,12 +501,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -484,6 +524,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rate (Company Currency)", @@ -494,6 +535,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 1, "report_hide": 0, @@ -511,6 +553,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -521,6 +564,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 1, @@ -536,6 +580,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Pricing Rule", @@ -544,6 +589,7 @@ "options": "Pricing Rule", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -559,6 +605,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -566,6 +613,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -581,6 +629,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate", @@ -589,6 +638,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -604,6 +654,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount", @@ -613,6 +664,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -628,6 +680,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -635,6 +688,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -650,6 +704,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate (Company Currency)", @@ -659,6 +714,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -674,6 +730,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount (Company Currency)", @@ -683,6 +740,7 @@ "permlevel": 0, "precision": "", "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -698,6 +756,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Warehouse and Reference", @@ -705,6 +764,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -720,6 +780,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Warehouse", @@ -730,6 +791,7 @@ "options": "Warehouse", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -745,6 +807,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Project Name", @@ -753,6 +816,7 @@ "options": "Project", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -768,6 +832,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Prevdoc DocType", @@ -777,6 +842,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -792,6 +858,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Material Request No", @@ -802,6 +869,7 @@ "options": "Material Request", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "120px", "read_only": 1, "report_hide": 0, @@ -819,12 +887,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -840,6 +910,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Material Request Detail No", @@ -849,6 +920,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -864,6 +936,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Brand", @@ -874,6 +947,7 @@ "options": "Brand", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -890,6 +964,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Item Group", @@ -900,6 +975,7 @@ "options": "Item Group", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -913,9 +989,10 @@ "collapsible": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Rate", @@ -925,6 +1002,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 1, "reqd": 0, @@ -940,6 +1018,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Page Break", @@ -949,6 +1028,7 @@ "oldfieldtype": "Check", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -966,7 +1046,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:58.833849", + "modified": "2016-02-22 09:36:18.864207", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation Item", diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json index 6e3d866aef..f3c645239a 100644 --- a/erpnext/selling/doctype/installation_note/installation_note.json +++ b/erpnext/selling/doctype/installation_note/installation_note.json @@ -16,6 +16,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Installation Note", @@ -40,6 +41,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -64,6 +66,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -90,6 +93,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer", @@ -117,6 +121,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Address", @@ -142,6 +147,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Person", @@ -166,6 +172,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Name", @@ -191,6 +198,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -214,6 +222,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -238,6 +247,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -259,14 +269,16 @@ "collapsible": 0, "depends_on": "customer", "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -287,6 +299,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Territory", @@ -313,6 +326,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Group", @@ -337,6 +351,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -361,6 +376,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Installation Date", @@ -386,6 +402,7 @@ "fieldtype": "Time", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Installation Time", @@ -412,6 +429,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Status", @@ -439,6 +457,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -465,6 +484,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -491,6 +511,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -517,6 +538,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Remarks", @@ -542,6 +564,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -567,6 +590,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -596,7 +620,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-03 01:09:13.768553", + "modified": "2016-02-22 09:30:32.364719", "modified_by": "Administrator", "module": "Selling", "name": "Installation Note", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index c686d578f7..653d9fe7e0 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -41,6 +42,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -65,6 +67,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -89,6 +92,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -116,6 +120,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Quotation To", @@ -143,6 +148,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer", @@ -170,6 +176,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Lead", @@ -196,6 +203,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer / Lead Name", @@ -219,6 +227,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -244,6 +253,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -267,6 +277,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -287,14 +298,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -313,6 +326,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -337,6 +351,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -365,6 +380,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -393,6 +409,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -420,6 +437,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Order Type", @@ -446,6 +464,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -470,6 +489,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Currency", @@ -498,6 +518,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -525,6 +546,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -548,6 +570,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Price List", @@ -575,6 +598,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -600,6 +624,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -624,6 +649,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -647,6 +673,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -672,6 +699,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -699,6 +727,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -721,6 +750,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -746,6 +776,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -773,6 +804,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -795,6 +827,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -820,6 +853,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -844,6 +878,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -869,6 +904,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -895,6 +931,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -917,6 +954,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Rule", @@ -942,6 +980,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -964,6 +1003,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Taxes and Charges", @@ -990,6 +1030,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -1014,6 +1055,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1036,6 +1078,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -1062,6 +1105,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1084,6 +1128,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1109,6 +1154,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1134,6 +1180,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1159,6 +1206,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1184,6 +1232,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1207,6 +1256,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1231,6 +1281,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1255,6 +1306,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1280,6 +1332,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1307,6 +1360,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total (Company Currency)", @@ -1335,6 +1389,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1361,6 +1416,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1385,6 +1441,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1412,6 +1469,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total", @@ -1439,6 +1497,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1466,6 +1525,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1491,6 +1551,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -1517,6 +1578,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Term Details", @@ -1542,6 +1604,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Details", @@ -1567,6 +1630,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Territory", @@ -1593,6 +1657,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer Group", @@ -1619,6 +1684,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Address", @@ -1643,6 +1709,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Address", @@ -1667,6 +1734,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1690,6 +1758,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer Address", @@ -1715,6 +1784,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Contact Person", @@ -1741,6 +1811,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Settings", @@ -1765,6 +1836,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -1791,6 +1863,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -1817,6 +1890,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -1842,6 +1916,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Campaign", @@ -1868,6 +1943,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Source", @@ -1895,6 +1971,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quotation Lost Reason", @@ -1920,6 +1997,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1945,6 +2023,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Status", @@ -1971,6 +2050,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -1997,6 +2077,7 @@ "fieldtype": "Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Opportunity Item", @@ -2026,7 +2107,7 @@ "istable": 0, "max_attachments": 1, "menu_index": 0, - "modified": "2016-02-08 16:25:06.670612", + "modified": "2016-02-22 09:34:05.378900", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index b1bb6f752e..e3745da846 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -16,6 +16,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -44,6 +45,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer's Item Code", @@ -67,6 +69,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -89,6 +92,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Name", @@ -116,6 +120,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -140,6 +145,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -167,6 +173,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -190,6 +197,7 @@ "fieldtype": "Attach", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image", @@ -214,6 +222,7 @@ "fieldtype": "Image", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image View", @@ -239,6 +248,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quantity and Rate", @@ -262,6 +272,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Quantity", @@ -289,6 +300,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate", @@ -318,6 +330,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Discount on Price List Rate (%)", @@ -345,6 +358,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -367,6 +381,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "UOM", @@ -395,6 +410,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate (Company Currency)", @@ -423,6 +439,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -445,6 +462,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate", @@ -473,6 +491,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate", @@ -497,6 +516,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -525,6 +545,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount", @@ -550,6 +571,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -572,6 +594,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rate (Company Currency)", @@ -600,6 +623,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate (Company Currency)", @@ -624,6 +648,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -652,6 +677,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount (Company Currency)", @@ -677,6 +703,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Pricing Rule", @@ -823,6 +850,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference", @@ -846,6 +874,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Against Doctype", @@ -874,6 +903,7 @@ "fieldtype": "Dynamic Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Against Docname", @@ -899,9 +929,10 @@ "bold": 0, "collapsible": 0, "fieldname": "item_tax_rate", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Rate", @@ -927,6 +958,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -949,6 +981,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Page Break", @@ -975,6 +1008,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Item Group", @@ -1001,6 +1035,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Brand", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 5c57f4584f..73c5d20451 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -41,6 +42,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -66,6 +68,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -90,6 +93,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -116,6 +120,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer", @@ -142,6 +147,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Name", @@ -165,6 +171,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -188,6 +195,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -211,6 +219,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -231,14 +240,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -259,6 +270,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Order Type", @@ -285,6 +297,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -309,6 +322,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -337,6 +351,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -365,6 +380,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -392,6 +408,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Delivery Date", @@ -420,6 +437,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer's Purchase Order", @@ -448,6 +466,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer's Purchase Order Date", @@ -474,6 +493,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Shipping Address Name", @@ -498,6 +518,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Address", @@ -521,6 +542,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -545,6 +567,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency", @@ -573,6 +596,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -600,6 +624,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -623,6 +648,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List", @@ -650,6 +676,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -675,6 +702,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -699,6 +727,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -722,6 +751,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -747,6 +777,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -773,6 +804,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -795,6 +827,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -817,6 +850,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -842,6 +876,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -869,6 +904,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -891,6 +927,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -916,6 +953,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -940,6 +978,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -965,6 +1004,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -991,6 +1031,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1013,6 +1054,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Shipping Rule", @@ -1038,6 +1080,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1060,6 +1103,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Taxes and Charges", @@ -1086,6 +1130,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -1110,6 +1155,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1132,6 +1178,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -1159,6 +1206,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1182,6 +1230,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1207,6 +1256,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1232,6 +1282,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1257,6 +1308,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1282,6 +1334,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1305,6 +1358,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1330,6 +1384,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1354,6 +1409,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1379,6 +1435,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1406,6 +1463,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total (Company Currency)", @@ -1434,6 +1492,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1460,6 +1519,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1484,6 +1544,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1511,6 +1572,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total", @@ -1538,6 +1600,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1564,6 +1627,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Advance Paid", @@ -1590,6 +1654,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Packing List", @@ -1615,6 +1680,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Packed Items", @@ -1642,6 +1708,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1667,6 +1734,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -1693,6 +1761,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions Details", @@ -1719,6 +1788,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Details", @@ -1743,6 +1813,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1767,6 +1838,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Territory", @@ -1792,6 +1864,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer Group", @@ -1816,6 +1889,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1839,6 +1913,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Customer Address", @@ -1863,6 +1938,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Contact Person", @@ -1888,6 +1964,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -1914,6 +1991,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Project Name", @@ -1940,6 +2018,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -1967,6 +2046,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Party Account Currency", @@ -1992,6 +2072,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2015,6 +2096,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Source", @@ -2042,6 +2124,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Campaign", @@ -2068,6 +2151,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Printing Details", @@ -2092,6 +2176,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -2118,6 +2203,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2142,6 +2228,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -2168,6 +2255,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Billing and Delivery Status", @@ -2194,6 +2282,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Status", @@ -2221,6 +2310,7 @@ "fieldtype": "Select", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Delivery Status", @@ -2247,6 +2337,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "% Delivered", @@ -2273,6 +2364,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2297,6 +2389,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "% Amount Billed", @@ -2323,6 +2416,7 @@ "fieldtype": "Select", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Billing Status", @@ -2348,6 +2442,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Commission", @@ -2373,6 +2468,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Sales Partner", @@ -2400,6 +2496,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2423,6 +2520,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Commission Rate", @@ -2449,6 +2547,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Commission", @@ -2476,6 +2575,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Team", @@ -2499,6 +2599,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Team1", @@ -2526,6 +2627,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Order", @@ -2552,6 +2654,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Recurring", @@ -2577,6 +2680,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Type", @@ -2603,6 +2707,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "From Date", @@ -2628,6 +2733,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "To Date", @@ -2653,6 +2759,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Repeat on Day of Month", @@ -2678,6 +2785,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "End Date", @@ -2701,6 +2809,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -2726,6 +2835,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Next Date", @@ -2750,6 +2860,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Id", @@ -2772,14 +2883,16 @@ "depends_on": "eval:doc.is_recurring==1", "description": "Enter email id separated by commas, order will be mailed automatically on particular date", "fieldname": "notification_email_address", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Notification Email Address", "length": 0, "no_copy": 1, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -2799,6 +2912,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recurring Print Format", @@ -2827,7 +2941,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-08 16:21:45.238706", + "modified": "2016-02-22 09:35:08.094329", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 184a4f48eb..9e8c2a8caa 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -17,6 +17,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -45,6 +46,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer's Item Code", @@ -68,6 +70,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -90,6 +93,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Name", @@ -117,6 +121,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -141,6 +146,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Description", @@ -168,6 +174,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -191,6 +198,7 @@ "fieldtype": "Attach", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image", @@ -215,6 +223,7 @@ "fieldtype": "Image", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image View", @@ -240,6 +249,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quantity and Rate", @@ -263,6 +273,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Quantity", @@ -290,6 +301,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate", @@ -319,6 +331,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Discount on Price List Rate (%)", @@ -346,6 +359,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -368,6 +382,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "UOM", @@ -396,6 +411,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate (Company Currency)", @@ -424,6 +440,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -446,6 +463,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate", @@ -474,6 +492,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -502,6 +521,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -524,6 +544,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Basic Rate (Company Currency)", @@ -552,6 +573,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -580,6 +602,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Pricing Rule", @@ -604,6 +627,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -627,6 +651,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate", @@ -652,6 +677,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount", @@ -677,6 +703,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -700,6 +727,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate (Company Currency)", @@ -725,6 +753,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount (Company Currency)", @@ -751,6 +780,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Drop Ship", @@ -775,6 +805,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier delivers to Customer", @@ -799,6 +830,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier", @@ -824,6 +856,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Warehouse and Reference", @@ -848,6 +881,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Delivery Warehouse", @@ -877,6 +911,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Customer Warehouse (Optional)", @@ -902,6 +937,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Quotation", @@ -928,6 +964,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Brand Name", @@ -955,6 +992,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Item Group", @@ -981,6 +1019,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Page Break", @@ -1006,6 +1045,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1028,6 +1068,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Projected Qty", @@ -1055,6 +1096,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Actual Qty", @@ -1080,6 +1122,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ordered Qty", @@ -1104,6 +1147,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Delivered Qty", @@ -1132,6 +1176,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Returned Qty", @@ -1156,6 +1201,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Billed Amt", @@ -1181,6 +1227,7 @@ "fieldtype": "Float", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Planned Quantity", @@ -1209,6 +1256,7 @@ "fieldtype": "Float", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Produced Quantity", @@ -1233,9 +1281,10 @@ "bold": 0, "collapsible": 0, "fieldname": "item_tax_rate", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Rate", @@ -1262,6 +1311,7 @@ "fieldtype": "Date", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sales Order Date", @@ -1290,7 +1340,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-01 11:16:40.514399", + "modified": "2016-02-22 09:35:19.701876", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", @@ -1299,6 +1349,5 @@ "read_only": 0, "read_only_onload": 0, "sort_field": "modified", - "sort_order": "DESC", - "version": 0 + "sort_order": "DESC" } \ No newline at end of file diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json index 21371f153f..dfc5edb89d 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.json +++ b/erpnext/setup/doctype/email_digest/email_digest.json @@ -18,6 +18,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Email Digest Settings", @@ -41,6 +42,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -63,6 +65,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Enabled", @@ -86,6 +89,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "For Company", @@ -110,6 +114,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "How frequently?", @@ -135,6 +140,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Next email will be sent on:", @@ -158,6 +164,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -178,14 +185,16 @@ "collapsible": 0, "description": "Note: Email will not be sent to disabled users", "fieldname": "recipient_list", - "fieldtype": "Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recipients", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -204,6 +213,7 @@ "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Add/Remove Recipients", @@ -227,6 +237,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Accounts", @@ -250,6 +261,7 @@ "fieldtype": "Column Break", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Income / Expense", @@ -274,6 +286,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Income", @@ -298,6 +311,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Expense", @@ -322,6 +336,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Bank Balance", @@ -345,6 +360,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Annual Income", @@ -368,6 +384,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Annual Expense", @@ -393,6 +410,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Receivables / Payables", @@ -417,6 +435,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Receivables", @@ -441,6 +460,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payables", @@ -464,6 +484,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Other", @@ -488,6 +509,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Add Quote", @@ -516,7 +538,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2015-11-27 01:48:34.725037", + "modified": "2016-02-22 09:22:28.877187", "modified_by": "Administrator", "module": "Setup", "name": "Email Digest", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 88dd1d7309..d7ec8fbe60 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -41,6 +42,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -67,6 +69,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Title", @@ -92,6 +95,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -118,6 +122,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Supplier", @@ -147,6 +152,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Name", @@ -170,6 +176,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Address", @@ -193,6 +200,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact", @@ -216,6 +224,7 @@ "fieldtype": "Small Text", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mobile No", @@ -236,14 +245,16 @@ "bold": 0, "collapsible": 0, "fieldname": "contact_email", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Email", "length": 0, "no_copy": 0, + "options": "Email", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -262,6 +273,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -287,6 +299,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Date", @@ -315,6 +328,7 @@ "fieldtype": "Time", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Posting Time", @@ -342,6 +356,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Is Return", @@ -367,6 +382,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Return Against Purchase Receipt", @@ -392,6 +408,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency and Price List", @@ -416,6 +433,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Currency", @@ -443,6 +461,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Exchange Rate", @@ -469,6 +488,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -494,6 +514,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List", @@ -519,6 +540,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Currency", @@ -544,6 +566,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Exchange Rate", @@ -568,6 +591,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Ignore Pricing Rule", @@ -591,6 +615,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -616,6 +641,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Items", @@ -642,6 +668,7 @@ "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Get current stock", @@ -667,6 +694,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -690,6 +718,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total (Company Currency)", @@ -715,6 +744,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total (Company Currency)", @@ -743,6 +773,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -765,6 +796,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total", @@ -790,6 +822,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Total", @@ -817,6 +850,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -843,6 +877,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges", @@ -869,6 +904,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Purchase Taxes and Charges", @@ -895,6 +931,7 @@ "fieldtype": "HTML", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Calculation", @@ -920,6 +957,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -945,6 +983,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added (Company Currency)", @@ -971,6 +1010,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted (Company Currency)", @@ -997,6 +1037,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges (Company Currency)", @@ -1023,6 +1064,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1047,6 +1089,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Added", @@ -1073,6 +1116,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Taxes and Charges Deducted", @@ -1099,6 +1143,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Taxes and Charges", @@ -1125,6 +1170,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount", @@ -1150,6 +1196,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Apply Additional Discount On", @@ -1175,6 +1222,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount (Company Currency)", @@ -1200,6 +1248,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1223,6 +1272,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Percentage", @@ -1247,6 +1297,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Additional Discount Amount", @@ -1272,6 +1323,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1295,6 +1347,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total (Company Currency)", @@ -1322,6 +1375,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words (Company Currency)", @@ -1347,6 +1401,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rounded Total (Company Currency)", @@ -1373,6 +1428,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1396,6 +1452,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Grand Total", @@ -1422,6 +1479,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "In Words", @@ -1448,6 +1506,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1473,6 +1532,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms", @@ -1499,6 +1559,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Terms and Conditions", @@ -1525,6 +1586,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Details", @@ -1549,6 +1611,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Address", @@ -1573,6 +1636,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1595,6 +1659,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Contact Person", @@ -1621,6 +1686,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Raw Materials Supplied", @@ -1648,6 +1714,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Raw Materials Supplied", @@ -1675,6 +1742,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplier Warehouse", @@ -1703,6 +1771,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Supplied Items", @@ -1729,6 +1798,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Bill No", @@ -1754,6 +1824,7 @@ "fieldtype": "Date", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Bill Date", @@ -1779,6 +1850,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "More Information", @@ -1805,6 +1877,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Status", @@ -1834,6 +1907,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rejected Warehouse", @@ -1860,6 +1934,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -1888,6 +1963,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Range", @@ -1913,6 +1989,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1938,6 +2015,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "% Amount Billed", @@ -1963,6 +2041,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -1991,6 +2070,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Fiscal Year", @@ -2019,6 +2099,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Printing Settings", @@ -2043,6 +2124,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Letter Head", @@ -2067,6 +2149,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Heading", @@ -2093,13 +2176,14 @@ "fieldtype": "HTML", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Other Details", "length": 0, "no_copy": 0, "oldfieldtype": "HTML", - "options": "

Other Details
", + "options": "
Other Details
", "permlevel": 0, "print_hide": 1, "print_hide_if_no_value": 0, @@ -2120,6 +2204,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Instructions", @@ -2145,6 +2230,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Remarks", @@ -2169,6 +2255,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Transporter Details", @@ -2193,6 +2280,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Transporter Name", @@ -2218,6 +2306,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -2243,6 +2332,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Vehicle Number", @@ -2271,6 +2361,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Vehicle Date", @@ -2302,7 +2393,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-02-08 16:26:44.585800", + "modified": "2016-02-22 09:33:19.749571", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index ceff05a941..106bba2a8d 100755 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -17,6 +17,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Barcode", @@ -41,6 +42,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -64,6 +66,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -92,6 +95,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -115,6 +119,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Name", @@ -140,6 +145,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -164,6 +170,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -191,6 +198,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -213,6 +221,7 @@ "fieldtype": "Attach", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image", @@ -237,6 +246,7 @@ "fieldtype": "Image", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Image View", @@ -262,6 +272,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Received and Accepted", @@ -285,6 +296,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recd Quantity", @@ -312,6 +324,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Accepted Quantity", @@ -339,6 +352,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rejected Quantity", @@ -366,6 +380,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -388,6 +403,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "UOM", @@ -416,6 +432,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Stock UOM", @@ -444,6 +461,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Conversion Factor", @@ -471,6 +489,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rate and Amount", @@ -494,6 +513,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate", @@ -519,6 +539,7 @@ "fieldtype": "Percent", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Discount on Price List Rate (%)", @@ -542,6 +563,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -564,6 +586,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Price List Rate (Company Currency)", @@ -588,6 +611,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -610,6 +634,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Rate", @@ -638,6 +663,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Amount", @@ -664,6 +690,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -686,6 +713,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rate (Company Currency)", @@ -714,6 +742,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amount (Company Currency)", @@ -742,6 +771,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Pricing Rule", @@ -766,6 +796,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -789,6 +820,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate", @@ -814,6 +846,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount", @@ -839,6 +872,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -862,6 +896,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Rate (Company Currency)", @@ -887,6 +922,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Net Amount (Company Currency)", @@ -912,6 +948,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Warehouse and Reference", @@ -935,6 +972,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Accepted Warehouse", @@ -963,6 +1001,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rejected Warehouse", @@ -991,6 +1030,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Quality Inspection", @@ -1017,6 +1057,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1040,6 +1081,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Purchase Order", @@ -1068,6 +1110,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Required By", @@ -1093,6 +1136,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Qty as per Stock UOM", @@ -1120,6 +1164,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1143,6 +1188,7 @@ "fieldtype": "Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Serial No", @@ -1168,6 +1214,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Batch No", @@ -1194,6 +1241,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -1218,6 +1266,7 @@ "fieldtype": "Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Rejected Serial No", @@ -1241,6 +1290,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1264,6 +1314,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Project Name", @@ -1290,6 +1341,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Cost Center", @@ -1314,6 +1366,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Prevdoc Doctype", @@ -1339,6 +1392,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Purchase Order Item No", @@ -1366,6 +1420,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -1388,6 +1443,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "BOM", @@ -1413,6 +1469,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Billed Amt", @@ -1437,6 +1494,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Landed Cost Voucher Amount", @@ -1460,6 +1518,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Brand", @@ -1487,6 +1546,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Item Group", @@ -1513,6 +1573,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Raw Materials Supplied Cost", @@ -1541,6 +1602,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Amount", @@ -1569,6 +1631,7 @@ "fieldtype": "Currency", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Valuation Rate", @@ -1595,9 +1658,10 @@ "collapsible": 0, "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", "fieldname": "item_tax_rate", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Item Tax Rate", @@ -1623,6 +1687,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Page Break", @@ -1650,7 +1715,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-01-15 04:20:38.803896", + "modified": "2016-02-22 09:33:38.187041", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item", diff --git a/erpnext/utilities/doctype/sms_log/sms_log.js b/erpnext/utilities/doctype/sms_log/sms_log.js new file mode 100644 index 0000000000..f5358e8409 --- /dev/null +++ b/erpnext/utilities/doctype/sms_log/sms_log.js @@ -0,0 +1,8 @@ +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('SMS Log', { + refresh: function(frm) { + + } +}); diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json index bf704cd797..0df91f7a71 100644 --- a/erpnext/utilities/doctype/sms_log/sms_log.json +++ b/erpnext/utilities/doctype/sms_log/sms_log.json @@ -16,6 +16,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sender Name", @@ -23,6 +24,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -38,6 +40,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sent On", @@ -45,6 +48,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -60,12 +64,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -82,6 +88,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Message", @@ -89,6 +96,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -104,6 +112,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -112,6 +121,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -127,6 +137,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "No of Requested SMS", @@ -134,6 +145,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -146,9 +158,10 @@ "bold": 0, "collapsible": 0, "fieldname": "requested_numbers", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Requested Numbers", @@ -156,6 +169,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -171,12 +185,14 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -193,6 +209,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "No of Sent SMS", @@ -200,6 +217,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -212,9 +230,10 @@ "bold": 0, "collapsible": 0, "fieldname": "sent_to", - "fieldtype": "Small Text", + "fieldtype": "Code", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Sent To", @@ -223,6 +242,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -241,7 +261,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-11-16 06:29:57.793449", + "modified": "2016-02-22 09:36:01.153402", "modified_by": "Administrator", "module": "Utilities", "name": "SMS Log", From da297dcfc51b194a8e1be04b82f286beecfe2aeb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 24 Feb 2016 14:37:38 +0530 Subject: [PATCH 34/49] [translations] --- erpnext/translations/ar.csv | 6 +- erpnext/translations/bg.csv | 6 +- erpnext/translations/bn.csv | 6 +- erpnext/translations/bs.csv | 14 +- erpnext/translations/ca.csv | 6 +- erpnext/translations/cs.csv | 6 +- erpnext/translations/da-DK.csv | 6 +- erpnext/translations/da.csv | 6 +- erpnext/translations/de.csv | 6 +- erpnext/translations/el.csv | 6 +- erpnext/translations/es-PE.csv | 6 +- erpnext/translations/es.csv | 6 +- erpnext/translations/et.csv | 6 +- erpnext/translations/fa.csv | 6 +- erpnext/translations/fi.csv | 6 +- erpnext/translations/fr.csv | 200 +++++++++++----------- erpnext/translations/gu.csv | 6 +- erpnext/translations/he.csv | 6 +- erpnext/translations/hi.csv | 6 +- erpnext/translations/hr.csv | 60 +++---- erpnext/translations/hu.csv | 6 +- erpnext/translations/id.csv | 6 +- erpnext/translations/it.csv | 6 +- erpnext/translations/ja.csv | 6 +- erpnext/translations/km.csv | 6 +- erpnext/translations/kn.csv | 6 +- erpnext/translations/ko.csv | 46 ++--- erpnext/translations/lv.csv | 6 +- erpnext/translations/mk.csv | 6 +- erpnext/translations/ml.csv | 6 +- erpnext/translations/mr.csv | 6 +- erpnext/translations/ms.csv | 6 +- erpnext/translations/my.csv | 6 +- erpnext/translations/nl.csv | 90 +++++----- erpnext/translations/no.csv | 6 +- erpnext/translations/pl.csv | 298 ++++++++++++++++----------------- erpnext/translations/pt-BR.csv | 24 +-- erpnext/translations/pt.csv | 6 +- erpnext/translations/ro.csv | 14 +- erpnext/translations/ru.csv | 6 +- erpnext/translations/sk.csv | 6 +- erpnext/translations/sl.csv | 6 +- erpnext/translations/sq.csv | 6 +- erpnext/translations/sr.csv | 6 +- erpnext/translations/sv.csv | 6 +- erpnext/translations/ta.csv | 6 +- erpnext/translations/te.csv | 6 +- erpnext/translations/th.csv | 6 +- erpnext/translations/tr.csv | 24 +-- erpnext/translations/uk.csv | 6 +- erpnext/translations/ur.csv | 6 +- erpnext/translations/vi.csv | 6 +- erpnext/translations/zh-cn.csv | 6 +- erpnext/translations/zh-tw.csv | 6 +- 54 files changed, 520 insertions(+), 520 deletions(-) diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv index 79a1134f5c..350a3f1341 100644 --- a/erpnext/translations/ar.csv +++ b/erpnext/translations/ar.csv @@ -832,7 +832,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,لا ترسل تذك DocType: Opportunity,Walk In,عميل غير مسجل apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,الأسهم مقالات DocType: Item,Inspection Criteria,التفتيش معايير -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,شجرة مراكز التكلفة financial . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,شجرة مراكز التكلفة finanial . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,نقلها apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,أبيض @@ -1224,7 +1224,7 @@ DocType: Employee External Work History,Total Experience,مجموع الخبرة apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,تدفق النقد من الاستثمار apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم -DocType: Material Request Item,Sales Order,ترتيب المبيعات لا +DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا DocType: Item Group,Item Group Name,البند اسم المجموعة apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,المواد نقل لصناعة @@ -1579,7 +1579,7 @@ DocType: Journal Entry,Accounts Receivable,حسابات القبض DocType: Address Template,This format is used if country specific format is not found,ويستخدم هذا الشكل إذا لم يتم العثور على صيغة محددة البلاد DocType: Production Order,Use Multi-Level BOM,استخدام متعدد المستويات BOM DocType: Bank Reconciliation,Include Reconciled Entries,وتشمل مقالات التوفيق -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,شجرة حسابات financial . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,شجرة حسابات finanial . DocType: Leave Control Panel,Leave blank if considered for all employee types,ترك فارغا إذا نظرت لجميع أنواع موظف DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,يجب أن يكون نوع الحساب {0} 'أصول ثابتة' حيث أن الصنف {1} من ضمن الأصول diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv index 61bb51d0c0..8eade5a7af 100644 --- a/erpnext/translations/bg.csv +++ b/erpnext/translations/bg.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпраща DocType: Opportunity,Walk In,Влизам apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток влизания DocType: Item,Inspection Criteria,Критериите за инспекция -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Дърво на financial разходни центрове. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Дърво на finanial разходни центрове. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Прехвърлят apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бял @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Общо Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични потоци от инвестиционна apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси -DocType: Material Request Item,Sales Order,Продажбите Заповед № +DocType: Material Request Item,Sales Order No,Продажбите Заповед № DocType: Item Group,Item Group Name,Име на артикул Group apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взети apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Прехвърляне Материали за Производство @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Вземания DocType: Address Template,This format is used if country specific format is not found,"Този формат се използва, ако не се намери специфичен формат за държавата" DocType: Production Order,Use Multi-Level BOM,Използвайте Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Включи примирени влизания -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Дърво на financial сметки. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Дърво на finanial сметки. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставете празно, ако считат за всички видове наети лица" DocType: Landed Cost Voucher,Distribute Charges Based On,Разпредели такси на базата на apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} трябва да е от тип ""Дълготраен Актив"" като елемент {1} е Актив," diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv index eb653f9c0f..6210822dd1 100644 --- a/erpnext/translations/bn.csv +++ b/erpnext/translations/bn.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচা DocType: Opportunity,Walk In,প্রবেশ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,শেয়ার সাজপোশাকটি DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial খরচ কেন্দ্র বৃক্ষ. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial খরচ কেন্দ্র বৃক্ষ. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,স্থানান্তরিত apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,সাদা @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,মোট অভিজ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ -DocType: Material Request Item,Sales Order,বিক্রয় আদেশ কোন +DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ধরা apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,গ্রহনযোগ্য অ্ DocType: Address Template,This format is used if country specific format is not found,দেশ নির্দিষ্ট ফরম্যাটে পাওয়া না গেলে এই বিন্যাস ব্যবহার করা হয়েছে DocType: Production Order,Use Multi-Level BOM,মাল্টি লেভেল BOM ব্যবহার DocType: Bank Reconciliation,Include Reconciled Entries,মীমাংসা দাখিলা অন্তর্ভুক্ত -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial অ্যাকাউন্টের বৃক্ষ. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial অ্যাকাউন্টের বৃক্ষ. DocType: Leave Control Panel,Leave blank if considered for all employee types,সব কর্মচারী ধরনের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন DocType: Landed Cost Voucher,Distribute Charges Based On,বিতরণ অভিযোগে নির্ভরশীল apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,আইটেম {1} একটি অ্যাসেট আইটেম হিসাবে অ্যাকাউন্ট {0} 'স্থায়ী সম্পদ' ধরনের হতে হবে diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv index 6c9deaf4d6..353e10b1fc 100644 --- a/erpnext/translations/bs.csv +++ b/erpnext/translations/bs.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetn DocType: Opportunity,Walk In,Ulaz u apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock unosi DocType: Item,Inspection Criteria,Inspekcijski Kriteriji -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Drvo financial troška . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Drvo finanial troška . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bijel @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Ukupno Iskustvo apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tok iz ulagačkih apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe -DocType: Material Request Item,Sales Order,Narudžba kupca br +DocType: Material Request Item,Sales Order No,Narudžba kupca br DocType: Item Group,Item Group Name,Naziv grupe artikla apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,Konto potraživanja DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Drvo financial račune . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Drvo finanial račune . DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako smatra za sve tipove zaposlenika DocType: Landed Cost Voucher,Distribute Charges Based On,Podijelite Optužbe na osnovu apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} mora biti tipa 'Nepokretne imovine' jer je proizvod {1} imovina proizvoda @@ -1697,7 +1697,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +793,Please DocType: Item,Weight UOM,Težina UOM DocType: Employee,Blood Group,Krvna grupa DocType: Purchase Invoice Item,Page Break,Prijelom stranice -DocType: Production Order Operation,Pending,Čekanju +DocType: Production Order Operation,Pending,Čekanje DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti odsustvo aplikacije određenu zaposlenog apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,uredske opreme DocType: Purchase Invoice Item,Qty,Kol @@ -2236,7 +2236,7 @@ apps/erpnext/erpnext/public/js/pos/pos.js +356,Pay,Platiti apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To datuma i vremena DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke -apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnostima na čekanju +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnosti na čekanju apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen DocType: Payment Gateway,Gateway,Gateway apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip @@ -2857,7 +2857,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar DocType: Sales Partner,Logo,Logo DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili. apps/erpnext/erpnext/stock/get_item_details.py +101,No Item with Serial No {0},No Stavka s rednim brojem {0} -apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Open Obavijesti +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvorena obavjestenja apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direktni troškovi apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi @@ -3444,7 +3444,7 @@ DocType: Manufacturing Settings,Manufacturing Settings,Proizvodnja Settings apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-pošte apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master DocType: Stock Entry Detail,Stock Entry Detail,Kataloški Stupanje Detalj -apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daily Podsjetnici +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Dnevni podsjetnik apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,New Account Name,Naziv novog računa DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv index 8a8d4bf02a..6c4e774c67 100644 --- a/erpnext/translations/ca.csv +++ b/erpnext/translations/ca.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat re DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entrades d'arxiu DocType: Item,Inspection Criteria,Criteris d'Inspecció -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Arbre de Centres de Cost financial. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Arbre de Centres de Cost finanial. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferit apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanc @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Experiència total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux d'efectiu d'inversió apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges -DocType: Material Request Item,Sales Order,Ordre de Venda No +DocType: Material Request Item,Sales Order No,Ordre de Venda No DocType: Item Group,Item Group Name,Nom del Grup d'Articles apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materials de transferència per Fabricació @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,Comptes Per Cobrar DocType: Address Template,This format is used if country specific format is not found,Aquest format s'utilitza si no hi ha el format específic de cada país DocType: Production Order,Use Multi-Level BOM,Utilitzeu Multi-Nivell BOM DocType: Bank Reconciliation,Include Reconciled Entries,Inclogui els comentaris conciliades -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Arbre dels comptes financers +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Arbre dels comptes financers DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixar en blanc si es considera per a tot tipus d'empleats DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir els càrrecs en base a apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,El compte {0} ha de ser del tipus 'd'actius fixos' perquè l'article {1} és un element d'actiu diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv index 09ae949169..32aa07e0ab 100644 --- a/erpnext/translations/cs.csv +++ b/erpnext/translations/cs.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměst DocType: Opportunity,Walk In,Vejít apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Sklad Příspěvky DocType: Item,Inspection Criteria,Inspekční Kritéria -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Strom financial nákladových středisek. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Strom finanial nákladových středisek. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Převedené apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bílá @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Celková zkušenost apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Balení Slip (y) zrušeno apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peněžní tok z investičních apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky -DocType: Material Request Item,Sales Order,Prodejní objednávky No +DocType: Material Request Item,Sales Order No,Prodejní objednávky No DocType: Item Group,Item Group Name,Položka Název skupiny apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Přenos Materiály pro výrobu @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,Pohledávky DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen" DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Strom financial účtů. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Strom finanial účtů. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců" DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka" diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv index e99c8414a0..5d97ef9f58 100644 --- a/erpnext/translations/da-DK.csv +++ b/erpnext/translations/da-DK.csv @@ -721,7 +721,7 @@ DocType: Workstation,Electricity Cost,Elektricitet Omkostninger DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser DocType: Opportunity,Walk In,Walk In DocType: Item,Inspection Criteria,Inspektion Kriterier -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tree of financial Cost Centers. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tree of finanial Cost Centers. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid @@ -1076,7 +1076,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +65,Financial Year Start Date,Reg DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (r) annulleret apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter -DocType: Material Request Item,Sales Order,Salg bekendtgørelse nr +DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr DocType: Item Group,Item Group Name,Item Group Name apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling @@ -1390,7 +1390,7 @@ DocType: Journal Entry,Accounts Receivable,Tilgodehavender DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes" DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Tree of financial konti. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Tree of finanial konti. DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv index 044288120b..8dda22dbd2 100644 --- a/erpnext/translations/da.csv +++ b/erpnext/translations/da.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejde DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Angivelser DocType: Item,Inspection Criteria,Inspektion Kriterier -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tree of financial Cost Centers. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tree of finanial Cost Centers. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (r) annulleret apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Pengestrømme fra investeringsaktivitet apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter -DocType: Material Request Item,Sales Order,Salg bekendtgørelse nr +DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr DocType: Item Group,Item Group Name,Item Group Name apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Tilgodehavender DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes" DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Tree of financial konti. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Tree of finanial konti. DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index 33ea1a3959..a483b9f2f1 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -831,7 +831,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeb DocType: Opportunity,Walk In,Laufkundschaft apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Lizenz Einträge DocType: Item,Inspection Criteria,Prüfkriterien -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Finanz-Kostenstellen-Struktur +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanz-Kostenstellen-Struktur apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Übergeben apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.) apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Weiß @@ -1222,7 +1222,7 @@ DocType: Employee External Work History,Total Experience,Gesamterfahrung apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packzettel storniert apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cashflow aus Investitionen apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten -DocType: Material Request Item,Sales Order,Kundenauftrags-Nr. +DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr. DocType: Item Group,Item Group Name,Name der Artikelgruppe apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Genommen apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Material der Fertigung übergeben @@ -1576,7 +1576,7 @@ DocType: Journal Entry,Accounts Receivable,Forderungen DocType: Address Template,This format is used if country specific format is not found,"Dieses Format wird verwendet, wenn ein länderspezifisches Format nicht gefunden werden kann" DocType: Production Order,Use Multi-Level BOM,Mehrstufige Stückliste verwenden DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen einbeziehen -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Finanzkontenstruktur +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanzkontenstruktur DocType: Leave Control Panel,Leave blank if considered for all employee types,"Freilassen, wenn für alle Mitarbeitertypen gültig" DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Anlagegut"" sein, weil der Artikel {1} ein Anlagegut ist" diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv index f0dba78aac..b73df2ab56 100644 --- a/erpnext/translations/el.csv +++ b/erpnext/translations/el.csv @@ -831,7 +831,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνε DocType: Opportunity,Walk In,Προχωρήστε apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Χρηματιστήριο Καταχωρήσεις DocType: Item,Inspection Criteria,Κριτήρια ελέγχου -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Δέντρο οικονομικών κεντρών κόστους. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Δέντρο οικονομικών κεντρών κόστους. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Μεταφέρονται apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Λευκό @@ -1222,7 +1222,7 @@ DocType: Employee External Work History,Total Experience,Συνολική εμπ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης -DocType: Material Request Item,Sales Order,Αρ. παραγγελίας πώλησης +DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Πάρθηκε apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση @@ -1576,7 +1576,7 @@ DocType: Journal Entry,Accounts Receivable,Εισπρακτέοι λογαρια DocType: Address Template,This format is used if country specific format is not found,Αυτή η μορφοποίηση χρησιμοποιείται εάν δεν βρεθεί ειδική μορφοποίηση χώρας DocType: Production Order,Use Multi-Level BOM,Χρησιμοποιήστε Λ.Υ. πολλαπλών επιπέδων. DocType: Bank Reconciliation,Include Reconciled Entries,Συμπεριέλαβε συμφωνημένες καταχωρήσεις -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Δέντρο οικονομικών λογαριασμών. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Δέντρο οικονομικών λογαριασμών. DocType: Leave Control Panel,Leave blank if considered for all employee types,Άφησε το κενό αν ισχύει για όλους τους τύπους των υπαλλήλων DocType: Landed Cost Voucher,Distribute Charges Based On,Επιμέρησε τα κόστη μεταφοράς σε όλα τα είδη. apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου 'παγίων' καθώς το είδος {1} είναι ένα περιουσιακό στοιχείο diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv index 14f4d780d8..f16e585747 100644 --- a/erpnext/translations/es-PE.csv +++ b/erpnext/translations/es-PE.csv @@ -742,7 +742,7 @@ DocType: Workstation,Electricity Cost,Coste de electricidad DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado DocType: Opportunity,Walk In,Entrar DocType: Item,Inspection Criteria,Criterios de Inspección -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Árbol de Centros de Costos Financieros. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Árbol de Centros de Costos Financieros. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco @@ -1099,7 +1099,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +65,Financial Year Start Date,Ini DocType: Employee External Work History,Total Experience,Experiencia Total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s) apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito -DocType: Material Request Item,Sales Order,Orden de Venta No +DocType: Material Request Item,Sales Order No,Orden de Venta No DocType: Item Group,Item Group Name,Nombre del grupo de artículos apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación @@ -1416,7 +1416,7 @@ DocType: Journal Entry,Accounts Receivable,Cuentas por Cobrar DocType: Address Template,This format is used if country specific format is not found,Este formato se utiliza si no se encuentra un formato específico del país DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM) Multi-Nivel DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Árbol de las cuentas financieras +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Árbol de las cuentas financieras DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv index d39c77c0c2..7d4a3469e6 100644 --- a/erpnext/translations/es.csv +++ b/erpnext/translations/es.csv @@ -830,7 +830,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordator DocType: Opportunity,Walk In,Entrar apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entradas de archivo DocType: Item,Inspection Criteria,Criterios de inspección -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Árbol de centros de costos financieros. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Árbol de centros de costos financieros. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco @@ -1221,7 +1221,7 @@ DocType: Employee External Work History,Total Experience,Experiencia total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flujo de efectivo de inversión apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE -DocType: Material Request Item,Sales Order,Orden de venta No. +DocType: Material Request Item,Sales Order No,Orden de venta No. DocType: Item Group,Item Group Name,Nombre del grupo de productos apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferir materiales para producción @@ -1575,7 +1575,7 @@ DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar DocType: Address Template,This format is used if country specific format is not found,Este formato será utilizado para todos los documentos si no se encuentra un formato específico para el país. DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM) Multi-Nivel DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Árbol de cuentas financieras +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Árbol de cuentas financieras DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv index a593e3536a..c6a9bd6daa 100644 --- a/erpnext/translations/et.csv +++ b/erpnext/translations/et.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ärge saatke Tööta DocType: Opportunity,Walk In,Sisse astuma apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock kanded DocType: Item,Inspection Criteria,Inspekteerimiskriteeriumitele -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tree of financial kuluallikad. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tree of finanial kuluallikad. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Siirdus apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Valge @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Kokku Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakkesedel (s) tühistati apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Rahavood investeerimistegevusest apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude -DocType: Material Request Item,Sales Order,Müük korraldusega nr +DocType: Material Request Item,Sales Order No,Müük korraldusega nr DocType: Item Group,Item Group Name,Punkt Group Nimi apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Võtnud apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materjalid Tootmine @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Arved DocType: Address Template,This format is used if country specific format is not found,"Seda vormi kasutatakse siis, kui riik konkreetse vormi ei leitud" DocType: Production Order,Use Multi-Level BOM,Kasutage Multi-Level Bom DocType: Bank Reconciliation,Include Reconciled Entries,Kaasa Lepitatud kanded -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Tree of financial kontosid. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Tree of finanial kontosid. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Jäta tühjaks, kui arvestada kõikide töötajate tüübid" DocType: Landed Cost Voucher,Distribute Charges Based On,Jaota põhinevatest tasudest apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} peab olema tüübiga "Põhivarade" nagu Punkt {1} on varade kirje diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv index 8cc353ebd3..3c27fcd8d8 100644 --- a/erpnext/translations/fa.csv +++ b/erpnext/translations/fa.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند DocType: Opportunity,Walk In,راه رفتن در apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,مطالب سهام DocType: Item,Inspection Criteria,معیار بازرسی -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,درخت مراکز هزینه financial. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,درخت مراکز هزینه finanial. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,انتقال apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,سفید @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,تجربه ها apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات -DocType: Material Request Item,Sales Order,سفارش فروش بدون +DocType: Material Request Item,Sales Order No,سفارش فروش بدون DocType: Item Group,Item Group Name,مورد نام گروه apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,گرفته apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,انتقال مواد برای تولید @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,حسابهای دریافتنی DocType: Address Template,This format is used if country specific format is not found,این قالب استفاده شده است اگر قالب خاص کشور یافت نشد DocType: Production Order,Use Multi-Level BOM,استفاده از چند سطح BOM DocType: Bank Reconciliation,Include Reconciled Entries,شامل مطالب آشتی -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,درخت حساب financial. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,درخت حساب finanial. DocType: Leave Control Panel,Leave blank if considered for all employee types,خالی بگذارید اگر برای همه نوع کارمند در نظر گرفته DocType: Landed Cost Voucher,Distribute Charges Based On,توزیع اتهامات بر اساس apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,حساب {0} باید از نوع 'دارائی های ثابت' به عنوان مورد {1} مورد دارایی است diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv index a73b0586c8..45b53a6299 100644 --- a/erpnext/translations/fi.csv +++ b/erpnext/translations/fi.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,älä lähetä työn DocType: Opportunity,Walk In,kävele sisään apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Viestit DocType: Item,Inspection Criteria,tarkastuskriteerit -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,kustannuspaikkapuu +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,kustannuspaikkapuu apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,siirretty apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin) apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,valkoinen @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,kustannukset yhteensä apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,pakkauslaput peruttu apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Investointien rahavirta apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut -DocType: Material Request Item,Sales Order,"myyntitilaus, numero" +DocType: Material Request Item,Sales Order No,"myyntitilaus, numero" DocType: Item Group,Item Group Name,"tuoteryhmä, nimi" apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,otettu apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,materiaalisiirto tuotantoon @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,saatava tilit DocType: Address Template,This format is used if country specific format is not found,tätä muotoa käytetään ellei alueelle määriteltyä muotoa löydy DocType: Production Order,Use Multi-Level BOM,käytä useampi asteista BOM:ia DocType: Bank Reconciliation,Include Reconciled Entries,sisällytä täsmätyt kirjaukset -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,tilipuu +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,tilipuu DocType: Leave Control Panel,Leave blank if considered for all employee types,tyhjä mikäli se pidetään vaihtoehtona kaikissa työntekijä tyypeissä DocType: Landed Cost Voucher,Distribute Charges Based On,toimitusmaksut perustuen apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,tili {0} tulee olla 'pitkaikaiset vastaavat' tili sillä tuotella {1} on tasearvo diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv index 267a876b14..5e733007ce 100644 --- a/erpnext/translations/fr.csv +++ b/erpnext/translations/fr.csv @@ -3,8 +3,8 @@ DocType: Cost Center,"Select Monthly Distribution, if you want to track based on DocType: Employee,Divorced,Divorcé apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,Warning: Same item has been entered multiple times.,Attention : le même élément a été saisi plusieurs fois. apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articles déjà synchronisés -DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autorisera à être ajouté à plusieurs reprises dans une transaction -apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler Matériau Visitez {0} avant d'annuler cette revendication de garantie +DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autorisera l'article a être ajouté à plusieurs reprises dans une transaction +apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler la visite matérial {0} avant d'annuler cette réclamation de garantie apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produits de consommation apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,S'il vous plaît sélectionner partie Type premier DocType: Item,Customer Items,Articles du clients @@ -140,7 +140,7 @@ DocType: Employee Education,Under Graduate,Non Diplômé apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,cible sur DocType: BOM,Total Cost,Coût total apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Journal d'activité: -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +192,Item {0} does not exist in the system or has expired,Point {0} n'existe pas dans le système ou a expiré +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +192,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilier apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Relevé de compte apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,médicaments @@ -155,7 +155,7 @@ DocType: Sales Invoice Item,Delivered By Supplier,Livré Par Fournisseur DocType: SMS Center,All Contact,Tout contact apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salaire Annuel DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l'exercice -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Facteur de conversion de l'unité de mesure par défaut doit être de 1 à la ligne {0} +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Dépenses stock DocType: Newsletter,Email Sent?,Courriel envoyés? DocType: Journal Entry,Contra Entry,Contra Entrée DocType: Production Order Operation,Show Time Logs,Show Time Logs @@ -194,7 +194,7 @@ apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and disco apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Cette fois identifier des conflits avec {0} pour {1} {2} apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Compte {0} doit être SAMES comme crédit du compte dans la facture d'achat en ligne {0} apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'article {0} -DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la liste des prix Taux (%) +DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la liste des prix (%) DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,Out Value,Valeur hors DocType: Production Planning Tool,Sales Orders,Commandes clients @@ -230,7 +230,7 @@ DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Pas de description indiquée apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Demande d'achat. apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé -apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,Vous n'êtes pas autorisé à ajouter ou mettre à jour les entrées avant {0} +apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,La date de relève doit être postérieure à la date de l'adhésion apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Congés par Année apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,S'il vous plaît mettre Naming série pour {0} via Configuration> Paramètres> Série Naming DocType: Time Log,Will be updated when batched.,Sera mis à jour lorsque lots. @@ -305,7 +305,7 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for DocType: Workstation,Rent Cost,louer coût apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,S'il vous plaît sélectionner le mois et l'année DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Entrez Identifiant courriels séparé par des virgules, la facture sera envoyée automatiquement à la date particulière" -DocType: Employee,Company Email,E-mail entreprise +DocType: Employee,Company Email,E-mail société DocType: GL Entry,Debit Amount in Account Currency,Montant de débit en compte Devises DocType: Shipping Rule,Valid for Countries,Valable pour les Pays DocType: Features Setup,"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.","Tous les champs importation connexes comme monnaie , taux de conversion , total d'importation , importation grande etc totale sont disponibles en Achat réception , Devis fournisseur , Facture d'achat , bon de commande , etc" @@ -351,7 +351,7 @@ DocType: Authorization Rule,Approving User (above authorized value),Approuver l apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Solde de crédit DocType: Employee,Widowed,Veuf DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Articles à être demandés, qui sont "Out of Stock" compte tenu de tous les entrepôts basés sur quantité projetée et qté minimum" -DocType: Workstation,Working Hours,Journée de travail +DocType: Workstation,Working Hours,Heures de travail DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante. apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs règles de tarification continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité à résoudre les conflits." ,Purchase Register,Achat S'inscrire @@ -419,7 +419,7 @@ DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et DocType: Journal Entry,Accounts Payable,Comptes à payer apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Ajouter abonnés apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" N'existe pas" -DocType: Pricing Rule,Valid Upto,Valide jusqu'à +DocType: Pricing Rule,Valid Upto,Valide jusqu'au apps/erpnext/erpnext/public/js/setup_wizard.js +234,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus . apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Choisissez votre langue apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur les compte , si regroupées par compte" @@ -477,7 +477,7 @@ To distribute a budget using this distribution, set this **Monthly Distribution* Pour distribuer un budget en utilisant cette distribution, réglez ce ** distribution mensuelle ** ** dans le centre de coûts **" apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,S'il vous plaît sélectionnez Société et partie Type premier -apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une même opération +apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Exercice comptable / financier annuel apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Les valeurs accumulées apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé , série n ne peut pas être fusionné" DocType: Project Task,Project Task,Groupe de Projet @@ -525,7 +525,7 @@ apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} DocType: Buying Settings,Settings for Buying Module,Réglages pour l'achat Module apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,S'il vous plaît entrer Reçu d'achat en premier DocType: Buying Settings,Supplier Naming By,Fournisseur de nommage par -DocType: Activity Type,Default Costing Rate,Taux de défaut Costing +DocType: Activity Type,Default Costing Rate,Coût de revient par défaut apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +656,Maintenance Schedule,Calendrier d'entretien apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Ensuite, les règles de tarification sont filtrés sur la base de clientèle, par groupe de clients, Territoire, fournisseur, le type de fournisseur, campagne, etc Sales Partner" apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Variation nette des stocks @@ -578,7 +578,7 @@ DocType: Employee,Provide email id registered in company,Fournir id courriel enr DocType: Hub Settings,Seller City,Vendeur Ville DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le : DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme -apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Point a variantes. +apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,L'article a des variantes. apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable DocType: Bin,Stock Value,Valeur de l'action apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre @@ -700,7 +700,7 @@ DocType: Item,Website Warehouse,Entrepôt site web DocType: Payment Reconciliation,Minimum Invoice Amount,Le minimum de facturation DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera généré par exemple 05, 28 etc" apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5 -apps/erpnext/erpnext/config/accounts.py +179,C-Form records,Enregistrements C -Form +apps/erpnext/erpnext/config/accounts.py +179,C-Form records,Formulaire - C Enregistrements apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clients et Fournisseurs DocType: Email Digest,Email Digest Settings,Paramètres de messagerie Digest apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,En charge les requêtes des clients. @@ -709,7 +709,7 @@ DocType: Bin,Moving Average Rate,Moving Prix moyen DocType: Production Planning Tool,Select Items,Sélectionner les objets apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2} DocType: Maintenance Visit,Completion Status,L'état d'achèvement -DocType: Production Order,Target Warehouse,Cible d'entrepôt +DocType: Production Order,Target Warehouse,Entrepôt cible DocType: Item,Allow over delivery or receipt upto this percent,autoriser plus de livraison ou de réception jusqu'à ce pour cent apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,"Stock réconciliation peut être utilisé pour mettre à jour le stock à une date donnée , généralement selon l'inventaire physique ." DocType: Upload Attendance,Import Attendance,Importer Participation @@ -742,7 +742,7 @@ DocType: SMS Log,Requested Numbers,Numéros demandés apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,L'évaluation des performances. DocType: Sales Invoice Item,Stock Details,Stock Détails apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet -apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point de vente +apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-de-vente apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'" DocType: Account,Balance must be,Solde doit être DocType: Hub Settings,Publish Pricing,Publier Prix @@ -763,13 +763,13 @@ apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subs apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +583,Purchase Receipt,Achat Réception ,Received Items To Be Billed,Articles reçus à facturer DocType: Employee,Ms,Mme -apps/erpnext/erpnext/config/accounts.py +158,Currency exchange rate master.,Campagne . # # # # +apps/erpnext/erpnext/config/accounts.py +158,Currency exchange rate master.,Taux de change de maître. apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau de Temps dans les prochains {0} jours pour l'Opération {1} DocType: Production Order,Plan material for sub-assemblies,matériau de plan pour les sous-ensembles apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +422,BOM {0} must be active,BOM {0} doit être actif apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,S'il vous plaît sélectionner le type de document premier apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto panier -apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,S'il vous plaît créer la structure des salaires pour les employés {0} +apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuler les visites matériaux {0} avant d'annuler cette visite de maintenance DocType: Salary Slip,Leave Encashment Amount,Laisser Montant Encaissement apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},compensatoire DocType: Purchase Receipt Item Supplied,Required Qty,Quantité requise @@ -833,7 +833,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer des e DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock entrées DocType: Item,Inspection Criteria,Critères d'inspection -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Il ne faut pas mettre à jour les entrées de plus que {0} +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Arborescence des centres de coûts financiers . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transféré apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Téléchargez votre tête et le logo lettre. (Vous pouvez les modifier ultérieurement). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanc @@ -860,7 +860,7 @@ DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost r DocType: Company,Default Terms,Conditions contractuelles par défaut DocType: Features Setup,"If checked, only Description, Quantity, Rate and Amount are shown in print of Item table. Any extra field is shown under 'Description' column.","Si elle est cochée, seule description, la quantité, dose et la masse sont présentés en version imprimée de la table d'objet. Tous les champs supplémentaire est montré dans la colonne "Description"." DocType: Packing Slip Item,Packing Slip Item,Emballage article Slip -DocType: POS Profile,Cash/Bank Account,Trésorerie / Compte bancaire +DocType: POS Profile,Cash/Bank Account,Compte caisse / banque apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur. DocType: Delivery Note,Delivery To,Livrer à apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Table attribut est obligatoire @@ -882,8 +882,8 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'approbateur de dépenses pour cet enregistrement . S'il vous plaît mettre à jour le «Status» et Save DocType: Serial No,Creation Document No,Création document n DocType: Issue,Issue,Question -apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte ne correspond pas avec la Compagnie -apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour objet variantes. par exemple la taille, la couleur, etc." +apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte ne correspond pas avec la société +apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour les variantes de l'article. Par ex. la taille, la couleur, etc." apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Entrepôt apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe DocType: BOM Operation,Operation,Opération @@ -905,7 +905,7 @@ DocType: Shipping Rule Condition,Shipping Rule Condition,Condition règle de liv DocType: Features Setup,Miscelleneous,Divers DocType: Holiday List,Get Weekly Off Dates,Obtenez hebdomadaires Dates Off apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Évaluation de l'objet mis à jour -DocType: Sales Person,Select company name first.,Sélectionnez le nom de la première entreprise. +DocType: Sales Person,Select company name first.,Sélectionnez en premier le nom de la société. apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des fournisseurs. apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},A {0} | {1} {2} @@ -925,7 +925,7 @@ apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.p DocType: Email Digest,Annual Expense,Dépense annuelle DocType: SMS Center,Total Characters,Nombre de caractères apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},S'il vous plaît sélectionner dans le champ BOM BOM pour objet {0} -DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Détail Facture +DocType: C-Form Invoice Detail,C-Form Invoice Detail,Formulaire - C Détail de la facture DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rapprochement des paiements de facture apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contribution% DocType: Item,website page link,Lien vers page web @@ -942,7 +942,7 @@ DocType: Salary Slip,Deductions,Déductions DocType: Purchase Invoice,Start date of current invoice's period,Date de début de la période de facturation en cours apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Connexion lot a été facturé. DocType: Salary Slip,Leave Without Pay,Congé sans solde -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacité erreur de planification +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Erreur planification de capacité ,Trial Balance for Party,Balance pour le Parti DocType: Lead,Consultant,Consultant DocType: Salary Slip,Earnings,Bénéfices @@ -1030,13 +1030,13 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +33,Item {0} must be apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,à DocType: Item,Lead Time in days,Délai en jours ,Accounts Payable Summary,Le résumé des comptes à payer -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,Not authorized to edit frozen Account {0},Message totale (s ) +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,Not authorized to edit frozen Account {0},N'êtes pas autorisé à modifier le compte gelé {0} DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître . apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés" apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit DocType: Employee,Employee Number,Numéro d'employé -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Entrées avant {0} sont gelés +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},No de dossier en fonction. Essayez dès No de dossier {0} ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive ) apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Point 2 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Responsable du compte {0} a été crée @@ -1064,7 +1064,7 @@ DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit" apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +484,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sub-contracted Item,Exercice Date de début -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipements de capitaux +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capitaux immobilisés apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prix règle est d'abord sélectionné sur la base de «postuler en« champ, qui peut être l'article, groupe d'articles ou de marque." DocType: Hub Settings,Seller Website,Site Vendeur apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Pourcentage total alloué à l'équipe de vente devrait être de 100 @@ -1089,7 +1089,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +428,BOM {0} does not belo DocType: Sales Partner,Target Distribution,Distribution cible DocType: Salary Slip,Bank Account No.,No. de compte bancaire DocType: Naming Series,This is the number of the last created transaction with this prefix,Numéro de la dernière transaction créée avec ce préfixe -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},{0} {1} est l'état 'arrêté' +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Valuation Rate nécessaire pour l'article {0} DocType: Quality Inspection Reading,Reading 8,Lecture 8 DocType: Sales Partner,Agent,Agent apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} pour tous les articles est zéro, vous devriez peut-être changer "Distribuer accusations fondées sur '" @@ -1175,9 +1175,9 @@ DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a s Used for Taxes and Charges","Impôt table récupérées par le maître de l'article comme une chaîne et stockée dans ce domaine en détail. Utilisé pour les impôts et frais" apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,L'employé ne peut pas rendre compte à lui-même. -DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé , les entrées sont autorisés pour les utilisateurs restreints ." +DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé , les entrées ne sont autorisés que pour les utilisateurs ayant droit ." DocType: Email Digest,Bank Balance,Solde bancaire -apps/erpnext/erpnext/controllers/accounts_controller.py +467,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptabilité pour {0}: {1} ne peut être faite qu'en monnaie: {2} +apps/erpnext/erpnext/controllers/accounts_controller.py +467,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2} apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,Aucune Structure Salariale actif trouvé pour l'employé {0} et le mois DocType: Job Opening,"Job profile, qualifications required etc.",Non authroized depuis {0} dépasse les limites DocType: Journal Entry Account,Account Balance,Solde du compte @@ -1223,9 +1223,9 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat apps/erpnext/erpnext/public/js/setup_wizard.js +65,Financial Year Start Date,Date de Début de l'exercice financier DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bordereau(x) annulé -apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux de trésorerie d'investissement +apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux de trésorerie des investissements apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fret et d'envoi en sus -DocType: Material Request Item,Sales Order,Ordonnance n ° de vente +DocType: Material Request Item,Sales Order No,Ordonnance n ° de vente DocType: Item Group,Item Group Name,Nom du groupe d'article apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pris apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication @@ -1260,7 +1260,7 @@ DocType: Monthly Distribution,Monthly Distribution,Distribution mensuelle apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Soit quantité de cible ou le montant cible est obligatoire . DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de Production Ventes Ordre DocType: Sales Partner,Sales Partner Target,Cible Sales Partner -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +109,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabilité pour {0} ne peut être effectué qu'en monnaie: {1} +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +109,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabie pour {0} ne peut être effectué qu'en devise: {1} DocType: Pricing Rule,Pricing Rule,Règle de tarification apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Demande de Matériel à Bon de commande DocType: Payment Gateway Account,Payment Success URL,Paiement Succès URL @@ -1340,7 +1340,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify you apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Colonne inconnu : {0} apps/erpnext/erpnext/config/accounts.py +58,Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues. DocType: Quotation,Term Details,Détails terme -DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de la capacité pendant (jours) +DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de capacité pendant (jours) apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur. apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Déclaration de garantie ,Lead Details,Détails du prospect @@ -1350,7 +1350,7 @@ DocType: Bank Reconciliation,From Date,Partir de la date DocType: Shipping Rule Country,Shipping Rule Country,Règle de livraison Pays DocType: Maintenance Visit,Partially Completed,Partiellement réalisé DocType: Leave Type,Include holidays within leaves as leaves,Inclure les jours fériés dans les feuilles que les feuilles -DocType: Sales Invoice,Packed Items,Paniers Articles +DocType: Sales Invoice,Packed Items,Articles emaballés apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,revendication de garantie contre le n ° de série DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Remplacer une nomenclature particulière dans tous les autres nomenclatures où il est utilisé. Il remplacera l'ancien lien BOM, mettre à jour les coûts et régénérer ""BOM explosion Item"" table par nouvelle nomenclature" DocType: Shopping Cart Settings,Enable Shopping Cart,Activer Panier @@ -1393,12 +1393,12 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Pa DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a variantes, alors il ne peut pas être sélectionné dans les ordres de vente, etc." DocType: Lead,Next Contact By,Contact suivant par apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +211,Quantity required for Item {0} in row {1},Quantité requise pour objet {0} à la ligne {1} -apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'objet {1} +apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'article {1} DocType: Quotation,Order Type,Type d'ordre DocType: Purchase Invoice,Notification Email Address,Adresse E-mail de notification DocType: Payment Tool,Find Invoices to Match,Trouver factures pour correspondre ,Item-wise Sales Register,Ventes point-sage S'enregistrer -apps/erpnext/erpnext/public/js/setup_wizard.js +59,"e.g. ""XYZ National Bank""","par exemple ""XYZ Banque Nationale """ +apps/erpnext/erpnext/public/js/setup_wizard.js +59,"e.g. ""XYZ National Bank""","Ex. ""XYZ Banque Nationale """ DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Est-ce Taxes incluses dans le taux de base? apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Cible total apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Panier est activé @@ -1529,7 +1529,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100, ,Item-wise Purchase History,Historique des achats (par Article) apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rouge apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquer sur "" Générer annexe ' pour aller chercher de série n ° ajouté pour objet {0}" -DocType: Account,Frozen,Frozen +DocType: Account,Frozen,Gelé ,Open Production Orders,Commandes ouverte de production DocType: Installation Note,Installation Time,Temps d'installation DocType: Sales Invoice,Accounting Details,Détails Comptabilité @@ -1557,7 +1557,7 @@ DocType: Employee,Resignation Letter Date,Date de lettre de démission apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Les règles de tarification sont encore filtrés en fonction de la quantité. apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répétez Revenu à la clientèle apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de frais'" -apps/erpnext/erpnext/public/js/setup_wizard.js +292,Pair,Assistant de configuration +apps/erpnext/erpnext/public/js/setup_wizard.js +292,Pair,Paire DocType: Bank Reconciliation Detail,Against Account,Sur le compte DocType: Maintenance Schedule Detail,Actual Date,Date Réelle DocType: Item,Has Batch No,A lot no @@ -1580,7 +1580,7 @@ DocType: Journal Entry,Accounts Receivable,Débiteurs DocType: Address Template,This format is used if country specific format is not found,Ce format est utilisé si le format spécifique au pays n'est pas trouvé DocType: Production Order,Use Multi-Level BOM,Utilisez Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les entrées rapprochées -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Arborescence des comptes financiers. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Arborescence des comptes financiers. DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide si cela est jugé pour tous les types d'employés DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer accusations fondées sur apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Le compte {0} doit être de type 'Actif ', l'objet {1} étant un article Actif" @@ -1619,7 +1619,7 @@ DocType: Territory,Classification of Customers by region,Classification des clie DocType: Project,% Tasks Completed,% des tâches terminées DocType: Project,Gross Margin,Marge brute apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,S'il vous plaît entrer en production l'article premier -apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calculée solde du relevé bancaire +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Solde calculé du relevé bancaire apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilisateur désactivé apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Devis DocType: Salary Slip,Total Deduction,Déduction totale @@ -1640,7 +1640,7 @@ DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotation DocType: Expense Claim,Approver,Approbateur ,SO Qty,SO Quantité apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt" -DocType: Appraisal,Calculate Total Score,Calculer Score total +DocType: Appraisal,Calculate Total Score,Calculer résultat total DocType: Supplier Quotation,Manufacturing Manager,Responsable Fabrication apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Compte {0} n'appartient pas à la Société {1} apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages. @@ -1649,7 +1649,7 @@ DocType: Purchase Order Item,To be delivered to customer,Pour être livré à la apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,Time Log Status must be Submitted.,Log Time Etat doit être soumis. apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N ° de série {0} ne fait pas partie de tout entrepôt apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Rangée # -DocType: Purchase Invoice,In Words (Company Currency),En Toutes Lettres (Devise Entreprise) +DocType: Purchase Invoice,In Words (Company Currency),En Toutes Lettres (Devise société) DocType: Pricing Rule,Supplier,Fournisseur DocType: C-Form,Quarter,Trimestre apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Dépenses diverses @@ -1668,7 +1668,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +363,{0} is DocType: Currency Exchange,From Currency,De Monnaie apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","S'il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée" apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Commande requis pour objet {0} -DocType: Purchase Invoice Item,Rate (Company Currency),Taux (Monnaie de la société) +DocType: Purchase Invoice Item,Rate (Company Currency),Prix (Monnaie de la société) apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,autres apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Vous ne trouvez pas un produit trouvé. S'il vous plaît sélectionner une autre valeur pour {0}. DocType: POS Profile,Taxes and Charges,Impôts et taxes @@ -1678,7 +1678,7 @@ apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancaire apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquer sur "" Générer annexe » pour obtenir le calendrier" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,New Cost Center,Nouveau Centre de Coût DocType: Bin,Ordered Quantity,Quantité commandée -apps/erpnext/erpnext/public/js/setup_wizard.js +57,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """ +apps/erpnext/erpnext/public/js/setup_wizard.js +57,"e.g. ""Build tools for builders""","Ex. ""Construire des outils pour les constructeurs""" DocType: Quality Inspection,In Process,In Process DocType: Authorization Rule,Itemwise Discount,Remise (par Article) DocType: Purchase Order Item,Reference Document Type,Référence Type de document @@ -1710,7 +1710,7 @@ DocType: Delivery Note,"If you have created a standard template in Sales Taxes a apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,S'il vous plaît spécifier un pays pour cette règle de port ou consultez Livraison dans le monde DocType: Stock Entry,Total Incoming Value,Valeur entrant total apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To is required,Débit Pour est nécessaire -apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Prix d'achat Liste +apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste prix d'achat DocType: Offer Letter Term,Offer Term,Offre à terme DocType: Quality Inspection,Quality Manager,Responsable Qualité DocType: Job Applicant,Job Opening,Offre d'emploi @@ -1752,7 +1752,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +233,Your Customers,Vos clients DocType: Leave Block List Date,Block Date,Date de bloquer DocType: Sales Order,Not Delivered,Non Livré ,Bank Clearance Summary,Résumé de l'approbation de la banque -apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des recueils d' email quotidiens, hebdomadaires et mensuels ." +apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés d'E-mail quotidiens, hebdomadaires et mensuels ." apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Code de l'article> Le groupe d'articles> Marque DocType: Appraisal Goal,Appraisal Goal,Objectif d'évaluation DocType: Time Log,Costing Amount,Montant des coûts @@ -1768,14 +1768,14 @@ DocType: Payment Request,Make Sales Invoice,Faire la facture de vente DocType: Company,For Reference Only.,Pour référence seulement. apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Non valide {0}: {1} DocType: Sales Invoice Advance,Advance Amount,Montant de l'avance -DocType: Manufacturing Settings,Capacity Planning,Planification des capacités +DocType: Manufacturing Settings,Capacity Planning,Planification de capacité apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Date début' est nécessaire DocType: Journal Entry,Reference Number,Numéro de référence DocType: Employee,Employment Details,Détails de l'emploi DocType: Employee,New Workplace,Nouveau lieu de travail apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Définir comme Fermé apps/erpnext/erpnext/stock/get_item_details.py +97,No Item with Barcode {0},Aucun Item avec le Code-Barre {0} -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas n ° ne peut pas être 0 +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No ne peut pas être 0 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,"Si vous avez équipe de vente et Partenaires Vente (Channel Partners), ils peuvent être marqués et maintenir leur contribution à l'activité commerciale" DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page DocType: Item,"Allow in Sales Order of type ""Service""","Autoriser les bon de commandes de type ""Service""" @@ -1800,7 +1800,7 @@ DocType: Naming Series,User must always select,L'utilisateur doit toujours s DocType: Stock Settings,Allow Negative Stock,Autoriser un stock négatif DocType: Installation Note,Installation Note,Note d'installation apps/erpnext/erpnext/public/js/setup_wizard.js +213,Add Taxes,Ajouter impôts -apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flux de trésorerie de financement +apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flux de trésorerie de la gestion du financement ,Financial Analytics,Financial Analytics DocType: Quality Inspection,Verified By,Vérifié par DocType: Address,Subsidiary,Filiale @@ -1821,7 +1821,7 @@ apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Sur requis DocType: Sales Invoice,Mass Mailing,Mailing de masse DocType: Rename Tool,File to Rename,Fichier à Renommer -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numéro de commande requis pour objet {0} +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numéro de commande requis pour L'article {0} apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1} apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +198,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client DocType: Notification Control,Expense Claim Approved,Note de Frais Approuvée @@ -1833,7 +1833,7 @@ apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads DocType: Employee Education,Post Graduate,Message d'études supérieures DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Détail calendrier d'entretien DocType: Quality Inspection Reading,Reading 9,Lecture 9 -DocType: Supplier,Is Frozen,Est Gelé +DocType: Supplier,Is Frozen,Est gelé DocType: Buying Settings,Buying Settings,Réglages d'achat DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N ° nomenclature pour un produit fini Bonne DocType: Upload Attendance,Attendance To Date,La participation à ce jour @@ -1854,7 +1854,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could DocType: Newsletter,Test,Test apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \ you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Comme il ya des transactions sur actions existants pour cet article, \ vous ne pouvez pas modifier les valeurs de 'A Numéro de série "," A lot Non »,« Est-Stock Item »et« Méthode d'évaluation »" -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Journal Entrée rapide +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Entrée rapide dans le journal apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article DocType: Employee,Previous Work Experience,L'expérience de travail antérieure DocType: Stock Entry,For Quantity,Pour Quantité @@ -1946,7 +1946,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If 9. Considérez taxe ou redevance pour: Dans cette section, vous pouvez spécifier si la taxe / redevance est seulement pour l'évaluation (pas une partie du total) ou seulement pour le total (ne pas ajouter de la valeur à l'élément) ou pour les deux. 10. Ajouter ou déduire: Que vous voulez ajouter ou déduire la taxe." DocType: Purchase Receipt Item,Recd Quantity,Quantité reçue -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},effondrement +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne peut pas produire plus d'article {0} que de la qté du bon de commande {1} apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +498,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis DocType: Payment Reconciliation,Bank / Cash Account,Compte en Banque / trésorerie DocType: Tax Rule,Billing City,Facturation Ville @@ -2023,7 +2023,7 @@ apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon DocType: Notification Control,Purchase Order Message,Achat message Ordre DocType: Tax Rule,Shipping Country,Pays de livraison DocType: Upload Attendance,Upload HTML,Télécharger HTML -DocType: Employee,Relieving Date,Date de soulager +DocType: Employee,Relieving Date,Date de relève apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prix règle est faite pour remplacer la liste des prix / définir le pourcentage de remise, sur la base de certains critères." DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Entrepôt ne peut être modifié que via Stock Entrée / Bon de Livraison / Reçu d'Achat DocType: Employee Education,Class / Percentage,Classe / Pourcentage @@ -2119,7 +2119,7 @@ DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Vous ne pouvez pas convertir au groupe parce Master Type ou Type de compte est sélectionné . DocType: Packing Slip,If more than one package of the same type (for print),Si plus d'un paquet du même type (pour l'impression) DocType: C-Form Invoice Detail,Net Total,Total net -DocType: Bin,FCFS Rate,Taux PAPS +DocType: Bin,FCFS Rate,Tarif PAPS apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturation (facture de vente) DocType: Payment Reconciliation Invoice,Outstanding Amount,Montant dû DocType: Project Task,Working,De travail @@ -2144,7 +2144,7 @@ DocType: Monthly Distribution,Distribution Name,Nom distribution DocType: Features Setup,Sales and Purchase,Vente et achat DocType: Supplier Quotation Item,Material Request No,Demande de Support Aucun apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} -DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taux à laquelle la devise du client est converti en devise de base de l'entreprise +DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taux à laquelle la devise du client est converti en devise de base de la société apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste. DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux Net (Devise Société) apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gérer l'arboressence des territoirs. @@ -2162,7 +2162,7 @@ apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} DocType: Bank Reconciliation,Get Relevant Entries,Obtenez les entrées pertinentes apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Entrée comptable pour Stock DocType: Sales Invoice,Sales Team1,Ventes Equipe1 -apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Point {0} n'existe pas +apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Article {0} n'existe pas DocType: Sales Invoice,Customer Address,Adresse du client DocType: Payment Request,Recipient and Message,Destinataire Message DocType: Purchase Invoice,Apply Additional Discount On,Appliquer de remise supplémentaire sur @@ -2181,7 +2181,7 @@ DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts bel DocType: Payment Request,Mute Email,Muet Email apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac" apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +558,Can only make payment against unbilled {0},Ne peut effectuer le paiement que contre non facturés {0} +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +558,Can only make payment against unbilled {0},Ventilation du paiement n'est possible qu'avec les non facturés {0} apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal DocType: Stock Entry,Subcontract,Sous-traiter @@ -2212,7 +2212,7 @@ DocType: Installation Note Item,Against Document No,Sur le document n ° apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Gérer partenaires commerciaux. DocType: Quality Inspection,Inspection Type,Type d'inspection apps/erpnext/erpnext/controllers/recurring_document.py +164,Please select {0},S'il vous plaît sélectionnez {0} -DocType: C-Form,C-Form No,C-formulaire n ° +DocType: C-Form,C-Form No,Formulaire - C No DocType: BOM,Exploded_items,Exploded_items DocType: Employee Attendance Tool,Unmarked Attendance,Participation banalisée apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,chercheur @@ -2355,7 +2355,7 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0} DocType: Employee Attendance Tool,Marked Attendance HTML,Présence marquée HTML DocType: Sales Order,Customer's Purchase Order,Bon de commande du client -DocType: Warranty Claim,From Company,De Company +DocType: Warranty Claim,From Company,De la société apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité apps/erpnext/erpnext/public/js/setup_wizard.js +293,Minute,Minute DocType: Purchase Invoice,Purchase Taxes and Charges,Impôts achat et les frais @@ -2403,7 +2403,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101 DocType: Item,Inspection Required,Inspection obligatoire DocType: Purchase Invoice Item,PR Detail,Détail PR DocType: Sales Order,Fully Billed,Entièrement Qualifié -apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Votre exercice social commence le +apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Liquidités apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +120,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0} DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d'emballage. (Pour l'impression) DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à fixer les comptes gelés et de créer / modifier des entrées comptables contre les comptes gelés @@ -2418,7 +2418,7 @@ apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From va apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,S'il vous plaît sélectionner compte bancaire DocType: Newsletter,Create and Send Newsletters,Créer et envoyer des info-lettres -apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Cochez toutes +apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Cochez tous DocType: Sales Order,Recurring Order,Ordre récurrent DocType: Company,Default Income Account,Compte d'exploitation apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client @@ -2497,7 +2497,7 @@ DocType: Territory,Territory Targets,Les objectifs du Territoire DocType: Delivery Note,Transporter Info,Infos Transporteur DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Point de commande fourni apps/erpnext/erpnext/public/js/setup_wizard.js +86,Company Name cannot be Company,Nom de l'entreprise ne peut pas être entreprise -apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Journal Bon {0} n'a pas encore compte {1} . +apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,En-têtes pour les modèles d'impression.. apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression par exemple Facture proforma. apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,charges de type d'évaluation ne peuvent pas marqué comme Inclusive DocType: POS Profile,Update Stock,Mettre à jour le Stock @@ -2515,12 +2515,12 @@ DocType: Buying Settings,Purchase Order Required,Bon de commande requis ,Item-wise Sales History,Historique des ventes (par Article) DocType: Expense Claim,Total Sanctioned Amount,Montant total validé ,Purchase Analytics,Les analyses des achats -DocType: Sales Invoice Item,Delivery Note Item,Point de Livraison +DocType: Sales Invoice Item,Delivery Note Item,Bon de livraison article DocType: Expense Claim,Task,Tâche DocType: Purchase Taxes and Charges,Reference Row #,Ligne de référence # -apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour objet {0} +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour l'article {0} apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Il s'agit d'une personne de ventes de racines et ne peut être modifié . -,Stock Ledger,Stock Ledger +,Stock Ledger,Livre d'inventaire apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Prix: {0} DocType: Salary Slip Deduction,Salary Slip Deduction,Déduction bulletin de salaire apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,Sélectionnez un noeud de premier groupe. @@ -2574,7 +2574,7 @@ apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Tr apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nombre incorrect de General Ledger Entrées trouvées. Vous avez peut-être choisi le bon compte dans la transaction. apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Pour créer un compte bancaire DocType: Hub Settings,Publish Availability,Publier Disponibilité -apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Date de naissance ne peut pas être supérieure à aujourd'hui. +apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Date de naissance ne peut être ultérieur à aujourd'hui. ,Stock Ageing,Stock vieillissement apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0} '{1}' est désactivée apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvrir @@ -2610,14 +2610,14 @@ apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50, DocType: Time Log,From Time,From Time DocType: Notification Control,Custom Message,Message personnalisé apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banques d'investissement -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,Espèces ou compte bancaire est obligatoire pour réaliser une écriture DocType: Purchase Invoice,Price List Exchange Rate,Taux de change Prix de liste DocType: Purchase Invoice Item,Rate,Prix apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,interne DocType: Newsletter,A Lead with this email id should exist,Un responsable de cet identifiant de courriel doit exister DocType: Stock Entry,From BOM,De BOM apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,de base -apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,transactions d'actions avant {0} sont gelés +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Les transactions du stock avant {0} sont gelés apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '" apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","Par exemple Kg, Unités, Nombres, Mètres" @@ -2629,7 +2629,7 @@ apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,compagnie a apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material Issue DocType: Material Request Item,For Warehouse,Pour Entrepôt DocType: Employee,Offer Date,Date de l'offre -apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citations +apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Soumissions DocType: Hub Settings,Access Token,Jeton d'accès DocType: Sales Invoice Item,Serial No,N ° de série apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,S'il vous plaît entrer Maintaince Détails première @@ -2649,7 +2649,7 @@ DocType: Issue,Opening Time,Ouverture Heure apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De et la date exigée apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut '{0}' doit être la même que dans le modèle '{1}' -DocType: Shipping Rule,Calculate Based On,Calculer en fonction +DocType: Shipping Rule,Calculate Based On,Calculer en fonction de DocType: Delivery Note Item,From Warehouse,De Entrepôt DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total DocType: Tax Rule,Shipping City,Ville de livraison @@ -2739,7 +2739,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486, apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,S'il vous plaît entrer amortissent compte apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Dernière date de commande apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1} -DocType: C-Form,C-Form,C-Form +DocType: C-Form,C-Form,Formulaire - C apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +144,Operation ID not set,Opération carte d'identité pas réglé DocType: Payment Request,Initiated,Initié DocType: Production Order,Planned Start Date,Date de début prévue @@ -2764,7 +2764,7 @@ apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services, apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valeur pour l'attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3} DocType: Tax Rule,Sales,Ventes DocType: Stock Entry Detail,Basic Amount,Montant de base -apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},{0} est obligatoire +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0} DocType: Leave Allocation,Unused leaves,Congés non utilisés apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr DocType: Customer,Default Receivable Accounts,Comptes de créances clients par défaut @@ -2832,7 +2832,7 @@ apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/custome DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / bannière qui apparaîtra sur le haut de la liste des produits. DocType: Shipping Rule,Specify conditions to calculate shipping amount,Préciser les conditions pour calculer le montant de l'expédition apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Ajouter un enfant -DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à fixer congelés Comptes et modifier les entrées congelés +DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à geler des comptes et modifier le contenu apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Vous ne pouvez pas convertir le centre de coûts à livre car il possède des nœuds enfant apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +45,Opening Value,Valeur d'ouverture apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,# Série @@ -2852,7 +2852,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +196,Account with exist apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Frais juridiques DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Le jour du mois au cours duquel l'ordre automatique sera généré par exemple 05, 28 etc" DocType: Sales Invoice,Posting Time,Affichage Temps -DocType: Sales Order,% Amount Billed,Montant Facturé% +DocType: Sales Order,% Amount Billed,Montant Facturé en % apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Location de bureaux DocType: Sales Partner,Logo,Logo DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas de série par défaut si vous cochez cette case. @@ -2862,7 +2862,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Revenu clientèle apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Frais de déplacement DocType: Maintenance Visit,Breakdown,Panne -apps/erpnext/erpnext/controllers/accounts_controller.py +257,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la monnaie: {1} ne peut pas être sélectionné +apps/erpnext/erpnext/controllers/accounts_controller.py +257,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la devise: {1} ne peut pas être sélectionné DocType: Bank Reconciliation Detail,Cheque Date,Date de chèques apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: le compte parent {1} n'appartient pas à l'entreprise: {2} apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société! @@ -2880,7 +2880,7 @@ DocType: Project,Total Billing Amount (via Time Logs),Montant total de la factur apps/erpnext/erpnext/public/js/setup_wizard.js +295,We sell this Item,Nous vendons cet article apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fournisseur Id apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +200,Quantity should be greater than 0,Quantité doit être supérieure à 0 -DocType: Journal Entry,Cash Entry,Cash Prix d'entrée +DocType: Journal Entry,Cash Entry,Entrée caisse DocType: Sales Partner,Contact Desc,Contact Desc apps/erpnext/erpnext/config/hr.py +143,"Type of leaves like casual, sick etc.","Type de feuilles comme occasionnel, etc malades" DocType: Email Digest,Send regular summary reports via Email.,Envoyer des rapports réguliers sommaires par courriel. @@ -2891,7 +2891,7 @@ DocType: Production Order,Total Operating Cost,Coût d'exploitation total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Remarque: Article {0} plusieurs fois saisies apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tous les contacts. DocType: Newsletter,Test Email Id,Id Test Email -apps/erpnext/erpnext/public/js/setup_wizard.js +54,Company Abbreviation,Abréviation de l'entreprise +apps/erpnext/erpnext/public/js/setup_wizard.js +54,Company Abbreviation,Abréviation de la société DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si vous suivez contrôle de la qualité . Permet article AQ requis et AQ Pas de ticket de caisse DocType: GL Entry,Party Type,Type de partie apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +66,Raw material cannot be same as main Item,Les matières premières peuvent être similaire que l'article principal @@ -2907,7 +2907,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandat apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Merci de votre intérêt pour en vous abonnant à nos mises à jour ,Qty to Transfer,Qté à Transférer apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Devis à Prospects ou Clients. -DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé +DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock gelé ,Territory Target Variance Item Group-Wise,Territoire cible Variance Item Group-Wise apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client apps/erpnext/erpnext/controllers/accounts_controller.py +508,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}. @@ -3005,13 +3005,13 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_cal apps/erpnext/erpnext/public/js/setup_wizard.js +224,Rate (%),Taux (%) DocType: Time Log,Additional Cost,Supplément apps/erpnext/erpnext/public/js/setup_wizard.js +67,Financial Year End Date,Date de fin de l'exercice financier -apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base Bon Non, si regroupés par Chèque" +apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du No de coupon, si regroupé par coupon" DocType: Quality Inspection,Incoming,Nouveau DocType: BOM,Materials Required (Exploded),Matériel nécessaire (éclatée) DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Réduire Gagner de congé sans solde (PLT) apps/erpnext/erpnext/public/js/setup_wizard.js +186,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même" apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: N ° de série {1} ne correspond pas à {2} {3} -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes . +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Congé occasionnel DocType: Batch,Batch ID,ID. du lot apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,Note: {0},Note: {0} ,Delivery Note Trends,Bordereau de livraison Tendances @@ -3031,7 +3031,7 @@ DocType: Employee,History In Company,Ancienneté dans l'entreprise apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +127,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},La quantité totale émission / Transfert {0} dans Demande de Matériel {1} ne peut pas être supérieure à la quantité demandée {2} pour le point {3} apps/erpnext/erpnext/config/crm.py +151,Newsletters,info-lettres DocType: Address,Shipping,Livraison -DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry +DocType: Stock Ledger Entry,Stock Ledger Entry,Entrée du livre d'inventaire DocType: Department,Leave Block List,Laisser Block List DocType: Customer,Tax ID,Numéro d'identification fiscale apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Point {0} n'est pas configuré pour Serial colonne n ° doit être vide @@ -3057,7 +3057,7 @@ apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_too apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +108,To Time must be greater than From Time,Time doit être supérieur From Time DocType: Journal Entry Account,Exchange Rate,Taux de change apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Sales Order {0} is not submitted,Maximum {0} lignes autorisées -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +689,Add items from,Ajouter des éléments de +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +689,Add items from,Ajouter des articles de apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: le Compte Parent {1} n'appartient pas à la société {2} DocType: BOM,Last Purchase Rate,Purchase Rate Dernière DocType: Account,Asset,atout @@ -3066,7 +3066,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +55,"e.g. ""MC""","par exemple "" apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne peut pas exister pour objet {0} a depuis variantes ,Sales Person-wise Transaction Summary,Sales Person-sage Résumé de la transaction apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,L'Entrepôt {0} n'existe pas -apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Se inscrire ERPNext Hub +apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,S'nscrire ERPNext Hub DocType: Monthly Distribution,Monthly Distribution Percentages,Les pourcentages de distribution mensuelle apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'élément sélectionné ne peut pas avoir lot DocType: Delivery Note,% of materials delivered against this Delivery Note,% Des matériaux livrés sur ce bon de livraison @@ -3076,7 +3076,7 @@ DocType: Employee,Reports to,Rapports au DocType: SMS Settings,Enter url parameter for receiver nos,Entrez le paramètre url pour nos récepteurs DocType: Sales Invoice,Paid Amount,Montant payé ,Available Stock for Packing Items,Disponible en stock pour l'emballage Articles -DocType: Item Variant,Item Variant,Point Variant +DocType: Item Variant,Item Variant,Variante d'article apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut" apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'" apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité @@ -3161,10 +3161,10 @@ apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27 DocType: POS Profile,Terms and Conditions,Termes et Conditions apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +48,To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0} DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez maintenir la hauteur, le poids, allergies, etc médicaux préoccupations" -DocType: Leave Block List,Applies to Company,S'applique à l'entreprise -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Vous ne pouvez pas annuler car soumis Stock entrée {0} existe +DocType: Leave Block List,Applies to Company,S'applique à la société +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'entrée du stock soumis {0} existe DocType: Purchase Invoice,In Words,En Toutes Lettres -apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,"Aujourd'hui, ce est {0} anniversaire!" +apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,"Aujourd'hui, c'est l’anniversaire de {0} !" DocType: Production Planning Tool,Material Request For Warehouse,Demande de matériel pour l'entrepôt DocType: Sales Order Item,For Production,Pour la production apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,S'il vous plaît entrez la commande client dans le tableau ci-dessus @@ -3229,7 +3229,7 @@ apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, alre ,Itemwise Recommended Reorder Level,Seuil de renouvellement des commandes (par Article) apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,S'il vous plaît sélectionnez {0} premier DocType: Features Setup,To get Item Group in details table,Pour obtenir Groupe d'éléments dans le tableau de détails -apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} du point {1} a expiré. +apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} de l'article {1} a expiré. DocType: Sales Invoice,Commission,commission DocType: Address Template,"

Default Template

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

@@ -3263,7 +3263,7 @@ DocType: Tax Rule,Purchase Tax Template,Achetez modèle impôt ,Project wise Stock Tracking,Projet sage Stock Tracking apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programme d'entretien {0} existe contre {0} DocType: Stock Entry Detail,Actual Qty (at source/target),Quantité réelle (à la source / cible) -DocType: Item Customer Detail,Ref Code,Code de référence de +DocType: Item Customer Detail,Ref Code,Code de référence apps/erpnext/erpnext/config/hr.py +13,Employee records.,Dossiers des Employés. DocType: Payment Gateway,Payment Gateway,Passerelle de paiement DocType: HR Settings,Payroll Settings,Paramètres de la paie @@ -3271,7 +3271,7 @@ apps/erpnext/erpnext/config/accounts.py +63,Match non-linked Invoices and Paymen apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Passer la commande apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Racine ne peut pas avoir un centre de coûts parent apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Sélectionnez une marque ... -DocType: Sales Invoice,C-Form Applicable,C-Form applicable +DocType: Sales Invoice,C-Form Applicable,Formulaire - C applicable apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l'opération {0} apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Warehouse is mandatory,Entrepôt est obligatoire DocType: Supplier,Address and Contacts,Adresse et contacts @@ -3400,7 +3400,7 @@ apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_vouc DocType: Authorization Rule,Based On,Basé sur DocType: Sales Order Item,Ordered Qty,Quantité commandée apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Point {0} est désactivé -DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu'à +DocType: Stock Settings,Stock Frozen Upto,Stock gelé jusqu'au apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0} apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche. apps/erpnext/erpnext/config/hr.py +78,Generate Salary Slips,Générer les bulletins de salaire @@ -3488,7 +3488,7 @@ DocType: Employee,Cheque,Chèque apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série mise à jour apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci DocType: Item,Serial Number Series,Série Série Nombre -apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Facteur de conversion ne peut pas être dans les fractions +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},L’entrepôt est obligatoire pour l'article du stock {0} dans la ligne {1} apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale DocType: Issue,First Responded On,D'abord répondu le DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes @@ -3522,7 +3522,7 @@ DocType: Customer Group,Parent Customer Group,Groupe Client parent apps/erpnext/erpnext/public/js/pos/pos.js +454,Change,Changement DocType: Purchase Invoice,Contact Email,Contact Email DocType: Appraisal Goal,Score Earned,Score gagné -apps/erpnext/erpnext/public/js/setup_wizard.js +53,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """ +apps/erpnext/erpnext/public/js/setup_wizard.js +53,"e.g. ""My Company LLC""","par exemple "" Mon entreprise LLC """ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Période de préavis DocType: Bank Reconciliation Detail,Voucher ID,ID du Bon apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,C'est un territoire de racine et ne peut être modifié . @@ -3574,7 +3574,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} { DocType: Purchase Order,Get Last Purchase Rate,Obtenez Purchase Rate Dernière DocType: Time Log,Billing Rate based on Activity Type (per hour),Taux de facturation basé sur le type d'activité (par heure) DocType: Company,Company Info,Informations sur l'entreprise -apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0} +apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +218,"Company Email ID not found, hence mail not sent","Société E-mail introuvable, donc E-mail pas envoyé" apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs) DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Compte de débit @@ -3587,7 +3587,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +94,{0} DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Empêcher les utilisateurs de faire des demandes d'autorisation, les jours suivants." apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel DocType: Sales Invoice,Is POS,Est-POS -apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1} +apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},quantité emballé doit être égale à la quantité pour l'article {0} à la ligne {1} DocType: Production Order,Manufactured Qty,Qté fabriquée DocType: Purchase Receipt Item,Accepted Quantity,Quantité acceptés apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne existe pas @@ -3608,9 +3608,9 @@ apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",La sélection de "Oui" donner une identité unique à chaque entité de cet article qui peut être consulté dans le N ° de série maître. apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Soulager date doit être supérieure à date d'adhésion DocType: Employee,Education,Education -DocType: Selling Settings,Campaign Naming By,Campagne Naming par +DocType: Selling Settings,Campaign Naming By,Campagne nommée par DocType: Employee,Current Address Is,Adresse actuelle -apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +223,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défausse la société sera définie si le champ est laissé vide. +apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +223,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défaut de la société sera définie si le champ est laissé vide. DocType: Address,Office,Bureau apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Les écritures comptables. DocType: Delivery Note Item,Available Qty at From Warehouse,Quantité disponible à partir de l'entrepôt @@ -3720,7 +3720,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Délai jours Temps apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1} -apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Réf date +apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Réf. date DocType: Employee,Reason for Leaving,Raison du départ DocType: Expense Claim Detail,Sanctioned Amount,Montant approuvé DocType: GL Entry,Is Opening,Est l'ouverture diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv index ee4e87e13f..4603c8b2df 100644 --- a/erpnext/translations/gu.csv +++ b/erpnext/translations/gu.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચા DocType: Opportunity,Walk In,ચાલવા apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,સ્ટોક પ્રવેશો DocType: Item,Inspection Criteria,નિરીક્ષણ માપદંડ -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial કિંમત કેન્દ્રો ખાસ ભેટ અને. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial કિંમત કેન્દ્રો ખાસ ભેટ અને. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ટ્રાન્સફર apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,વ્હાઇટ @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,કુલ અનુભ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,રદ પેકિંગ કાપલી (ઓ) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,રોકાણ કેશ ફ્લો apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત -DocType: Material Request Item,Sales Order,વેચાણ ઓર્ડર કોઈ +DocType: Material Request Item,Sales Order No,વેચાણ ઓર્ડર કોઈ DocType: Item Group,Item Group Name,વસ્તુ ગ્રુપ નામ apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,લેવામાં apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ઉત્પાદન માટે ટ્રાન્સફર સામગ્રી @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,મળવાપાત્ર હિસ DocType: Address Template,This format is used if country specific format is not found,દેશમાં ચોક્કસ ફોર્મેટ ન મળી આવે છે તો આ ફોર્મેટનો ઉપયોગ થાય છે DocType: Production Order,Use Multi-Level BOM,મલ્ટી લેવલ BOM વાપરો DocType: Bank Reconciliation,Include Reconciled Entries,અનુરૂપ પ્રવેશ સમાવેશ થાય છે -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial એકાઉન્ટ્સ ખાસ ભેટ અને. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial એકાઉન્ટ્સ ખાસ ભેટ અને. DocType: Leave Control Panel,Leave blank if considered for all employee types,બધા કર્મચારી પ્રકારો માટે ગણવામાં તો ખાલી છોડી દો DocType: Landed Cost Voucher,Distribute Charges Based On,વિતરિત ખર્ચ પર આધારિત apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"વસ્તુ {1} અસેટ વસ્તુ છે, કારણ કે એકાઉન્ટ {0} 'સ્થિર એસેટ' પ્રકાર હોવા જ જોઈએ" diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv index 9e663cfdd3..d5bd1051dc 100644 --- a/erpnext/translations/he.csv +++ b/erpnext/translations/he.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,אל תשלחו לע DocType: Opportunity,Walk In,ללכת ב apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ערכי מניות DocType: Item,Inspection Criteria,קריטריונים לבדיקה -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,עץ של מרכזי עלות financial. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,עץ של מרכזי עלות finanial. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,הועבר apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,לבן @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,"ניסיון סה""כ" apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,תזרים מזומנים מהשקעות apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח -DocType: Material Request Item,Sales Order,להזמין ללא מכירות +DocType: Material Request Item,Sales Order No,להזמין ללא מכירות DocType: Item Group,Item Group Name,שם קבוצת פריט apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,לקחתי apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,העברת חומרים לייצור @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,חשבונות חייבים DocType: Address Template,This format is used if country specific format is not found,פורמט זה משמש אם פורמט ספציפי למדינה לא נמצא DocType: Production Order,Use Multi-Level BOM,השתמש Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,עץ של חשבונות financial. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,עץ של חשבונות finanial. DocType: Leave Control Panel,Leave blank if considered for all employee types,שאר ריק אם נחשב לכל סוגי העובדים DocType: Landed Cost Voucher,Distribute Charges Based On,חיובים להפיץ מבוסס על apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"חשבון {0} חייב להיות מסוג 'נכסים קבועים ""כפריט {1} הוא פריט רכוש" diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv index 14fedb0b0d..abad3c7892 100644 --- a/erpnext/translations/hi.csv +++ b/erpnext/translations/hi.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचा DocType: Opportunity,Walk In,में चलो apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,स्टॉक प्रविष्टियां DocType: Item,Inspection Criteria,निरीक्षण मानदंड -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial लागत केन्द्रों का पेड़ . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial लागत केन्द्रों का पेड़ . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,तबादला apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)। apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,सफेद @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,कुल अनुभ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,निवेश से कैश फ्लो apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क -DocType: Material Request Item,Sales Order,बिक्री आदेश नहीं +DocType: Material Request Item,Sales Order No,बिक्री आदेश नहीं DocType: Item Group,Item Group Name,आइटम समूह का नाम apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,में ले ली apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,लेखा प्राप्य DocType: Address Template,This format is used if country specific format is not found,"देश विशिष्ट प्रारूप नहीं मिला है, तो यह प्रारूप प्रयोग किया जाता है" DocType: Production Order,Use Multi-Level BOM,मल्टी लेवल बीओएम का उपयोग करें DocType: Bank Reconciliation,Include Reconciled Entries,मेल मिलाप प्रविष्टियां शामिल करें -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial खातों का पेड़ . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial खातों का पेड़ . DocType: Leave Control Panel,Leave blank if considered for all employee types,रिक्त छोड़ दो अगर सभी कर्मचारी प्रकार के लिए विचार DocType: Landed Cost Voucher,Distribute Charges Based On,बांटो आरोपों पर आधारित apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आइटम {1} एक एसेट आइटम के रूप में खाते {0} प्रकार की ' फिक्स्ड एसेट ' होना चाहिए diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv index 1699e39c4f..416c320f9a 100644 --- a/erpnext/translations/hr.csv +++ b/erpnext/translations/hr.csv @@ -18,7 +18,7 @@ DocType: Sales Partner,Dealer,Trgovac DocType: Employee,Rented,Iznajmljeno DocType: POS Profile,Applicable for User,Primjenjivo za članove apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati" -apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebno za Cjenika {0} +apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za cjenik {0} DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji. DocType: Purchase Order,Customer Contact,Kupac Kontakt apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree @@ -71,7 +71,7 @@ DocType: Appraisal Goal,Score (0-5),Ocjena (0-5) apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3} apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Red # {0}: DocType: Delivery Note,Vehicle No,Ne vozila -apps/erpnext/erpnext/public/js/pos/pos.js +553,Please select Price List,Molimo odaberite Cjenik +apps/erpnext/erpnext/public/js/pos/pos.js +553,Please select Price List,Molim odaberite cjenik DocType: Production Order Operation,Work In Progress,Radovi u tijeku DocType: Employee,Holiday List,Turistička Popis DocType: Time Log,Time Log,Vrijeme Log @@ -194,7 +194,7 @@ apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and disco apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Ovaj put Prijava sukobi s {0} od {1} {2} apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0} -DocType: Pricing Rule,Discount on Price List Rate (%),Popust na Cjenik postotak (%) +DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cjenik (%) DocType: Offer Letter,Select Terms and Conditions,Odaberite Uvjeti apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,Out Value,Iz vrijednost DocType: Production Planning Tool,Sales Orders,Narudžbe kupca @@ -614,7 +614,7 @@ apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća DocType: Item Group,Website Specifications,Web Specifikacije apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Došlo je do pogreške u vašem adresnoj predložak {0} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Novi račun -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} od {1} tipa +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} od tipa {1} apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Računovodstvo Prijave se mogu podnijeti protiv lisnih čvorova. Prijave protiv grupe nije dopušteno. @@ -786,7 +786,7 @@ apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not DocType: Features Setup,Item Barcode,Barkod proizvoda apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Stavka Varijante {0} ažurirani DocType: Quality Inspection Reading,Reading 6,Čitanje 6 -DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam +DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ulazni račun - predujam DocType: Address,Shop,Dućan DocType: Hub Settings,Sync Now,Sync Sada apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1} @@ -797,7 +797,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +164,The Brand,Brand apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}. DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji DocType: Item,Is Purchase Item,Je dobavljivi proizvod -DocType: Journal Entry Account,Purchase Invoice,Kupnja fakture +DocType: Journal Entry Account,Purchase Invoice,Ulazni račun DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne DocType: Stock Entry,Total Outgoing Value,Ukupna odlazna vrijednost apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otvaranje i zatvaranje Datum datum mora biti unutar iste fiskalne godine @@ -819,7 +819,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Select DocType: Purchase Invoice,Additional Discount Percentage,Dodatni Postotak Popust apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen. -DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama +DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopusti korisniku uređivanje cjenika u transakcijama DocType: Pricing Rule,Max Qty,Maksimalna količina apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski @@ -832,14 +832,14 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetn DocType: Opportunity,Walk In,Šetnja u apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock tekstova DocType: Item,Inspection Criteria,Inspekcijski Kriteriji -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Drvo financial troška . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Drvo finanial troška . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bijela DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni) DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje apps/erpnext/erpnext/public/js/setup_wizard.js +24,Attach Your Picture,Učvrstite svoju sliku -apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Make ,Napraviti +apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Make ,Napravi DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi . apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica @@ -957,7 +957,7 @@ DocType: Item Attribute Value,"This will be appended to the Item Code of the var DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće. apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Plava DocType: Purchase Invoice,Is Return,Je li povratak -DocType: Price List Country,Price List Country,Cjenik Zemlja +DocType: Price List Country,Price List Country,Država cjenika apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Daljnje čvorovi mogu se samo stvorio pod ""Grupa"" tipa čvorova" apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Molimo postavite e-ID DocType: Item,UOMs,UOMs @@ -978,7 +978,7 @@ DocType: Account,Warehouse,Skladište apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +83,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje DocType: Purchase Invoice Item,Net Rate,Neto stopa -DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet +DocType: Purchase Invoice Item,Purchase Invoice Item,Proizvod ulaznog računa apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Upisi u glavnu knjigu i GL upisi su ponovno postavljeni za odabrane primke. apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavka 1 DocType: Holiday,Holiday,Odmor @@ -1151,7 +1151,7 @@ DocType: Email Digest,For Company,Za tvrtke apps/erpnext/erpnext/config/support.py +38,Communication log.,Dnevnik mailova apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Iznos kupnje DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime -apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnog +apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontni plan DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,ne može biti veće od 100 apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod @@ -1224,11 +1224,11 @@ DocType: Employee External Work History,Total Experience,Ukupno Iskustvo apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tijek iz investicijskih apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe -DocType: Material Request Item,Sales Order,Broj narudžbe kupca +DocType: Material Request Item,Sales Order No,Broj narudžbe kupca DocType: Item Group,Item Group Name,Proizvod - naziv grupe apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Prijenos Materijali za izradu -DocType: Pricing Rule,For Price List,Za Cjeniku +DocType: Pricing Rule,For Price List,Za cjenik apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kupnja stopa za stavke: {0} nije pronađena, koja je potrebna za rezervaciju knjiženje (trošak). Molimo spomenuti predmet cijenu od popisa za kupnju cijena." DocType: Maintenance Schedule,Schedules,Raspored @@ -1236,7 +1236,7 @@ DocType: Purchase Invoice Item,Net Amount,Neto Iznos DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo) apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +630,Error: {0} > {1},Pogreška : {0} > {1} -apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana . +apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Kreirajte novi račun iz kontnog plana. apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,Maintenance Visit,Održavanje Posjetite apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Regija DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na skladištu @@ -1579,7 +1579,7 @@ DocType: Journal Entry,Accounts Receivable,Potraživanja DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Drvo financial račune . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Drvo finanial račune . DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako se odnosi na sve tipove zaposlenika DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirati optužbi na temelju apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Račun {0} mora biti tipa 'Nepokretne imovine' kao što je proizvod {1} imovina proizvoda @@ -1611,7 +1611,7 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +252,Account {0} is inva apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0} apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0} DocType: Salary Slip,Deduction,Odbitak -apps/erpnext/erpnext/stock/get_item_details.py +242,Item Price added for {0} in Price List {1},Stavka Cijena dodani za {0} u Cjeniku {1} +apps/erpnext/erpnext/stock/get_item_details.py +242,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1} DocType: Address Template,Address Template,Predložak adrese apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Unesite ID zaposlenika ove prodaje osobi DocType: Territory,Classification of Customers by region,Klasifikacija korisnika po regiji @@ -1709,7 +1709,7 @@ DocType: Delivery Note,"If you have created a standard template in Sales Taxes a apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Navedite zemlju za ovaj Dostava pravilom ili provjeriti Dostava u svijetu DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To is required,Zaduženja je potrebno -apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupnja Cjenik +apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik DocType: Offer Letter Term,Offer Term,Ponuda Pojam DocType: Quality Inspection,Quality Manager,Upravitelj kvalitete DocType: Job Applicant,Job Opening,Posao Otvaranje @@ -1726,7 +1726,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103, apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2} DocType: Production Order Operation,Completed Qty,Završen Kol apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja" -apps/erpnext/erpnext/stock/get_item_details.py +253,Price List {0} is disabled,Cjenik {0} je onemogućen +apps/erpnext/erpnext/stock/get_item_details.py +253,Price List {0} is disabled,Cjenik {0} je ugašen DocType: Manufacturing Settings,Allow Overtime,Dopusti Prekovremeni apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}. DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Ocijenite @@ -1794,7 +1794,7 @@ DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +575,Transfer Material,Prijenos materijala apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Stavka {0} mora biti Prodaja predmeta u {1} DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ." -DocType: Purchase Invoice,Price List Currency,Cjenik valuta +DocType: Purchase Invoice,Price List Currency,Valuta cjenika DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu DocType: Installation Note,Installation Note,Napomena instalacije @@ -1977,7 +1977,7 @@ apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ili DocType: Sales Order,Billing Status,Status naplate apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Iznad -DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje +DocType: Buying Settings,Default Buying Price List,Zadani kupovni cjenik apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Niti jedan zaposlenik za prethodno izabrane kriterije ili plaća klizanja već stvorili DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Postavi zadane vrijednosti kao što su tvrtka, valuta, tekuća fiskalna godina, itd." @@ -2201,7 +2201,7 @@ apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Pleas apps/erpnext/erpnext/controllers/accounts_controller.py +425,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2}) DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci. DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja -apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected,Cjenik valuta ne bira +apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected,Valuta cjenika nije odabrana apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Stavka Red {0}: Kupnja Potvrda {1} ne postoji u gornjoj tablici 'kupiti primitaka' apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3} apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta @@ -2610,7 +2610,7 @@ DocType: Time Log,From Time,S vremena DocType: Notification Control,Custom Message,Prilagođena poruka apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje -DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna +DocType: Purchase Invoice,Price List Exchange Rate,Tečaj cjenika DocType: Purchase Invoice Item,Rate,VPC apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mailom bi trebao postojati @@ -2868,7 +2868,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted a apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1} -DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje +DocType: Stock Settings,Auto insert Price List rate if missing,"Ako ne postoji, automatski ubaciti cjenik" apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos ,Transferred Qty,prebačen Kol apps/erpnext/erpnext/config/learn.py +11,Navigating,Kretanje @@ -2912,7 +2912,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Gr apps/erpnext/erpnext/controllers/accounts_controller.py +508,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}. apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Predložak je obavezno. apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji -DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta) +DocType: Purchase Invoice Item,Price List Rate (Company Currency),Stopa cjenika (valuta tvrtke) DocType: Account,Temporary,Privremen DocType: Address,Preferred Billing Address,Željena adresa za naplatu DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele @@ -3022,7 +3022,7 @@ DocType: Sales Order,Delivery Date,Datum isporuke DocType: Opportunity,Opportunity Date,Datum prilike DocType: Purchase Receipt,Return Against Purchase Receipt,Povratak na primku DocType: Purchase Order,To Bill,Za Billa -DocType: Material Request,% Ordered,% Ž +DocType: Material Request,% Ordered,% Naručeno apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Rad po komadu apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,AVG. Kupnja stopa DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima) @@ -3285,7 +3285,7 @@ apps/erpnext/erpnext/config/hr.py +138,Allocate leaves for a period.,Dodijeliti apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Cheques and Deposits incorrectly cleared,Čekovi i depozita pogrešno izbrisani apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje da biste potvrdili apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun -DocType: Purchase Invoice Item,Price List Rate,Cjenik Stopa +DocType: Purchase Invoice Item,Price List Rate,Stopa cjenika DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokaži ""raspoloživo"" ili ""nije raspoloživo"" na temelju trentnog stanja na skladištu." apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Sastavnice (BOM) DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme potrebno od strane dobavljača za isporuku @@ -3296,7 +3296,7 @@ DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +31,Transaction currency must be same as Payment Gateway currency,Transakcija valute mora biti isti kao i Payment Gateway valute apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Receive,Primite DocType: Maintenance Visit,Fully Completed,Potpuno Završeni -apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Cijela +apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Napravljeno DocType: Employee,Educational Qualification,Obrazovne kvalifikacije DocType: Workstation,Operating Costs,Operativni troškovi DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj @@ -3313,7 +3313,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Dodaj / U apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,My Orders,Moje narudžbe -DocType: Price List,Price List Name,Cjenik Ime +DocType: Price List,Price List Name,Naziv cjenika DocType: Time Log,For Manufacturing,Za Manufacturing apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Ukupan rezultat DocType: BOM,Manufacturing,Proizvodnja @@ -3600,7 +3600,7 @@ DocType: Account,Parent Account,Nadređeni račun DocType: Quality Inspection Reading,Reading 3,Čitanje 3 ,Hub,Središte DocType: GL Entry,Voucher Type,Bon Tip -apps/erpnext/erpnext/public/js/pos/pos.js +99,Price List not found or disabled,Cjenik nije pronađena ili onemogućena +apps/erpnext/erpnext/public/js/pos/pos.js +99,Price List not found or disabled,Cjenik nije pronađen DocType: Expense Claim,Approved,Odobren DocType: Pricing Rule,Price,Cijena apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo ' diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv index cb55a8f5cf..350135b23b 100644 --- a/erpnext/translations/hu.csv +++ b/erpnext/translations/hu.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön dolgoz DocType: Opportunity,Walk In,Utcáról apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock bejegyzések DocType: Item,Inspection Criteria,Vizsgálati szempontok -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tree of financial költség központok. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tree of finanial költség központok. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,TRANSFERED apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Fehér @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Összesen Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Csomagjegy(ek) törölve apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow Befektetési apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak -DocType: Material Request Item,Sales Order,Sales Order +DocType: Material Request Item,Sales Order No,Sales Order No DocType: Item Group,Item Group Name,Anyagcsoport neve apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer anyagok gyártása @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,VEVÔKÖVETELÉSEK DocType: Address Template,This format is used if country specific format is not found,"Ezt a formátumot használják, ha ország-specifikus formátumban nem található" DocType: Production Order,Use Multi-Level BOM,Többszíntű anyagjegyzék DocType: Bank Reconciliation,Include Reconciled Entries,Közé Egyeztetett bejegyzések -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Fája financial számlák. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Fája finanial számlák. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Hagyja üresen, ha figyelembe munkavállalói típusok" DocType: Landed Cost Voucher,Distribute Charges Based On,Terjesztheti alapuló díjak apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} típusú legyen ""Fixed Asset"" tételként {1} egy eszköz tétele" diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv index 51221c28a0..f0c18fb6cb 100644 --- a/erpnext/translations/id.csv +++ b/erpnext/translations/id.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan Kirim Penging DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entri Stok DocType: Item,Inspection Criteria,Kriteria Inspeksi -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tingkat Pusat Biaya Finansial +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tingkat Pusat Biaya Finansial apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Ditransfer apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Putih @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Jumlah Pengalaman apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing slip (s) dibatalkan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Arus Kas dari Investasi apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya -DocType: Material Request Item,Sales Order,Sales Order +DocType: Material Request Item,Sales Order No,No Order Penjualan DocType: Item Group,Item Group Name,Nama Item Grup apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Material untuk Produksi @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,Piutang DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format khusus negara tidak ditemukan DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Entri Rekonsiliasi -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Tree Rekening Akun Finansial +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Tree Rekening Akun Finansial DocType: Leave Control Panel,Leave blank if considered for all employee types,Biarkan kosong jika dipertimbangkan untuk semua jenis karyawan DocType: Landed Cost Voucher,Distribute Charges Based On,Distribusi Biaya Berdasarkan apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Stok Barang {1} adalah merupakan sebuah Aset Tetap diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv index 2c824722b2..25f393dd42 100644 --- a/erpnext/translations/it.csv +++ b/erpnext/translations/it.csv @@ -831,7 +831,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Non inviare Dipenden DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Le entrate nelle scorte DocType: Item,Inspection Criteria,Criteri di ispezione -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Albero dei centri di costo financial . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Albero dei centri di costo finanial . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Trasferiti apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bianco @@ -1223,7 +1223,7 @@ DocType: Employee External Work History,Total Experience,Esperienza totale apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow da investimenti apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese -DocType: Material Request Item,Sales Order,Ordine di vendita No +DocType: Material Request Item,Sales Order No,Ordine di vendita No DocType: Item Group,Item Group Name,Nome Gruppo Articoli apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Preso apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione @@ -1578,7 +1578,7 @@ DocType: Journal Entry,Accounts Receivable,Conti esigibili DocType: Address Template,This format is used if country specific format is not found,Questo formato viene utilizzato se il formato specifico per il Paese non viene trovata DocType: Production Order,Use Multi-Level BOM,Utilizzare BOM Multi-Level DocType: Bank Reconciliation,Include Reconciled Entries,Includi Voci riconciliati -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Albero dei conti financial . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Albero dei conti finanial . DocType: Leave Control Panel,Leave blank if considered for all employee types,Lasciare vuoto se considerato per tutti i tipi dipendenti DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuire oneri corrispondenti apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,La voce {0} deve essere di tipo 'Cespite' così come {1} è una voce dell'attivo. diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv index fad54750dc..f85d98b527 100644 --- a/erpnext/translations/ja.csv +++ b/erpnext/translations/ja.csv @@ -840,7 +840,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生 DocType: Opportunity,Walk In,立入 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ストックエントリ DocType: Item,Inspection Criteria,検査基準 -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,財務コストセンターのツリー +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,財務コストセンターのツリー apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,移転済 apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です） apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,ホワイト @@ -1234,7 +1234,7 @@ DocType: Employee External Work History,Total Experience,実績合計 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,投資活動によるキャッシュフロー apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金 -DocType: Material Request Item,Sales Order,受注番号 +DocType: Material Request Item,Sales Order No,受注番号 DocType: Item Group,Item Group Name,アイテムグループ名 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,売上高 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,製造用資材配送 @@ -1593,7 +1593,7 @@ DocType: Journal Entry,Accounts Receivable,売掛金 DocType: Address Template,This format is used if country specific format is not found,国別の書式が無い場合は、この書式が使用されます DocType: Production Order,Use Multi-Level BOM,マルチレベルの部品表を使用 DocType: Bank Reconciliation,Include Reconciled Entries,照合済のエントリを含む -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,財務アカウントのツリー +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,財務アカウントのツリー DocType: Leave Control Panel,Leave blank if considered for all employee types,全従業員タイプを対象にする場合は空白のままにします DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分基準 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv index 1db6cf58ae..22ff4fee1a 100644 --- a/erpnext/translations/km.csv +++ b/erpnext/translations/km.csv @@ -809,7 +809,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញ DocType: Opportunity,Walk In,ដើរក្នុង apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ធាតុភាគហ៊ុន DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយ financial ។ +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយ finanial ។ apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ផ្ទេរប្រាក់ apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,សេត @@ -1200,7 +1200,7 @@ DocType: Employee External Work History,Total Experience,បទពិសោធ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត -DocType: Material Request Item,Sales Order,គ្មានការលក់សណ្តាប់ធ្នាប់ +DocType: Material Request Item,Sales Order No,គ្មានការលក់សណ្តាប់ធ្នាប់ DocType: Item Group,Item Group Name,ធាតុឈ្មោះក្រុម apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,គេយក apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ @@ -1553,7 +1553,7 @@ DocType: Journal Entry,Accounts Receivable,គណនីអ្នកទទួល DocType: Address Template,This format is used if country specific format is not found,ទ្រង់ទ្រាយនេះត្រូវបានប្រើប្រសិនបើទ្រង់ទ្រាយជាក់លាក់គឺមិនត្រូវបានរកឃើញថាប្រទេស DocType: Production Order,Use Multi-Level BOM,ប្រើពហុកម្រិត Bom DocType: Bank Reconciliation,Include Reconciled Entries,រួមបញ្ចូលធាតុសំរុះសំរួល -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,មែកធាងនៃគណនីរបស់ financial ។ +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,មែកធាងនៃគណនីរបស់ finanial ។ DocType: Leave Control Panel,Leave blank if considered for all employee types,ប្រសិនបើអ្នកទុកវាឱ្យទទេអស់ទាំងប្រភេទពិចារណាសម្រាប់បុគ្គលិក DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយផ្អែកលើការចែកចាយការចោទប្រកាន់ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,គណនី {0} ត្រូវតែមានប្រភេទ "ទ្រព្យ" ដែលជាធាតុ {1} ជាធាតុធាតុសកម្មមួយ diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv index 34143a7a42..48400ce919 100644 --- a/erpnext/translations/kn.csv +++ b/erpnext/translations/kn.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜ DocType: Opportunity,Walk In,ವಲ್ಕ್ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial ವೆಚ್ಚ ಕೇಂದ್ರದ ಟ್ರೀ . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial ವೆಚ್ಚ ಕೇಂದ್ರದ ಟ್ರೀ . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ವರ್ಗಾವಣೆಯ apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,ಬಿಳಿ @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್ -DocType: Material Request Item,Sales Order,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ +DocType: Material Request Item,Sales Order No,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ಟೇಕನ್ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್ @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,ಸ್ವೀಕರಿಸುವಂ DocType: Address Template,This format is used if country specific format is not found,ದೇಶದ ನಿರ್ದಿಷ್ಟ ಸ್ವರೂಪ ದೊರೆಯಲಿಲ್ಲ ವೇಳೆ ಈ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿದಾಗ DocType: Production Order,Use Multi-Level BOM,ಬಹು ಮಟ್ಟದ BOM ಬಳಸಿ DocType: Bank Reconciliation,Include Reconciled Entries,ಮರುಕೌನ್ಸಿಲ್ ನಮೂದುಗಳು ಸೇರಿಸಿ -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial ಖಾತೆಗಳ ಟ್ರೀ . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial ಖಾತೆಗಳ ಟ್ರೀ . DocType: Leave Control Panel,Leave blank if considered for all employee types,ಎಲ್ಲಾ ನೌಕರ ರೀತಿಯ ಪರಿಗಣಿಸಲಾಗಿದೆ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ DocType: Landed Cost Voucher,Distribute Charges Based On,ವಿತರಿಸಲು ಆರೋಪಗಳ ಮೇಲೆ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,ಐಟಂ {1} ಆಸ್ತಿ ಐಟಂ ಖಾತೆ {0} ಬಗೆಯ ' ಸ್ಥಿರ ಆಸ್ತಿ ' ಇರಬೇಕು diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv index 32b3582c8c..7bd12d27e0 100644 --- a/erpnext/translations/ko.csv +++ b/erpnext/translations/ko.csv @@ -121,7 +121,7 @@ DocType: Tax Rule,Tax Type,세금의 종류 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +137,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0} DocType: Item,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼) apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,고객은 같은 이름을 가진 -DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간 속도 / 60) * 실제 작업 시간 +DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간 / 60) * 실제 작업 시간 DocType: SMS Log,SMS Log,SMS 로그 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,배달 항목의 비용 DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을 @@ -381,7 +381,7 @@ apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,R DocType: Account,Is Group,IS 그룹 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,자동으로 FIFO를 기반으로 제 직렬 설정 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,체크 공급 업체 송장 번호 특이 사항 -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','사건 번호 사람' '사건 번호에서'보다 작을 수 없습니다 +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',' 마지막 케이스 번호' 는 '시작 케이스 번호' 보다 커야 합니다. apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,비영리 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,시작되지 않음 DocType: Lead,Channel Partner,채널 파트너 @@ -534,7 +534,7 @@ DocType: Employee,Passport Number,여권 번호 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,관리자 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다. DocType: SMS Settings,Receiver Parameter,수신기 매개 변수 -apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'을 바탕으로'와 '그룹으로는'동일 할 수 없습니다 +apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Based On'과 'Group By'는 달라야 합니다. DocType: Sales Person,Sales Person Targets,영업 사원 대상 DocType: Production Order Operation,In minutes,분에서 DocType: Issue,Resolution Date,결의일 @@ -807,7 +807,7 @@ DocType: Lead,Request for Information,정보 요청 DocType: Payment Request,Paid,지불 DocType: Salary Slip,Total in words,즉 전체 DocType: Material Request Item,Lead Time Date,리드 타임 날짜 -apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,필수입니다. 아마 환전 레코드가 만들어지지 않습니다 +apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,필수입니다. 환율 레코드가 생성되지 않았습니다. apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1} apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +532,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'제품 번들'항목, 창고, 일련 번호 및 배치에 대해 아니오 '포장 목록'테이블에서 고려 될 것이다. 창고 및 배치 없음 어떤 '제품 번들'항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 '목록 포장'을 복사됩니다." apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,고객에게 선적. @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림 DocType: Opportunity,Walk In,걷다 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,재고 항목 DocType: Item,Inspection Criteria,검사 기준 -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial 코스트 센터의 나무. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,finanial 코스트 센터의 나무. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,옮겨진 apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,화이트 @@ -990,7 +990,7 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,비 조정 지불 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함 DocType: Lead,Call,전화 -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +411,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다 +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +411,'Entries' cannot be empty,'항목란'을 채워 주세요. apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1} ,Trial Balance,시산표 apps/erpnext/erpnext/config/hr.py +220,Setting up Employees,직원 설정 @@ -1138,7 +1138,7 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re DocType: Pricing Rule,Campaign,캠페인 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',승인 상태가 '승인'또는 '거부'해야 DocType: Purchase Invoice,Contact Person,담당자 -apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','예상 시작 날짜는'예상 종료 날짜 '보다 클 수 없습니다 +apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','예상 시작 날짜'는'예상 종료 날짜 ' 이전이어야 합니다. DocType: Holiday List,Holidays,휴가 DocType: Sales Order Item,Planned Quantity,계획 수량 DocType: Purchase Invoice Item,Item Tax Amount,항목 세액 @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,총 체험 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,포장 명세서 (들) 취소 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,투자의 현금 흐름 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금 -DocType: Material Request Item,Sales Order,판매 주문 번호 +DocType: Material Request Item,Sales Order No,판매 주문 번호 DocType: Item Group,Item Group Name,항목 그룹 이름 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,촬영 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,제조에 대한 전송 재료 @@ -1311,7 +1311,7 @@ apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} qua apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,공급 유형 마스터. DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다 -apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지 +apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지되었습니다. DocType: Accounts Settings,Credit Controller,신용 컨트롤러 DocType: Delivery Note,Vehicle Dispatch Date,차량 파견 날짜 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지 @@ -1557,7 +1557,7 @@ DocType: Activity Cost,Costing Rate,원가 계산 속도 DocType: Employee,Resignation Letter Date,사직서 날짜 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다. apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,반복 고객 수익 -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 역할 '지출 승인'을 가지고 있어야합니다 +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1})은 '지출 승인자'이어야 합니다. apps/erpnext/erpnext/public/js/setup_wizard.js +292,Pair,페어링 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여 DocType: Maintenance Schedule Detail,Actual Date,실제 날짜 @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,미수금 DocType: Address Template,This format is used if country specific format is not found,국가 별 형식을 찾을 수없는 경우이 형식이 사용됩니다 DocType: Production Order,Use Multi-Level BOM,사용 다중 레벨 BOM DocType: Bank Reconciliation,Include Reconciled Entries,조정 됨 항목을 포함 -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,재무계정트리 +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,재무계정트리 DocType: Leave Control Panel,Leave blank if considered for all employee types,모든 직원의 유형을 고려하는 경우 비워 둡니다 DocType: Landed Cost Voucher,Distribute Charges Based On,배포 요금을 기준으로 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,품목은 {1} 자산 상품이기 때문에 계정 {0} 형식의 '고정 자산'이어야합니다 @@ -1815,7 +1815,7 @@ DocType: Appraisal,Employee,종업원 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,가져 오기 이메일 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,사용자로 초대하기 DocType: Features Setup,After Sale Installations,판매 설치 후 -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is fully billed,{0} {1} 전액 청구됩니다 +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is fully billed,{0} {1} 전액 지불되었습니다. DocType: Workstation Working Hour,End Time,종료 시간 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,판매 또는 구매를위한 표준 계약 조건. apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,바우처 그룹 @@ -1848,7 +1848,7 @@ DocType: Quality Inspection Reading,Accepted,허용 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다. apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},잘못된 참조 {0} {1} DocType: Payment Tool,Total Payment Amount,총 결제 금액 -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) 계획 quanitity보다 클 수 없습니다 ({2}) 생산에 주문 {3} +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{3} 생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다. DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다. apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다." @@ -1860,7 +1860,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change ra DocType: Employee,Previous Work Experience,이전 작업 경험 DocType: Stock Entry,For Quantity,수량 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1} -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,{0} {1} is not submitted,{0} {1} 제출되지 +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다. apps/erpnext/erpnext/config/stock.py +18,Requests for items.,상품에 대한 요청. DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다. DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1 @@ -2351,7 +2351,7 @@ DocType: Features Setup,Sales Extras,판매 부가항목 apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 계정에 대한 예산은 {1} 코스트 센터에 대해 {2} {3}에 의해 초과 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다" apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +131,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0} -apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는 '마감일자'이후이 여야합니다 +apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는 '마감일자' 이전이어야 합니다 ,Stock Projected Qty,재고 수량을 예상 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1} DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML @@ -2577,7 +2577,7 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To c DocType: Hub Settings,Publish Availability,가용성을 게시 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,생년월일은 오늘보다 클 수 없습니다. ,Stock Ageing,재고 고령화 -apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0} '{1}'해제 +apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다. apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오. apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}. @@ -2664,7 +2664,7 @@ DocType: Manufacturer,Limited to 12 characters,12 자로 제한 DocType: Journal Entry,Print Heading,인쇄 제목 DocType: Quotation,Maintenance Manager,유지 관리 관리자 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,총은 제로가 될 수 없습니다 -apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'마지막 주문 날짜 이후'는 0보다 크거나 같아야합니다 +apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'마지막 주문 날짜' 이후의 날짜를 지정해 주세요. DocType: C-Form,Amended From,개정 apps/erpnext/erpnext/public/js/setup_wizard.js +289,Raw Material,원료 DocType: Leave Application,Follow via Email,이메일을 통해 수행 @@ -2820,7 +2820,7 @@ DocType: GL Entry,Is Advance,사전인가 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,날짜에 날짜 및 출석 출석은 필수입니다 apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청' DocType: Sales Team,Contact No.,연락 번호 -apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익'계정 {0}은 개시기입이 허용되지 않습니다 +apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익' 타입 계정 {0}은 입력하도록 하용되지 않습니다 DocType: Features Setup,Sales Discounts,매출 할인 DocType: Hub Settings,Seller Country,판매자 나라 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,웹 사이트에 항목을 게시 @@ -2931,7 +2931,7 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,공급 업체 견적 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다. -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1}이 정지 될 +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1}이 정지 되었습니다. apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1} DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,비용을 추가하는 규칙. @@ -3050,7 +3050,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js DocType: Production Order Operation,Production Order Operation,생산 오더 운영 DocType: Pricing Rule,Disable,사용 안함 DocType: Project Task,Pending Review,검토 중 -apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +122, Click here to pay,지불하려면 여기를 클릭하십시오 +apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +122, Click here to pay,클릭해서 결재하기 DocType: Task,Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,고객 아이디 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,마크 결석 @@ -3180,7 +3180,7 @@ apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support ema apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,부족 수량 apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재 DocType: Salary Slip,Salary Slip,급여 전표 -apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'마감일자'필요 +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'마감일자'가 필요합니다. DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","패키지가 제공하는 슬립 포장 생성합니다.패키지 번호, 패키지 내용과 그 무게를 통보하는 데 사용됩니다." DocType: Sales Invoice Item,Sales Order Item,판매 주문 품목 DocType: Salary Slip,Payment Days,지불 일 @@ -3258,7 +3258,7 @@ DocType: Salary Slip Deduction,Default Amount,기본 금액 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,시스템에서 찾을 수없는 창고 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,이 달의 요약 DocType: Quality Inspection Reading,Quality Inspection Reading,품질 검사 읽기 -apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`이상 경과 프리즈 주식은`% d의 일보다 작아야한다. +apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다. DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입 ,Project wise Stock Tracking,프로젝트 현명한 재고 추적 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},유지 보수 일정은 {0}에있는 {0} @@ -3373,7 +3373,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +56,What does it do?,그것은 DocType: Delivery Note,To Warehouse,창고 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},계정 {0} 더 많은 회계 연도 번 이상 입력 한 {1} ,Average Commission Rate,평균위원회 평가 -apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다 +apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말 DocType: Purchase Taxes and Charges,Account Head,계정 헤드 diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv index 8e3bc6ee5e..52f0fbec6e 100644 --- a/erpnext/translations/lv.csv +++ b/erpnext/translations/lv.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Nesūtiet darbinieku DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Krājumu DocType: Item,Inspection Criteria,Pārbaudes kritēriji -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Koks financial izmaksu centriem. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Koks finanial izmaksu centriem. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nodota apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Balts @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Kopā pieredze apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (s) atcelts apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Naudas plūsma no ieguldījumu apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi -DocType: Material Request Item,Sales Order,Pasūtījumu Nr +DocType: Material Request Item,Sales Order No,Pasūtījumu Nr DocType: Item Group,Item Group Name,Postenis Grupas nosaukums apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materiāli Ražošana @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Debitoru parādi DocType: Address Template,This format is used if country specific format is not found,"Šis formāts tiek izmantots, ja valstij īpašs formāts nav atrasts" DocType: Production Order,Use Multi-Level BOM,Lietojiet Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Iekļaut jāsaskaņo Ieraksti -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Koks financial kontiem. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Koks finanial kontiem. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Atstājiet tukšu, ja uzskatīja visus darbinieku tipiem" DocType: Landed Cost Voucher,Distribute Charges Based On,Izplatīt Maksa Based On apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konts {0} ir jābūt tipa ""pamatlīdzeklis"", kā postenis {1} ir Asset postenis" diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv index c773189958..79d41c8496 100644 --- a/erpnext/translations/mk.csv +++ b/erpnext/translations/mk.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај в DocType: Opportunity,Walk In,Прошетка во apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Акции записи DocType: Item,Inspection Criteria,Критериуми за инспекција -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Дрвото на financial трошочни центри. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Дрвото на finanial трошочни центри. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Трансферираните apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бела @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Вкупно Искус apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Пакување фиш (и) откажани apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични текови од инвестициони apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави -DocType: Material Request Item,Sales Order,Продај Побарувања Не +DocType: Material Request Item,Sales Order No,Продај Побарувања Не DocType: Item Group,Item Group Name,Точка име на група apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Земени apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Пренос на материјали за изработка @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Побарувања DocType: Address Template,This format is used if country specific format is not found,Овој формат се користи ако не се најде специфичен формат земја DocType: Production Order,Use Multi-Level BOM,Користете Мулти-ниво на бирото DocType: Bank Reconciliation,Include Reconciled Entries,Вклучи се помири записи -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Дрвото на financial сметки. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Дрвото на finanial сметки. DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставете го празно ако се земе предвид за сите видови на вработените DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирање пријави Врз основа на apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"На сметка {0} мора да биде од типот "основни средства", како точка {1} е предност Точка" diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv index ea56eb7c09..647bdeab72 100644 --- a/erpnext/translations/ml.csv +++ b/erpnext/translations/ml.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,എംപ്ലേ DocType: Opportunity,Walk In,നടപ്പാൻ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ DocType: Item,Inspection Criteria,ഇൻസ്പെക്ഷൻ മാനദണ്ഡം -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial ചെലവ് സെന്റേഴ്സ് ട്രീ. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial ചെലവ് സെന്റേഴ്സ് ട്രീ. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ട്രാൻസ്ഫർ apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,വൈറ്റ് @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,ആകെ അനുഭ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള -DocType: Material Request Item,Sales Order,സെയിൽസ് ഓർഡർ ഇല്ല +DocType: Material Request Item,Sales Order No,സെയിൽസ് ഓർഡർ ഇല്ല DocType: Item Group,Item Group Name,ഇനം ഗ്രൂപ്പ് പേര് apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,എടുത്ത apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽസ് കൈമാറുക @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,സ്വീകാരയോഗ് DocType: Address Template,This format is used if country specific format is not found,രാജ്യ നിർദ്ദിഷ്ട ഫോർമാറ്റ് കണ്ടെത്തിയില്ല ഇല്ലെങ്കിൽ ഈ ഫോർമാറ്റ് ഉപയോഗിക്കുന്നു DocType: Production Order,Use Multi-Level BOM,മൾട്ടി-ലെവൽ BOM ഉപയോഗിക്കുക DocType: Bank Reconciliation,Include Reconciled Entries,പൊരുത്തപ്പെട്ട എൻട്രികൾ ഉൾപ്പെടുത്തുക -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial അക്കൌണ്ടുകളുടെ ട്രീ. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial അക്കൌണ്ടുകളുടെ ട്രീ. DocType: Leave Control Panel,Leave blank if considered for all employee types,എല്ലാ ജീവനക്കാരുടെ തരം പരിഗണിക്കില്ല എങ്കിൽ ശൂന്യമായിടൂ DocType: Landed Cost Voucher,Distribute Charges Based On,അടിസ്ഥാനമാക്കി നിരക്കുകൾ വിതരണം apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,അക്കൗണ്ട് ഇനം {1} പോലെ {0} തരത്തിലുള്ള ആയിരിക്കണം 'നിശ്ചിത അസറ്റ്' ഒരു അസറ്റ് ഇനം ആണ് diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv index 1c01841b7a..1a444ec6f0 100644 --- a/erpnext/translations/mr.csv +++ b/erpnext/translations/mr.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचा DocType: Opportunity,Walk In,मध्ये चाला apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,शेअर नोंदी DocType: Item,Inspection Criteria,तपासणी निकष -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial खर्च केंद्रांची वृक्ष. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial खर्च केंद्रांची वृक्ष. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,हस्तांतरण apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,व्हाइट @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,एकूण अनु apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,गुंतवणूक रोख प्रवाह apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क -DocType: Material Request Item,Sales Order,विक्री ऑर्डर नाही +DocType: Material Request Item,Sales Order No,विक्री ऑर्डर नाही DocType: Item Group,Item Group Name,आयटम गट नाव apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,घेतले apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,प्राप्तीयोग् DocType: Address Template,This format is used if country specific format is not found,"देशातील विशिष्ट स्वरूप सापडले नाही, तर हे स्वरूप वापरले जाते" DocType: Production Order,Use Multi-Level BOM,मल्टी लेव्हल BOM वापरा DocType: Bank Reconciliation,Include Reconciled Entries,समेट नोंदी समाविष्ट -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial खाती वृक्ष. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial खाती वृक्ष. DocType: Leave Control Panel,Leave blank if considered for all employee types,सर्व कर्मचारी प्रकार विचार तर रिक्त सोडा DocType: Landed Cost Voucher,Distribute Charges Based On,वितरण शुल्क आधारित apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आयटम {1} मालमत्ता आयटम आहे म्हणून खाते {0} 'मुदत मालमत्ता' प्रकारच्या असणे आवश्यक आहे diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv index cc6153af6b..c8f81eb4f9 100644 --- a/erpnext/translations/ms.csv +++ b/erpnext/translations/ms.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerj DocType: Opportunity,Walk In,Berjalan Dalam apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Penyertaan Saham DocType: Item,Inspection Criteria,Kriteria Pemeriksaan -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Pohon Pusat Kos financial. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Pohon Pusat Kos finanial. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Dipindahkan apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,White @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Jumlah Pengalaman apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Aliran tunai daripada Pelaburan apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding dan Caj -DocType: Material Request Item,Sales Order,Pesanan Jualan No +DocType: Material Request Item,Sales Order No,Pesanan Jualan No DocType: Item Group,Item Group Name,Perkara Kumpulan Nama apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Bahan Pemindahan bagi Pembuatan @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Akaun-akaun boleh terima DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format tertentu negara tidak dijumpai DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Penyertaan berdamai -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Tree akaun financial. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Tree akaun finanial. DocType: Leave Control Panel,Leave blank if considered for all employee types,Tinggalkan kosong jika dipertimbangkan untuk semua jenis pekerja DocType: Landed Cost Voucher,Distribute Charges Based On,Mengedarkan Caj Berasaskan apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akaun {0} mestilah dari jenis 'Aset Tetap' sebagai Item {1} adalah Perkara Aset diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv index 7cfef14f6e..89fd824781 100644 --- a/erpnext/translations/my.csv +++ b/erpnext/translations/my.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်း DocType: Opportunity,Walk In,ခုနှစ်တွင် Walk apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,စတော့အိတ် Entries DocType: Item,Inspection Criteria,စစ်ဆေးရေးလိုအပ်ချက် -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial ကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။ +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,finanial ကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။ apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferable apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,အဖြူ @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,စုစုပေါ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက် -DocType: Material Request Item,Sales Order,အရောင်းအမိန့်မရှိပါ +DocType: Material Request Item,Sales Order No,အရောင်းအမိန့်မရှိပါ DocType: Item Group,Item Group Name,item Group မှအမည် apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,ငွေစာရင်းရရန DocType: Address Template,This format is used if country specific format is not found,တိုင်းပြည်တိကျတဲ့ format ကိုမတွေ့ရှိပါကဤ format ကိုအသုံးပြုပါတယ် DocType: Production Order,Use Multi-Level BOM,Multi-Level BOM ကိုသုံးပါ DocType: Bank Reconciliation,Include Reconciled Entries,ပြန်. Entries Include -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial အကောင့်အသစ်များ၏ပင်လည်းရှိ၏။ +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,finanial အကောင့်အသစ်များ၏ပင်လည်းရှိ၏။ DocType: Leave Control Panel,Leave blank if considered for all employee types,အားလုံးန်ထမ်းအမျိုးအစားစဉ်းစားလျှင်အလွတ် Leave DocType: Landed Cost Voucher,Distribute Charges Based On,တွင် အခြေခံ. စွပ်စွဲချက်ဖြန့်ဝေ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,အကောင့်ဖွင့် Item {1} အဖြစ် {0} အမျိုးအစားဖြစ်ရမည် '' Fixed Asset '' တစ်ဦး Asset Item ဖြစ်ပါတယ် diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv index 697f3a298f..59f631ad07 100644 --- a/erpnext/translations/nl.csv +++ b/erpnext/translations/nl.csv @@ -136,7 +136,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +137,Account with exist DocType: Lead,Product Enquiry,Product Aanvraag apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vul aub eerst bedrijf in apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Selecteer Company eerste -DocType: Employee Education,Under Graduate,Onder Graduate +DocType: Employee Education,Under Graduate,Student zonder graad apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Doel op DocType: BOM,Total Cost,Totale kosten apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activiteitenlogboek: @@ -253,7 +253,7 @@ DocType: Item,Publish in Hub,Publiceren in Hub ,Terretory,Regio apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Artikel {0} is geannuleerd apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materiaal Aanvraag -DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum +DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij DocType: Item,Purchase Details,Inkoop Details apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +325,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} niet gevonden in 'Raw Materials geleverd' tafel in Purchase Order {1} DocType: Employee,Relation,Relatie @@ -278,7 +278,7 @@ apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,laatst apps/erpnext/erpnext/public/js/setup_wizard.js +55,Max 5 characters,Max. 5 tekens DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,De eerste Verlofgoedkeurder in de lijst wordt als de standaard Verlofgoedkeurder ingesteld apps/erpnext/erpnext/config/desktop.py +83,Learn,Leren -apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteit kosten per werknemer +apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteitskosten per werknemer DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Beheer Sales Person Boom . apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Uitstekende Cheques en Deposito's te ontruimen @@ -357,7 +357,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multi DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten DocType: Workstation,Consumable Cost,Verbruikskosten apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben -DocType: Purchase Receipt,Vehicle Date,Vehicle Data +DocType: Purchase Receipt,Vehicle Date,Voertuiggegegevns apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,medisch apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0} @@ -485,7 +485,7 @@ apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year DocType: Warranty Claim,Resolution,Oplossing apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Levertijd: {0} apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verschuldigd Account -DocType: Sales Order,Billing and Delivery Status,Facturering en Delivery Status +DocType: Sales Order,Billing and Delivery Status,Factuur- en leverstatus apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten DocType: Leave Control Panel,Allocate,Toewijzen apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Sales Return,Terugkerende verkoop @@ -597,7 +597,7 @@ DocType: Purchase Invoice,The date on which next invoice will be generated. It i apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Vlottende Activa apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} is geen voorraad artikel DocType: Mode of Payment Account,Default Account,Standaard Rekening -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de Opportunity is gemaakt obv een lead +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Selecteer wekelijkse vrije dag DocType: Production Order Operation,Planned End Time,Geplande Eindtijd ,Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise @@ -606,9 +606,9 @@ DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant DocType: Employee,Cell Number,Mobiele nummer apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren -apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom +apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,U kan geen 'Voucher' invoeren in een 'Tegen Journal Entry' kolom apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie -DocType: Opportunity,Opportunity From,Opportunity Van +DocType: Opportunity,Opportunity From,Opportuniteit Van apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Maandsalaris overzicht. DocType: Item Group,Website Specifications,Website Specificaties apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Er is een fout in uw Address Template {0} @@ -754,7 +754,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +70,The name of your company for DocType: HR Settings,Include holidays in Total no. of Working Days,Feestdagen opnemen in totaal aantal werkdagen. DocType: Job Applicant,Hold,Houden DocType: Employee,Date of Joining,Datum van Indiensttreding -DocType: Naming Series,Update Series,Bijwerken Reeksen +DocType: Naming Series,Update Series,Reeksen bijwerken DocType: Supplier Quotation,Is Subcontracted,Wordt uitbesteed DocType: Item Attribute,Item Attribute Values,Item Attribuutwaarden apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Bekijk Abonnees @@ -831,7 +831,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Inzendingen DocType: Item,Inspection Criteria,Inspectie Criteria -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Boom van financiële kostenplaatsen. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Boom van financiële kostenplaatsen. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overgebrachte apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Wit @@ -983,7 +983,7 @@ apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punt 1 DocType: Holiday,Holiday,Feestdag DocType: Leave Control Panel,Leave blank if considered for all branches,Laat leeg indien dit voor alle vestigingen is ,Daily Time Log Summary,Dagelijkse Tijd Log Samenvatting -DocType: Payment Reconciliation,Unreconciled Payment Details,Niet-afgeletterde Betalingsgegevens +DocType: Payment Reconciliation,Unreconciled Payment Details,Niet overeenstemmende betalingsgegevens DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal DocType: Lead,Call,Bellen @@ -1015,7 +1015,7 @@ DocType: Purchase Invoice,Is Recurring,Is Terugkerende DocType: Purchase Order,Supplied Items,Geleverde Artikelen DocType: Production Order,Qty To Manufacture,Aantal te produceren DocType: Buying Settings,Maintain same rate throughout purchase cycle,Handhaaf zelfde tarief gedurende inkoopcyclus -DocType: Opportunity Item,Opportunity Item,Opportunity Artikel +DocType: Opportunity Item,Opportunity Item,Opportuniteit artikel apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tijdelijke Opening ,Employee Leave Balance,Werknemer Verlof Balans apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +124,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn @@ -1050,7 +1050,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mand apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,landbouw apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Uw producten of diensten DocType: Mode of Payment,Mode of Payment,Wijze van betaling -apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Afbeelding moet een publiek bestand of website URL +apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt . DocType: Journal Entry Account,Purchase Order,Inkooporder DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info @@ -1197,7 +1197,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Instellingen SMS gateway apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt! apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nog geen adres toegevoegd. -DocType: Workstation Working Hour,Workstation Working Hour,Workstation Werken Hour +DocType: Workstation Working Hour,Workstation Working Hour,Werkstation Werkuur apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analist apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2} DocType: Item,Inventory,Voorraad @@ -1223,7 +1223,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakbon(en) geannuleerd apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,De kasstroom uit investeringsactiviteiten apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten -DocType: Material Request Item,Sales Order,Verkooporder nr. +DocType: Material Request Item,Sales Order No,Verkooporder nr. DocType: Item Group,Item Group Name,Artikel groepsnaam apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Ingenomen apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Verplaats Materialen voor Productie @@ -1414,7 +1414,7 @@ DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren . apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template DocType: Employee,Leave Encashed?,Verlof verzilverd? -apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Van veld is verplicht +apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Opportuniteit Van"" veld is verplicht" DocType: Item,Variants,Varianten apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +769,Make Purchase Order,Maak inkooporder DocType: SMS Center,Send To,Verzenden naar @@ -1424,7 +1424,7 @@ DocType: Sales Team,Contribution to Net Total,Bijdrage aan Netto Totaal DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering DocType: Territory,Territory Name,Regio Naam -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Onderhanden Werk Magazijn is vereist alvorens in te dienen +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kandidaat voor een baan. DocType: Purchase Order Item,Warehouse and Reference,Magazijn en Referentie DocType: Supplier,Statutory info and other general information about your Supplier,Wettelijke info en andere algemene informatie over uw leverancier @@ -1448,7 +1448,7 @@ DocType: Employee,Salutation,Aanhef DocType: Pricing Rule,Brand,Merk DocType: Item,Will also apply for variants,Geldt ook voor varianten apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundel artikelen op moment van verkoop. -DocType: Sales Order Item,Actual Qty,Werkelijk Aantal +DocType: Sales Order Item,Actual Qty,Werkelijk aantal DocType: Sales Invoice Item,References,Referenties DocType: Quality Inspection Reading,Reading 10,Meting 10 apps/erpnext/erpnext/public/js/setup_wizard.js +278,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Een lijst van uw producten of diensten die u koopt of verkoopt . @@ -1542,7 +1542,7 @@ DocType: Item Group,Show In Website,Toon in Website apps/erpnext/erpnext/public/js/setup_wizard.js +287,Group,Groep DocType: Task,Expected Time (in hours),Verwachte Tijd (in uren) ,Qty to Order,Aantal te bestellen -DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Om merknaam volgen in de volgende documenten Delivery Note, Opportunity, Material Request, Item, Purchase Order, Aankoopbon, Koper ontvangst, Citaat, Sales Invoice, Goederen Bundel, Sales Order, Serienummer" +DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Om merknaam te volgen in de volgende documenten Delivery Note, Opportunity, Material Request, Item, Purchase Order, Aankoopbon, Koper ontvangst, Citaat, Sales Invoice, Goederen Bundel, Sales Order, Serienummer" apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram van alle taken. DocType: Appraisal,For Employee Name,Voor Naam werknemer DocType: Holiday List,Clear Table,Wis Tabel @@ -1578,7 +1578,7 @@ DocType: Journal Entry,Accounts Receivable,Debiteuren DocType: Address Template,This format is used if country specific format is not found,Dit formaat wordt gebruikt als landspecifiek formaat niet kan worden gevonden DocType: Production Order,Use Multi-Level BOM,Gebruik Multi-Level Stuklijst DocType: Bank Reconciliation,Include Reconciled Entries,Omvatten Reconciled Entries -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Boom van financiële rekeningen +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Boom van financiële rekeningen DocType: Leave Control Panel,Leave blank if considered for all employee types,Laat leeg indien overwogen voor alle werknemer soorten DocType: Landed Cost Voucher,Distribute Charges Based On,Verdeel Toeslagen op basis van apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Rekening {0} moet van het type 'vaste activa', omdat Artikel {1} een Activa Artikel is" @@ -1871,7 +1871,7 @@ DocType: Authorization Rule,Authorized Value,Authorized Value DocType: Contact,Enter department to which this Contact belongs,Voer afdeling in waartoe deze Contactpersoon behoort apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totaal Afwezig apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +736,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag -apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Eenheid +apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Meeteenheid DocType: Fiscal Year,Year End Date,Jaar Einddatum DocType: Task Depends On,Task Depends On,Taak Hangt On DocType: Lead,Opportunity,Opportunity @@ -1947,7 +1947,7 @@ DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1} apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +498,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening -DocType: Tax Rule,Billing City,Billing Stad +DocType: Tax Rule,Billing City,Stad DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool apps/erpnext/erpnext/config/accounts.py +174,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card" DocType: Journal Entry,Credit Note,Creditnota @@ -2017,7 +2017,7 @@ DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref DocType: Cost Center,Cost Center,Kostenplaats -apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher nr +apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher nr DocType: Notification Control,Purchase Order Message,Inkooporder Bericht DocType: Tax Rule,Shipping Country,Verzenden Land DocType: Upload Attendance,Upload HTML,Upload HTML @@ -2047,7 +2047,7 @@ DocType: Sales Invoice,Debit To,Debitering van DocType: Delivery Note,Required only for sample item.,Alleen benodigd voor Artikelmonster. DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag -DocType: Supplier,Billing Currency,Billing Valuta +DocType: Supplier,Billing Currency,Valuta apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Groot ,Profit and Loss Statement,Winst-en verliesrekening DocType: Bank Reconciliation Detail,Cheque Number,Cheque nummer @@ -2212,7 +2212,7 @@ DocType: Quality Inspection,Inspection Type,Inspectie Type apps/erpnext/erpnext/controllers/recurring_document.py +164,Please select {0},Selecteer {0} DocType: C-Form,C-Form No,C-vorm nr. DocType: BOM,Exploded_items,Uitgeklapte Artikelen -DocType: Employee Attendance Tool,Unmarked Attendance,ongemarkeerde Attendance +DocType: Employee Attendance Tool,Unmarked Attendance,Ongemerkte aanwezigheid apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,onderzoeker apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Sla de nieuwsbrief op voor het verzenden apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Naam of E-mail is verplicht @@ -2382,7 +2382,7 @@ DocType: Workstation Working Hour,Start Time,Starttijd DocType: Item Price,Bulk Import Help,Bulk Import Help apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +197,Select Quantity,Kies aantal apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeuring Rol kan niet hetzelfde zijn als de rol van de regel is van toepassing op -apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Afmelden dit Email Digest +apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Afmelden bij dit e-mailoverzicht apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,bericht verzonden apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,Houdend met kind knooppunten kan niet worden ingesteld als grootboek DocType: Production Plan Sales Order,SO Date,VO Datum @@ -2498,7 +2498,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +86,Company Name cannot be Compan apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefhoofden voor print sjablonen. apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titels voor print sjablonen bijv. Proforma Factuur. apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd -DocType: POS Profile,Update Stock,Bijwerken Voorraad +DocType: POS Profile,Update Stock,Voorraad bijwerken apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is. DocType: Payment Request,Payment Details,Betalingsdetails apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief @@ -2534,7 +2534,7 @@ DocType: Time Log,Billable,Factureerbaar DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Bestelaantal DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening -DocType: Journal Entry,Write Off,Schrijf Off +DocType: Journal Entry,Write Off,Afschrijven DocType: Time Log,Operation ID,Operation ID DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systeemgebruiker (login) ID. Indien ingesteld, zal het de standaard worden voor alle HR-formulieren." apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Van {1} @@ -2565,7 +2565,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78, apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0} apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Opmerking: Als de betaling niet is gedaan tegen elke verwijzing, handmatig maken Journal Entry." DocType: Item,Supplier Items,Leverancier Artikelen -DocType: Opportunity,Opportunity Type,Opportunity Type +DocType: Opportunity,Opportunity Type,Type opportuniteit apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nieuw Bedrijf apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Kostenplaats is vereist voor 'winst- en verliesrekening' rekening {0} apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transacties kunnen alleen worden verwijderd door de maker van de Vennootschap @@ -2700,7 +2700,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py behulp Stock Verzoening" apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld. DocType: Lead,Lead Type,Lead Type -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om te bladeren op Block Data keuren +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om afwezigheid goed te keuren op Block Dates apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,Al deze items zijn reeds gefactureerde apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden @@ -2711,7 +2711,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: DocType: Production Planning Tool,Production Planning Tool,Productie Planning Tool DocType: Quality Inspection,Report Date,Rapport datum DocType: C-Form,Invoices,Facturen -DocType: Job Opening,Job Title,Functiebenaming +DocType: Job Opening,Job Title,Functietitel DocType: Features Setup,Item Groups in Details,Artikelgroepen in Details apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn. apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS) @@ -2759,11 +2759,11 @@ apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_ apps/erpnext/erpnext/config/accounts.py +138,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Reeks is verplicht apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening -apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Waar voor Attribute {0} moet binnen het bereik van {1} tot {2} in de stappen van {3} +apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Waarde voor Attribute {0} moet binnen het bereik van {1} tot {2} zijn, in stappen van {3}" DocType: Tax Rule,Sales,Verkoop DocType: Stock Entry Detail,Basic Amount,Basisbedrag apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0} -DocType: Leave Allocation,Unused leaves,Ongebruikte bladeren +DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr DocType: Customer,Default Receivable Accounts,Default Debiteuren DocType: Tax Rule,Billing State,Billing State @@ -2835,15 +2835,15 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot conv apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +45,Opening Value,opening Value apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial # apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commissie op de verkoop -DocType: Offer Letter Term,Value / Description,/ Beschrijving -DocType: Tax Rule,Billing Country,Billing Land +DocType: Offer Letter Term,Value / Description,Waarde / Beschrijving +DocType: Tax Rule,Billing Country,Land ,Customers Not Buying Since Long Time,Klanten Niet kopen Sinds Long Time DocType: Production Order,Expected Delivery Date,Verwachte leverdatum apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}. apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representatiekosten apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +191,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd. apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Leeftijd -DocType: Time Log,Billing Amount,Billing Bedrag +DocType: Time Log,Billing Amount,Factuurbedrag apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ongeldig aantal opgegeven voor artikel {0} . Hoeveelheid moet groter zijn dan 0 . apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aanvragen voor verlof. apps/erpnext/erpnext/accounts/doctype/account/account.py +196,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd @@ -2932,7 +2932,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1 apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1} DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten. -apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,aankomende evenementen +apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Geplande evenementen apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klant is verplicht apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snelle invoer apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} is verplicht voor Return @@ -3018,10 +3018,10 @@ apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} m apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties DocType: GL Entry,Party,Partij DocType: Sales Order,Delivery Date,Leveringsdatum -DocType: Opportunity,Opportunity Date,Opportunity Datum +DocType: Opportunity,Opportunity Date,Datum opportuniteit DocType: Purchase Receipt,Return Against Purchase Receipt,Terug Tegen Aankoop Receipt DocType: Purchase Order,To Bill,Bill -DocType: Material Request,% Ordered,% Bestelde +DocType: Material Request,% Ordered,% Besteld apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,stukwerk apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Gem. Buying Rate DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren) @@ -3151,7 +3151,7 @@ apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.j DocType: Warehouse,Warehouse Name,Magazijn Naam DocType: Naming Series,Select Transaction,Selecteer Transactie apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vul de Goedkeurders Rol of Goedkeurende Gebruiker in -DocType: Journal Entry,Write Off Entry,Schrijf Off Entry +DocType: Journal Entry,Write Off Entry,Invoer afschrijving DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analyse apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Verwijder het vinkje bij alle @@ -3375,7 +3375,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening -apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualiseren extra kosten voor landde kosten van artikelen te berekenen +apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update de bijkomende kosten om de totaalkost te berekenen apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elektrisch DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In) apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +319,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht @@ -3404,7 +3404,7 @@ apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Project act apps/erpnext/erpnext/config/hr.py +78,Generate Salary Slips,Genereer Salarisstroken apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Aankopen moeten worden gecontroleerd, indien ""VAN TOEPASSING VOOR"" is geselecteerd als {0}" apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn -DocType: Purchase Invoice,Write Off Amount (Company Currency),Schrijf Off Bedrag (Company Munt) +DocType: Purchase Invoice,Write Off Amount (Company Currency),Af te schrijven bedrag (Bedrijfsvaluta) apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Stel {0} in @@ -3458,7 +3458,7 @@ DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard Wor apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties. apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +58,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum apps/erpnext/erpnext/stock/get_item_details.py +115,Item {0} must be a Sales Item,Artikel {0} moet een verkoopbaar artikel zijn -DocType: Naming Series,Update Series Number,Bijwerken Serienummer +DocType: Naming Series,Update Series Number,Serienummer bijwerken DocType: Account,Equity,Vermogen DocType: Sales Order,Printing Details,Afdrukken Details DocType: Task,Closing Date,Afsluitingsdatum @@ -3494,7 +3494,7 @@ apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Succesvol Afgeletterd DocType: Production Order,Planned End Date,Geplande Einddatum apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Waar artikelen worden opgeslagen. -DocType: Tax Rule,Validity,Deugdelijkheid +DocType: Tax Rule,Validity,Geldigheid apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Factuurbedrag DocType: Attendance,Attendance,Aanwezigheid DocType: BOM,Materials,Materialen @@ -3715,7 +3715,7 @@ DocType: Supplier,Credit Days,Credit Dagen DocType: Leave Type,Is Carry Forward,Is Forward Carry apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Artikelen ophalen van Stuklijst apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen -apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials +apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Stuklijst apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1} apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Date DocType: Employee,Reason for Leaving,Reden voor vertrek diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv index 98f5fb3335..8ebeb6d978 100644 --- a/erpnext/translations/no.csv +++ b/erpnext/translations/no.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee b DocType: Opportunity,Walk In,Gå Inn apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Aksje Entries DocType: Item,Inspection Criteria,Inspeksjon Kriterier -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tree of financial Kostnadssteder. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tree of finanial Kostnadssteder. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvit @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakking Slip (s) kansellert apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kontantstrøm fra investerings apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader -DocType: Material Request Item,Sales Order,Salgsordre Nei +DocType: Material Request Item,Sales Order No,Salgsordre Nei DocType: Item Group,Item Group Name,Sak Gruppenavn apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tatt apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materialer for produksjon @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Kundefordringer DocType: Address Template,This format is used if country specific format is not found,Dette formatet brukes hvis landet bestemt format ikke er funnet DocType: Production Order,Use Multi-Level BOM,Bruk Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Inkluder forsonet Entries -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Tree of financial kontoer. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Tree of finanial kontoer. DocType: Leave Control Panel,Leave blank if considered for all employee types,La stå tom hvis vurderes for alle typer medarbeider DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere Kostnader Based On apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} må være av typen "Fixed Asset 'som Element {1} er en ressurs Element diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv index 0557923db6..c15782363e 100644 --- a/erpnext/translations/pl.csv +++ b/erpnext/translations/pl.csv @@ -22,7 +22,7 @@ apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_ DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji. DocType: Purchase Order,Customer Contact,Kontakt z klientem apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Drzewo -DocType: Job Applicant,Job Applicant, +DocType: Job Applicant,Job Applicant,Aplikujący o pracę apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Brak już następnych wyników. apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legalnie apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Rzeczywista Podatek typu nie mogą być wliczone w cenę towaru w wierszu {0} @@ -41,19 +41,19 @@ DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut DocType: Leave Type,Leave Type Name,Nazwa typu urlopu apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully, DocType: Pricing Rule,Apply On,Zastosuj Na -DocType: Item Price,Multiple Item prices., +DocType: Item Price,Multiple Item prices.,Wiele cen przedmiotu. ,Purchase Order Items To Be Received,Przedmioty oczekujące na potwierdzenie odbioru Zamówienia Kupna DocType: SMS Center,All Supplier Contact,Dane wszystkich dostawców DocType: Quality Inspection Reading,Parameter,Parametr apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})" -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application, +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Druk Nowego Zwolnienia apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Pokaż Warianty apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Ilość apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredyty (zobowiązania) -DocType: Employee Education,Year of Passing, +DocType: Employee Education,Year of Passing,Mijający rok apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,W magazynie DocType: Designation,Designation,Nominacja DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji @@ -98,7 +98,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +41,Pay apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Wybierz Magazyn ... apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamowanie apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama Spółka wpisana jest więcej niż jeden raz -DocType: Employee,Married,Poślubiony +DocType: Employee,Married,Żonaty / Zamężna apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie dopuszczony do {0} apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Elementy z apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +399,Stock cannot be updated against Delivery Note {0}, @@ -113,7 +113,7 @@ DocType: Lead,Person Name,Imię i nazwisko osoby DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Sprawdź, czy kolejność powtarzających się, usuń zaznaczenie, aby zatrzymać powtarzające się lub umieścić właściwą datę zakończenia" DocType: Sales Invoice Item,Sales Invoice Item, DocType: Account,Credit, -apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource > HR Settings, +apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource > HR Settings,Ustaw System Nazywania Pracowników w Human Resource > Ustawienia HR DocType: POS Profile,Write Off Cost Center,Centrum Kosztów Odpisu DocType: Warehouse,Warehouse Detail,Szczegóły magazynu apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2} @@ -188,7 +188,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +42,From Dat DocType: Appraisal,Select the Employee for whom you are creating the Appraisal., apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centrum kosztów {0} nie należy do Firmy {1} DocType: Customer,Individual,Indywidualny -apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits., +apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan wizyt serwisowych. DocType: SMS Settings,Enter url parameter for message,Wpisz URL dla wiadomości apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount., apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Tym razem konflikty Zaloguj z {0} do {1} {2} @@ -196,7 +196,7 @@ apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data instalacji nie może być wcześniejsza niż data dostawy dla pozycji {0} DocType: Pricing Rule,Discount on Price List Rate (%),Zniżka Cennik Oceń (%) DocType: Offer Letter,Select Terms and Conditions,Wybierz Regulamin -apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,Out Value,Spośród Wartość +apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,Out Value,Brak Wartości DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży DocType: Purchase Taxes and Charges,Valuation,Wycena ,Purchase Order Trends,Trendy Zamówienia Kupna @@ -281,7 +281,7 @@ DocType: Employee,The first Leave Approver in the list will be set as the defaul apps/erpnext/erpnext/config/desktop.py +83,Learn,Uczyć się apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Koszt aktywność na pracownika DocType: Accounts Settings,Settings for Accounts,Ustawienia Konta -apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree., +apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Zarządzaj Drzewem Sprzedawców apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,"Wybitni Czeki i depozytów, aby usunąć" DocType: Item,Synced With Hub,Synchronizowane z piastą apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Niepoprawne hasło @@ -292,10 +292,10 @@ DocType: Employee,External Work History,Historia Zewnętrzna Pracy apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Referencje DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note., DocType: Lead,Industry,Przedsiębiorstwo -DocType: Employee,Job Profile,Profil Pracy +DocType: Employee,Job Profile,Profil stanowiska Pracy DocType: Newsletter,Newsletter,Newsletter DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne) -DocType: Journal Entry,Multi Currency,Wielu Waluta +DocType: Journal Entry,Multi Currency,Wielowalutowy DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Dowód dostawy apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Konfigurowanie podatki @@ -312,7 +312,7 @@ DocType: Features Setup,"All import related fields like currency, conversion rat apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony" apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Zamówienie razem Uważany apps/erpnext/erpnext/config/hr.py +118,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)" -apps/erpnext/erpnext/controllers/recurring_document.py +201,Please enter 'Repeat on Day of Month' field value, +apps/erpnext/erpnext/controllers/recurring_document.py +201,Please enter 'Repeat on Day of Month' field value,"Proszę wpisz wartości w pola ""Powtórz w dni miesiąca""" DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostępne w BOM, dowód dostawy, faktura zakupu, zamówienie produkcji, zamówienie zakupu, faktury sprzedaży, zlecenia sprzedaży, Stan początkowy, ewidencja czasu pracy" DocType: Item Tax,Tax Rate,Stawka podatku @@ -329,7 +329,7 @@ apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partia (pakiet) DocType: C-Form Invoice Detail,Invoice Date,Data faktury DocType: GL Entry,Debit Amount,Kwota Debit apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1} -apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address, +apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Twój adres e-mail apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Proszę przejrzeć załącznik DocType: Purchase Order,% Received,% Otrzymanych apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!, @@ -354,7 +354,7 @@ DocType: Production Planning Tool,"Items to be requested which are ""Out of Stoc DocType: Workstation,Working Hours,Godziny pracy DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii. apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt." -,Purchase Register, +,Purchase Register,Rejestracja Zakupu DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty DocType: Workstation,Consumable Cost,Koszt Konsumpcyjny apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver' @@ -367,7 +367,7 @@ DocType: Employee,Single,Pojedynczy apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budżet nie może być ustawiony na centrum kosztów Grupy DocType: Account,Cost of Goods Sold,Wartość sprzedanych pozycji w cenie nabycia DocType: Purchase Invoice,Yearly,Rocznie -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center, +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Wprowadź Centrum Kosztów DocType: Journal Entry Account,Sales Order,Zlecenie sprzedaży apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Średnia. Cena sprzedaży DocType: Purchase Order,Start date of current order's period,Datę rozpoczęcia bieżącego zlecenia @@ -449,7 +449,7 @@ DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible DocType: BOM,Operating Cost,Koszty Operacyjne ,Gross Profit,Zysk brutto apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Przyrost nie może być 0 -DocType: Production Planning Tool,Material Requirement, +DocType: Production Planning Tool,Material Requirement,Wymagania odnośnie materiału DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,{0} nie jest pozycją kupowaną apps/erpnext/erpnext/controllers/recurring_document.py +190,"{0} is an invalid email address in 'Notification \ @@ -507,9 +507,9 @@ DocType: Warehouse,A logical Warehouse against which stock entries are made.,Log apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0} DocType: Sales Invoice,Customer's Vendor, apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +212,Production Order is Mandatory,Produkcja Zamówienie jest obowiązkowe -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing, +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanie Wniosku apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Inna osoba Sprzedaż {0} istnieje w tym samym identyfikator pracownika -apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5}, +apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Błąd Zasobów ({6}) dla pozycji {0} w magazynie {1} w dniu {2} {3} {4} {5} DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy DocType: Packing Slip Item,DN Detail, DocType: Time Log,Billed,Rozliczony @@ -517,7 +517,7 @@ DocType: Batch,Batch Description,Opis partii DocType: Delivery Note,Time at which items were delivered from warehouse, DocType: Sales Invoice,Sales Taxes and Charges, DocType: Employee,Organization Profile,Profil organizacji -apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series, +apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Ustaw numerowanie serii za obecność poprzez Setup> Seria Numeracji DocType: Employee,Reason for Resignation,Powód rezygnacji apps/erpnext/erpnext/config/hr.py +158,Template for performance appraisals., DocType: Payment Reconciliation,Invoice/Journal Entry Details,Szczegóły Faktury / Wpisu dziennika @@ -529,7 +529,7 @@ DocType: Activity Type,Default Costing Rate,Domyślnie Costing Cena apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +656,Maintenance Schedule,Plan Konserwacji apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Następnie wycena Zasady są filtrowane na podstawie Klienta, grupy klientów, Terytorium, dostawcy, dostawca, typu kampanii, Partner Sales itp" apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Zmiana netto stanu zapasów -DocType: Employee,Passport Number, +DocType: Employee,Passport Number,Numer Paszportu apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menager apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Same item has been entered multiple times.,Sama pozycja została wprowadzona wielokrotnie. DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy @@ -576,7 +576,7 @@ apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +64,Total billing this DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie DocType: Employee,Provide email id registered in company, DocType: Hub Settings,Seller City,Sprzedawca Miasto -DocType: Email Digest,Next email will be sent on:, +DocType: Email Digest,Next email will be sent on:,Kolejny e-mali zostanie wysłany w dniu: DocType: Offer Letter Term,Offer Letter Term,Oferta List Term apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Pozycja ma warianty. apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} nie został znaleziony @@ -600,7 +600,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nie jest przechowywany na magazynie DocType: Mode of Payment Account,Default Account,Domyślne konto apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead, -apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day, +apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Wybierz tygodniowe dni wolne DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia ,Sales Person Target Variance Item Group-Wise, apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane @@ -617,7 +617,7 @@ apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nowe konto apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: od {0} typu {1} apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Wiele Zasady cen istnieje w tych samych kryteriów, proszę rozwiązywania konfliktów poprzez przypisanie priorytetu. Cena Zasady: {0}" +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {0} apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Zapisy księgowe mogą być wykonane na kontach podrzędnych. Wpisy wobec grupy kont nie są dozwolone. apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM DocType: Opportunity,Maintenance,Konserwacja @@ -705,7 +705,7 @@ apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Klient i Dosta DocType: Email Digest,Email Digest Settings,ustawienia przetwarzania maila apps/erpnext/erpnext/config/support.py +13,Support queries from customers., DocType: Features Setup,"To enable ""Point of Sale"" features",Aby włączyć "punkt sprzedaży" funkcje -DocType: Bin,Moving Average Rate, +DocType: Bin,Moving Average Rate,Cena Średnia Ruchoma DocType: Production Planning Tool,Select Items,Wybierz Elementy apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2} DocType: Maintenance Visit,Completion Status,Status ukończenia @@ -734,7 +734,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Devel ,Amount to Bill,Kwota rachunku DocType: Company,Registration Details,Szczegóły Rejestracji DocType: Item Reorder,Re-Order Qty,Ilość w ponowieniu zamówienia -DocType: Leave Block List Date,Leave Block List Date, +DocType: Leave Block List Date,Leave Block List Date,Opuść Zablokowaną Listę Dat apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0}, DocType: Pricing Rule,Price or Discount,Cena albo Zniżka DocType: Sales Team,Incentives, @@ -770,7 +770,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +422,BOM {0} must be activ apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najpierw wybierz typ dokumentu apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Idź do koszyka apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuluj Fizyczne Wizyty {0} zanim anulujesz Wizytę Pośrednią -DocType: Salary Slip,Leave Encashment Amount, +DocType: Salary Slip,Leave Encashment Amount,Opuść Incaso apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1}, DocType: Purchase Receipt Item Supplied,Required Qty,Wymagana ilość DocType: Bank Reconciliation,Total Amount,Wartość całkowita @@ -787,7 +787,7 @@ apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not DocType: Features Setup,Item Barcode,Kod kreskowy apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane DocType: Quality Inspection Reading,Reading 6,Odczyt 6 -DocType: Purchase Invoice Advance,Purchase Invoice Advance, +DocType: Purchase Invoice Advance,Purchase Invoice Advance,Wyślij Fakturę Zaliczkową / Proformę DocType: Address,Shop,Sklep DocType: Hub Settings,Sync Now,Synchronizuj teraz apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +173,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1} @@ -833,7 +833,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Nie wysyłaj przypom DocType: Opportunity,Walk In,Wejście apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Zbiory Wpisy DocType: Item,Inspection Criteria,Kryteria kontrolne -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,"Centrum kosztów, czyli Miejsca Powstawania Kosztów." +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,"Centrum kosztów, czyli Miejsca Powstawania Kosztów." apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Przeniesione apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Biały @@ -845,7 +845,7 @@ DocType: Journal Entry,Total Amount in Words, apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists., apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mój koszyk apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0} -DocType: Lead,Next Contact Date, +DocType: Lead,Next Contact Date,Data Następnego Kontaktu apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia DocType: Holiday List,Holiday List Name,Lista imion na wakacje apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opcje magazynu @@ -853,7 +853,7 @@ DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +178,Qty for {0},Ilość dla {0} DocType: Leave Application,Leave Application,Wniosek o Urlop apps/erpnext/erpnext/config/hr.py +85,Leave Allocation Tool,Narzędzie do przydziału urlopu -DocType: Leave Block List,Leave Block List Dates, +DocType: Leave Block List,Leave Block List Dates,Opuść Zablokowaną Listę Dat DocType: Company,If Monthly Budget Exceeded (for expense account),Jeśli budżet miesięczny Przekroczone (dla rachunku kosztów) DocType: Workstation,Net Hour Rate,Stawka godzinowa Netto DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Koszt kupionego przedmiotu @@ -879,7 +879,7 @@ DocType: Landed Cost Item,Purchase Receipt Item,Przedmiot Potwierdzenia Zakupu DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse, apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Kwota sprzedaży apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Czas Logi -apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save, +apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Zatwierdzasz wydatek dla tego rekordu. Proszę zaktualizować ""status"" i Zachowaj" DocType: Serial No,Creation Document No, DocType: Issue,Issue,Zdarzenie apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto nie pasuje do Firmy @@ -911,13 +911,13 @@ apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wy apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Do {0} | {1} {2} DocType: Time Log Batch,updated via Time Logs,Zaktualizowano przed Dziennik Czasu apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Średni wiek -DocType: Opportunity,Your sales person who will contact the customer in future, +DocType: Opportunity,Your sales person who will contact the customer in future,"Sprzedawca, który będzie kontaktował się z klientem w przyszłości" apps/erpnext/erpnext/public/js/setup_wizard.js +256,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne. DocType: Company,Default Currency,Domyślna waluta DocType: Contact,Enter designation of this Contact,Wpisz stanowisko tego Kontaktu DocType: Expense Claim,From Employee,Od Pracownika apps/erpnext/erpnext/controllers/accounts_controller.py +354,Warning: System will not check overbilling since amount for Item {0} in {1} is zero, -DocType: Journal Entry,Make Difference Entry, +DocType: Journal Entry,Make Difference Entry,Wprowadź różnicę DocType: Upload Attendance,Attendance From Date,Usługa od dnia DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation, @@ -932,7 +932,7 @@ DocType: Item,website page link,link do strony WWW DocType: Company,Company registration numbers for your reference. Tax numbers etc., DocType: Sales Partner,Distributor,Dystrybutor DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order, +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Zamówienie Produkcji {0} musi być odwołane przed odwołaniem Zamówienia Sprzedaży apps/erpnext/erpnext/public/js/controllers/transaction.js +916,Please set 'Apply Additional Discount On',Proszę ustawić "Zastosuj dodatkowe zniżki na ' ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu @@ -949,13 +949,13 @@ DocType: Salary Slip,Earnings,Dochody apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Finished Item {0} must be entered for Manufacture type entry,Zakończone Pozycja {0} musi być wprowadzony do wejścia typu Produkcja apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Stan z bilansu otwarcia DocType: Sales Invoice Advance,Sales Invoice Advance, -apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request, +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Brak żądań apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date', apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Zarząd apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets, apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Wymagana jest debetowa lub kredytowa kwota dla {0} DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM""" -DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip., +DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac. apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Niebieski DocType: Purchase Invoice,Is Return,Czy Wróć DocType: Price List Country,Price List Country,Cena Kraj @@ -970,11 +970,11 @@ DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Baza dostawców DocType: Account,Balance Sheet,Arkusz Bilansu apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +573,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu ' -DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer, +DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Sprzedawca otrzyma w tym dniu przypomnienie, aby skontaktować się z klientem" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup" apps/erpnext/erpnext/config/hr.py +133,Tax and other salary deductions., DocType: Lead,Lead,Trop -DocType: Email Digest,Payables, +DocType: Email Digest,Payables,Zobowiązania DocType: Account,Warehouse,Magazyn apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +83,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna @@ -994,7 +994,7 @@ apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with sa ,Trial Balance,Zestawienie obrotów i sald apps/erpnext/erpnext/config/hr.py +220,Setting up Employees,Konfigurowanie Pracownicy apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Siatka """ -apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first, +apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Wybierz prefix apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Badania DocType: Maintenance Visit Purpose,Work Done,Praca wykonana apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów @@ -1043,7 +1043,7 @@ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} c apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zielony DocType: Item,Auto re-order,Automatyczne ponowne zamówienie apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Razem Osiągnięte -DocType: Employee,Place of Issue, +DocType: Employee,Place of Issue,Miejsce wydania apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt DocType: Email Digest,Add Quote,Dodaj Cytat apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +495,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1} @@ -1107,14 +1107,14 @@ DocType: Payment Tool,Party Account Currency,Partia konto Waluta ,BOM Browser,Przeglądarka BOM DocType: Purchase Taxes and Charges,Add or Deduct,Dodatki lub Potrącenia DocType: Company,If Yearly Budget Exceeded (for expense account),Jeśli Roczny budżet Przekroczono (dla rachunku kosztów) -apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:, +apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Nakładające warunki pomiędzy: apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +164,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Łączna wartość zamówienia apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Żywność apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +137,You can make a time log only against a submitted production order,Możesz zrobić dziennik czasu tylko przed złożonego zlecenia produkcyjnego DocType: Maintenance Schedule Item,No of Visits,Numer wizyt -apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.", +apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newslettery do kontaktów, leadów" apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Waluta Rachunku Zamknięcie musi być {0} apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma punktów dla wszystkich celów powinno być 100. {0} apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Operations cannot be left blank.,Operacje nie może być puste. @@ -1179,7 +1179,7 @@ DocType: Account,"If the account is frozen, entries are allowed to restricted us DocType: Email Digest,Bank Balance,Saldo bankowe apps/erpnext/erpnext/controllers/accounts_controller.py +467,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2} apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,Brak aktywnego Struktura znaleziono pracownika wynagrodzenie {0} i miesiąca -DocType: Job Opening,"Job profile, qualifications required etc.","Profil pracy, wymagane kwalifikacje itp." +DocType: Job Opening,"Job profile, qualifications required etc.","Profil stanowiska pracy, wymagane kwalifikacje itp." DocType: Journal Entry Account,Account Balance,Bilans konta apps/erpnext/erpnext/config/accounts.py +122,Tax Rule for transactions.,Reguła podatkowa dla transakcji. DocType: Rename Tool,Type of document to rename., @@ -1225,8 +1225,8 @@ DocType: Employee External Work History,Total Experience, apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,List(y) przewozowe anulowane apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Koszty dostaw i przesyłek -DocType: Material Request Item,Sales Order,Nr Zlecenia Sprzedaży -DocType: Item Group,Item Group Name, +DocType: Material Request Item,Sales Order No,Nr Zlecenia Sprzedaży +DocType: Item Group,Item Group Name,Element Nazwa grupy apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Wzięty apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiały transferowe dla Produkcja DocType: Pricing Rule,For Price List,Dla Listy Cen @@ -1237,7 +1237,7 @@ DocType: Purchase Invoice Item,Net Amount,Kwota netto DocType: Purchase Order Item Supplied,BOM Detail No,BOM Numer DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy) apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +630,Error: {0} > {1},Błąd: {0} > {1} -apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts., +apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Proszę utworzyć nowe konto wg planu kont. apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,Maintenance Visit,Wizyta Konserwacji apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klient > Grupa klientów > Terytorium DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostępne w Warehouse partii Ilość @@ -1262,7 +1262,7 @@ DocType: Production Plan Sales Order,Production Plan Sales Order,Zamówienie spr DocType: Sales Partner,Sales Partner Target, apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +109,Accounting Entry for {0} can only be made in currency: {1},Wprowadzenie danych księgowych dla {0} może być dokonywane wyłącznie w walucie: {1} DocType: Pricing Rule,Pricing Rule,Reguła cenowa -apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu +apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Twoje zamówienie jest w realizacji DocType: Payment Gateway Account,Payment Success URL,Płatność Sukces URL apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {2} {3} apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Konta bankowe @@ -1275,7 +1275,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +336,Not allowed t apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Urlop przedzielony z powodzeniem dla {0} apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Brak Przedmiotów do pakowania DocType: Shipping Rule Condition,From Value,Od wartości -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +542,Manufacturing Quantity is mandatory, +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +542,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa DocType: Quality Inspection Reading,Reading 4,Odczyt 4 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Zwrot wydatków DocType: Company,Default Holiday List,Domyślnie lista urlopowa @@ -1365,7 +1365,7 @@ DocType: Sales Invoice,Paid Amount (Company Currency),Zapłacona kwota (waluta f DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukcje Online -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both, +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Podaj dokładnie Ilość lub Stawkę lub obie apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory", apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Wydatki marketingowe ,Item Shortage Report,Element Zgłoś Niedobór @@ -1391,11 +1391,11 @@ DocType: Stock Entry,Material Receipt,Przyjęcie materiałów apps/erpnext/erpnext/public/js/setup_wizard.js +288,Products,Produkty apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Strona Typ i Partia jest wymagany do otrzymania / rachunku Płatne {0} DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jeśli ten element ma warianty, to nie może być wybrany w zleceniach sprzedaży itp" -DocType: Lead,Next Contact By, +DocType: Lead,Next Contact By,Następny Kontakt Po apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +211,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1} apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazyn {0} nie może zostać usunięty ponieważ istnieje wartość dla przedmiotu {1} DocType: Quotation,Order Type,Typ zamówienia -DocType: Purchase Invoice,Notification Email Address, +DocType: Purchase Invoice,Notification Email Address,Powiadomienie adres e-mail DocType: Payment Tool,Find Invoices to Match,Znajdź pasujące faktury ,Item-wise Sales Register, apps/erpnext/erpnext/public/js/setup_wizard.js +59,"e.g. ""XYZ National Bank""","np ""XYZ Narodowy Bank """ @@ -1403,7 +1403,7 @@ DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Czy poda apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Łączna docelowa apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Koszyk jest włączony DocType: Job Applicant,Applicant for a Job,Aplikant do Pracy -apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created, +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nie ma Zamówienia Produkcji apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +153,Salary Slip of employee {0} already created for this month, DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego. @@ -1415,10 +1415,10 @@ DocType: Naming Series,Set prefix for numbering series on your transactions, DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel., apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu -DocType: Employee,Leave Encashed?, +DocType: Employee,Leave Encashed?,"Jesteś pewien, że chcesz wyjść z Wykupinych?" apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe DocType: Item,Variants,Warianty -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +769,Make Purchase Order, +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +769,Make Purchase Order,Wprowadź Zamówienie DocType: SMS Center,Send To, apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0}, DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota @@ -1445,7 +1445,7 @@ apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks., apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,Płatność DocType: Production Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt -apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +53,Material Request of maximum {0} can be made for Item {1} against Sales Order {2}, +apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +53,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Zamówienie produktu o maksymalnej ilości {0} może być zrealizowane dla przedmiotu {1} w zamówieniu {2} DocType: Employee,Salutation, DocType: Pricing Rule,Brand,Marka DocType: Item,Will also apply for variants,Również zastosowanie do wariantów @@ -1455,7 +1455,7 @@ DocType: Sales Invoice Item,References,Referencje DocType: Quality Inspection Reading,Reading 10,Odczyt 10 apps/erpnext/erpnext/public/js/setup_wizard.js +278,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary." DocType: Hub Settings,Hub Node,Hub Węzeł -apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again., +apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Wprowadziłeś duplikat istniejących rzeczy. Sprawdź i spróbuj ponownie apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wartość {0} do {1} atrybutów nie istnieje na liście ważnej pozycji wartości atrybutów apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Współpracownik apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item, @@ -1466,7 +1466,7 @@ DocType: Activity Cost,Activity Cost,Aktywny Koszt DocType: Purchase Receipt Item Supplied,Consumed Qty,Skonsumowana ilość apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications, DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)" -DocType: Payment Tool,Make Payment Entry, +DocType: Payment Tool,Make Payment Entry,Wprowadź wpływ płatności apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1} ,Sales Invoice Trends, DocType: Leave Application,Apply / Approve Leaves,Zastosuj / Zatwierdź liście @@ -1528,7 +1528,7 @@ apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups., apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nie można wskazać numeru wiersza większego lub równego numerowi dla tego typu Opłaty ,Item-wise Purchase History, apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Czerwony -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0}, +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}" DocType: Account,Frozen,Zamrożony ,Open Production Orders,Otwórz zamówienia produkcji DocType: Installation Note,Installation Time,Czas instalacji @@ -1580,14 +1580,14 @@ DocType: Journal Entry,Accounts Receivable,Należności DocType: Address Template,This format is used if country specific format is not found,"Format ten jest używany, jeśli Format danego kraju nie znaleziono" DocType: Production Order,Use Multi-Level BOM,Używaj wielopoziomowych zestawień materiałowych DocType: Bank Reconciliation,Include Reconciled Entries,Dołącz uzgodnione wpisy -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Rejestr operacji gospodarczych. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Rejestr operacji gospodarczych. DocType: Leave Control Panel,Leave blank if considered for all employee types,Zostaw puste jeśli jest to rozważane dla wszystkich typów pracowników DocType: Landed Cost Voucher,Distribute Charges Based On,Rozpowszechnianie opłat na podstawie apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} musi być typu ""trwałego"" jak Pozycja {1} dla pozycji aktywów" DocType: HR Settings,HR Settings,Ustawienia HR apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status. DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu -DocType: Leave Block List Allow,Leave Block List Allow, +DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa do Non-Group apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports, @@ -1618,7 +1618,7 @@ apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please ent DocType: Territory,Classification of Customers by region,Klasyfikacja Klientów od regionu DocType: Project,% Tasks Completed,% Zadania Zakończone DocType: Project,Gross Margin,Marża brutto -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first, +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Obliczona komunikat bilans Banku apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Wyłączony użytkownik apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Wycena @@ -1633,7 +1633,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certif DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik) DocType: Purchase Taxes and Charges,Deduct,Odlicz -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis Pracy +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis stanowiska Pracy DocType: Purchase Order Item,Qty as per Stock UOM,Ilość wg. Jednostki Miary apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania" DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji." @@ -1660,7 +1660,7 @@ DocType: Employee,Bank Name,Nazwa banku apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Powyżej apps/erpnext/erpnext/hr/doctype/employee/employee.py +139,User {0} is disabled,Użytkownik {0} jest wyłączony DocType: Leave Application,Total Leave Days, -DocType: Email Digest,Note: Email will not be sent to disabled users, +DocType: Email Digest,Note: Email will not be sent to disabled users,Uwaga: E-mail nie zostanie wysłany do nieaktywnych użytkowników apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Wybierz firmą ... DocType: Leave Control Panel,Leave blank if considered for all departments,Zostaw puste jeśli jest to rozważane dla wszystkich departamentów apps/erpnext/erpnext/config/hr.py +103,"Types of employment (permanent, contract, intern etc.).", @@ -1675,7 +1675,7 @@ DocType: POS Profile,Taxes and Charges,Podatki i opłaty DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt lub usługa, która jest kupiona, sprzedana lub przechowywana w magazynie." apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nie można wybrać typu opłaty jako ""Sumy Poprzedniej Komórki"" lub ""Całkowitej kwoty poprzedniej Komórki"" w pierwszym rzędzie" apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankowość -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule, +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Kliknij na ""Generuj Harmonogram"" aby otrzymać harmonogram" apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,New Cost Center,Nowe Centrum Kosztów DocType: Bin,Ordered Quantity,Zamówiona Ilość apps/erpnext/erpnext/public/js/setup_wizard.js +57,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych""" @@ -1713,9 +1713,9 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy DocType: Offer Letter Term,Offer Term,Oferta Term DocType: Quality Inspection,Quality Manager,Manager Jakości -DocType: Job Applicant,Job Opening, +DocType: Job Applicant,Job Opening,Otwarcie naboru na stanowisko DocType: Payment Reconciliation,Payment Reconciliation,Uzgodnienie płatności -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name, +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Wybierz nazwisko Osoby Zarządzającej apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologia apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta List apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji. @@ -1732,7 +1732,7 @@ DocType: Manufacturing Settings,Allow Overtime,Pozwól Nadgodziny apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}. DocType: Stock Reconciliation Item,Current Valuation Rate,Aktualny Wycena Cena DocType: Item,Customer Item Codes,Kody Pozycja klienta -DocType: Opportunity,Lost Reason, +DocType: Opportunity,Lost Reason,Powód straty apps/erpnext/erpnext/config/accounts.py +73,Create Payment Entries against Orders or Invoices.,Utwórz zapisy płatności dla Zamówień lub Faktur. apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nowy adres DocType: Quality Inspection,Sample Size,Wielkość próby @@ -1757,8 +1757,8 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code DocType: Appraisal Goal,Appraisal Goal,Cel oceny DocType: Time Log,Costing Amount,Kwota zestawienia kosztów DocType: Process Payroll,Submit Salary Slip, -DocType: Salary Structure,Monthly Earning & Deduction, -apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%, +DocType: Salary Structure,Monthly Earning & Deduction,Miesięczne Zarobki i Odliczenia +apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maksymalny rabat dla produktu {0} to {1}% apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Masowego importu DocType: Sales Partner,Address & Contacts,Adresy i kontakty DocType: SMS Log,Sender Name, @@ -1819,7 +1819,7 @@ DocType: Workstation Working Hour,End Time,Czas zakończenia apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase., apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupuj według Podstawy księgowania apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane dniu -DocType: Sales Invoice,Mass Mailing, +DocType: Sales Invoice,Mass Mailing,Mailing Masowy DocType: Rename Tool,File to Rename,Plik to zmiany nazwy apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0}, apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1} @@ -1830,7 +1830,7 @@ apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_st DocType: Selling Settings,Sales Order Required, DocType: Purchase Invoice,Credit To, apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Całość Przewody / Klienci -DocType: Employee Education,Post Graduate, +DocType: Employee Education,Post Graduate,Podyplomowe DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Szczegóły Planu Konserwacji DocType: Quality Inspection Reading,Reading 9,Odczyt 9 DocType: Supplier,Is Frozen,Jest Zamrożony @@ -1855,16 +1855,16 @@ DocType: Newsletter,Test, apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \ you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak są istniejące transakcji giełdowych dla tej pozycji, \ nie można zmienić wartości "Czy numer seryjny", "Czy Batch Nie ',' Czy Pozycja Zdjęcie" i "Metoda wyceny"" apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Szybkie Księgowanie -apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item, +apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe DocType: Stock Entry,For Quantity,Dla Ilości -apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1}, +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1} apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,{0} {1} is not submitted,{0} {1} nie zostało dodane apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zamówienia produktów. DocType: Production Planning Tool,Separate production order will be created for each finished good item., DocType: Purchase Invoice,Terms and Conditions1, DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt nie może tworzyć / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej." -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule, +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projektu DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek) apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biuletyn Mailing List @@ -1973,7 +1973,7 @@ DocType: Salary Structure,Total Earning, DocType: Purchase Receipt,Time at which materials were received, apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje adresy DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena -apps/erpnext/erpnext/config/hr.py +108,Organization branch master., +apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Szef oddziału Organizacji apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,lub DocType: Sales Order,Billing Status,Status Faktury apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Wydatki na usługi komunalne @@ -1989,7 +1989,7 @@ DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży DocType: Purchase Invoice,Total Taxes and Charges, DocType: Employee,Emergency Contact,Kontakt na wypadek nieszczęśliwych wypadków DocType: Item,Quality Parameters,Parametry jakościowe -apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger, +apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,Rejestr DocType: Target Detail,Target Amount, DocType: Shopping Cart Settings,Shopping Cart Settings,Koszyk Ustawienia DocType: Journal Entry,Accounting Entries,Zapisy księgowe @@ -2037,7 +2037,7 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +657,Please select a apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Wszystkie adresy DocType: Company,Stock Settings,Ustawienia magazynu apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma" -apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree., +apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Zarządzaj drzewem grupy klientów apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nazwa nowego Centrum Kosztów DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nie znaleziono adresu domyślnego szablonu. Proszę utworzyć nowy Setup> Druk i Branding> Szablon adresowej. @@ -2076,7 +2076,7 @@ DocType: Price List,Price List Master,Ustawienia Cennika DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele." ,S.O. No., DocType: Production Order Operation,Make Time Log,Dodać do czasu Zaloguj -apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0}, +apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0} DocType: Price List,Applicable for Countries,Zastosowanie dla krajów apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputery apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited., @@ -2142,12 +2142,12 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root Account must b DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Wynagrodzenia brutto + Kwota zaległości + Kwota inkaso - Razem Odliczenie DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji DocType: Features Setup,Sales and Purchase, -DocType: Supplier Quotation Item,Material Request No, +DocType: Supplier Quotation Item,Material Request No,Zamówienie produktu nr apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0} DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty firmy apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} została pomyślnie wypisany z listy. DocType: Purchase Invoice Item,Net Rate (Company Currency),Cena netto (Spółka Waluta) -apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree., +apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Zarządzaj drzewem terytorium DocType: Journal Entry Account,Sales Invoice,Faktura sprzedaży DocType: Journal Entry Account,Party Balance,Bilans Grupy DocType: Sales Invoice Item,Time Log Batch, @@ -2168,7 +2168,7 @@ DocType: Payment Request,Recipient and Message,Odbiorca i Message DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na DocType: Account,Root Type, apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Wiersz # {0}: Nie można wrócić więcej niż {1} dla pozycji {2} -apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot, +apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Wątek DocType: Item Group,Show this slideshow at the top of the page, DocType: BOM,Item UOM,Jednostka miary produktu DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy) @@ -2202,21 +2202,21 @@ apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Pleas apps/erpnext/erpnext/controllers/accounts_controller.py +425,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) Na zamówienie {1} nie może być większa od ogólnej sumy ({2}) DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy. DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny -apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected, +apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected,Nie wybrano Cennika w Walucie apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Pozycja Wiersz {0}: Zakup Otrzymanie {1} nie istnieje w tabeli powyżej Zakup kwitów '' apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3} apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do DocType: Rename Tool,Rename Log,Zmień nazwę dziennika DocType: Installation Note Item,Against Document No, -apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Zarządzaj sprzedaży Partnerzy. +apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Zarządzaj Partnerami Sprzedaży. DocType: Quality Inspection,Inspection Type,Typ kontroli apps/erpnext/erpnext/controllers/recurring_document.py +164,Please select {0},Proszę wybrać {0} DocType: C-Form,C-Form No, DocType: BOM,Exploded_items,Exploded_items DocType: Employee Attendance Tool,Unmarked Attendance,Nieoznakowany Frekwencja apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher, -apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending, +apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Zachowaj Newsletter przed wysyłką apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Imię lub E-mail jest obowiązkowe apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Kontrola jakości przychodzących. DocType: Purchase Order Item,Returned Qty,Wrócił szt @@ -2230,7 +2230,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe DocType: Customer Group,Only leaf nodes are allowed in transaction, DocType: Expense Claim,Expense Approver,Osoba zatwierdzająca wydatki apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Row {0}: Advance against Customer must be credit,Wiersz {0}: Advance wobec Klienta musi być kredytowej -DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied, +DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rachunek Kupna Zaopatrzenia apps/erpnext/erpnext/public/js/pos/pos.js +356,Pay,Zapłacone apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Aby DateTime DocType: SMS Settings,SMS Gateway URL,Adres URL bramki SMS @@ -2244,13 +2244,13 @@ apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted, apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Podanie adresu jest wymagane DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią -apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers, +apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Wydawcy Gazet apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Wybierz rok podatkowy apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania DocType: Attendance,Attendance Date,Data usługi DocType: Salary Structure,Salary breakup based on Earning and Deduction., apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane -DocType: Address,Preferred Shipping Address, +DocType: Address,Preferred Shipping Address,Preferowany Adres Dostawy DocType: Purchase Receipt Item,Accepted Warehouse,Przyjęty Magazyn DocType: Bank Reconciliation Detail,Posting Date,Data publikacji DocType: Item,Valuation Method,Metoda wyceny @@ -2264,7 +2264,7 @@ DocType: Sales Order,In Words will be visible once you save the Sales Order.,"S ,Employee Birthday,Data urodzenia pracownika apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą -DocType: Leave Control Panel,New Leaves Allocated (In Days), +DocType: Leave Control Panel,New Leaves Allocated (In Days),Nowe Zwolnienie Przypisano (W Dniach) apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist, DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazyn klienta (opcjonalnie) DocType: Pricing Rule,Discount Percentage,Procent zniżki @@ -2273,7 +2273,7 @@ apps/erpnext/erpnext/hooks.py +55,Orders,Zamówienia DocType: Leave Control Panel,Employee Type,Typ pracownika DocType: Features Setup,To maintain the customer wise item code and to make them searchable based on their code use this option,Aby utrzymać klientów mądry kod elementu oraz do ich przeszukiwania na podstawie ich kodu skorzystać z tej opcji DocType: Employee Leave Approver,Leave Approver,Zatwierdzający Urlop -DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiał Przeniesione dla Produkcja +DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiał Przeniesiony do Produkcji DocType: Expense Claim,"A user with ""Expense Approver"" role","Użytkownik z ""Koszty zatwierdzająca"" rolą" ,Issued Items Against Production Order,Pozycje wydane wbrew zleceniu produkcji DocType: Pricing Rule,Purchase Manager,Menadżer Zakupów @@ -2317,10 +2317,10 @@ DocType: Pricing Rule,Item Code,Kod identyfikacyjny DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły DocType: Journal Entry,User Remark,Spostrzeżenie Użytkownika -DocType: Lead,Market Segment, +DocType: Lead,Market Segment,Segment rynku DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Closing (Dr),Zamknięcie (Dr) -DocType: Contact,Passive, +DocType: Contact,Passive,Nie aktywny apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock, apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions., DocType: Sales Invoice,Write Off Outstanding Amount,Nieuregulowana Wartość Odpisu @@ -2336,12 +2336,12 @@ DocType: Sales Invoice Item,Available Qty at Warehouse,Ilość dostępna w magaz ,Billed Amount,Ilość Rozliczenia DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Pobierz aktualizacje -apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped, +apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,Zamówienie produktu {0} jest anulowane lub wstrzymane apps/erpnext/erpnext/public/js/setup_wizard.js +307,Add a few sample records,Dodaj kilka rekordów przykładowe apps/erpnext/erpnext/config/hr.py +225,Leave Management,Zarządzanie urlopami apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupuj według konta DocType: Sales Order,Fully Delivered,Całkowicie Dostarczono -DocType: Lead,Lower Income, +DocType: Lead,Lower Income,Niższy przychód DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked", DocType: Payment Tool,Against Vouchers,Na podstawie talonów apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Szybka pomoc @@ -2360,7 +2360,7 @@ apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Va apps/erpnext/erpnext/public/js/setup_wizard.js +293,Minute,Minuta DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna ,Qty to Receive,Ilość do otrzymania -DocType: Leave Block List,Leave Block List Allowed, +DocType: Leave Block List,Leave Block List Allowed,Możesz opuścić Blok Zablokowanych List apps/erpnext/erpnext/public/js/setup_wizard.js +20,You will use it to Login,Będzie go używać do logowania DocType: Sales Partner,Retailer, apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans @@ -2393,7 +2393,7 @@ DocType: Purchase Invoice Item,Net Amount (Company Currency),Kwota netto (Waluta DocType: BOM Operation,Hour Rate,Stawka godzinowa DocType: Stock Settings,Item Naming By,Element Nazwy przez apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Kolejny okres Zamknięcie Wejście {0} została wykonana po {1} -DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Manufacturing +DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Produkowania apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} nie istnieje DocType: Purchase Receipt Item,Purchase Order Item No,Nr przedmiotu Zamówienia Kupna DocType: Project,Project Type,Typ projektu @@ -2434,7 +2434,7 @@ DocType: Purchase Order Item Supplied,Stock UOM,Jednostka apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Prognozowany apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1}, -apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0, +apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Uwaga: System nie sprawdza nad-dostawy oraz nadmiernej rezerwacji dla pozycji {0} jej wartość lub kwota wynosi 0 DocType: Notification Control,Quotation Message,Wiadomość Wyceny DocType: Issue,Opening Date,Data Otwarcia DocType: Journal Entry,Remark,Uwaga @@ -2462,7 +2462,7 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go ,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0} DocType: Journal Entry,Stock Entry,Zapis magazynowy -DocType: Account,Payable, +DocType: Account,Payable,Płatność DocType: Salary Slip,Arrear Amount,Zaległa Kwota apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nowi klienci apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Zysk brutto% @@ -2478,12 +2478,12 @@ DocType: Installation Note,Installation Date,Data instalacji DocType: Employee,Confirmation Date,Data potwierdzenia DocType: C-Form,Total Invoiced Amount, DocType: Account,Sales User,Sprzedaż użytkownika -apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty, +apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Minimalna ilość nie może być większa niż maksymalna Ilość DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły DocType: Payment Request,Email To,E-mail do DocType: Lead,Lead Owner,Właściciel Tropu apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +257,Warehouse is required,Magazyn jest wymagany -DocType: Employee,Marital Status, +DocType: Employee,Marital Status,Stan cywilny DocType: Stock Settings,Auto Material Request,Zapytanie Auto Materiał DocType: Time Log,Will be updated when billed., DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Ilosc w serii dostępne z magazynu @@ -2495,7 +2495,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy DocType: Territory,Territory Targets, DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika -DocType: Purchase Order Item Supplied,Purchase Order Item Supplied, +DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Zamówienie Kupna Zaopatrzenia apps/erpnext/erpnext/public/js/setup_wizard.js +86,Company Name cannot be Company,Nazwa firmy nie może być firma apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Nagłówki to wzorów druku apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice., @@ -2504,7 +2504,7 @@ DocType: POS Profile,Update Stock,Zaktualizuj Asortyment apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM., DocType: Payment Request,Payment Details,Szczegóły płatności apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy -apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note, +apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Wyciągnij elementy z dowodu dostawy apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Zapis wszystkich komunikatów typu e-mail, telefon, czat, wizyty, itd" DocType: Manufacturer,Manufacturers used in Items,Producenci używane w pozycji @@ -2552,19 +2552,19 @@ apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import i eksport DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured', apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Data zamieszczenia DocType: Sales Invoice,Rounded Total,Końcowa zaokrąglona kwota -DocType: Product Bundle,List items that form the package., +DocType: Product Bundle,List items that form the package.,Lista elementów w pakiecie apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100% DocType: Serial No,Out of AMC, -DocType: Purchase Order Item,Material Request Detail No, +DocType: Purchase Order Item,Material Request Detail No,Numer szczegółowy zamówienia produktu apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Stwórz Wizytę Konserwacji apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0} DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe apps/erpnext/erpnext/config/accounts.py +84,Company (not Customer or Supplier) master., -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date', +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Proszę wprowadź 'Spodziewaną Datę Dstawy' apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +183,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +381,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1}, -apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0}, +apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +126,Note: There is not enough leave balance for Leave Type {0},Uwaga: Nie ma wystarczającej ilości urlopu aby ustalić typ zwolnienia {0} apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Uwaga: Jeżeli płatność nie posiada jakiegokolwiek odniesienia, należy ręcznie dokonać wpisu do dziennika." DocType: Item,Supplier Items,Dostawca przedmioty DocType: Opportunity,Opportunity Type,Typ szansy @@ -2585,11 +2585,11 @@ apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pozycja 3 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail DocType: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły DocType: Sales Team,Contribution (%),Udział (%) -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified, +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Wejście płatność nie zostanie utworzone, gdyż nie została określona wartość ""gotówka lub rachunek bankowy""" apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Template,Szablon DocType: Sales Person,Sales Person Name, -apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table, +apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Wprowadź co najmniej jedną fakturę do tabelki apps/erpnext/erpnext/public/js/setup_wizard.js +185,Add Users,Dodaj użytkowników DocType: Pricing Rule,Item Group,Kategoria DocType: Task,Actual Start Date (via Time Logs),Rzeczywista Data Rozpoczęcia (przez Time Logs) @@ -2610,14 +2610,14 @@ DocType: Time Log,From Time,Od czasu DocType: Notification Control,Custom Message,Niestandardowa wiadomość apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Bankowość inwestycyjna apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności -DocType: Purchase Invoice,Price List Exchange Rate, +DocType: Purchase Invoice,Price List Exchange Rate,Cennik Kursowy DocType: Purchase Invoice Item,Rate,Stawka apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stażysta DocType: Newsletter,A Lead with this email id should exist,Podane dane z tym adresem e-mail powinny istnieć DocType: Stock Entry,From BOM,Od BOM apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Podstawowy apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transakcji giełdowych przed {0} są zamrożone -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Plan""" +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Harmonogram""" apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave, apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m" apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia @@ -2638,7 +2638,7 @@ DocType: Features Setup,"If you have long print formats, this feature can be use apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Wszystkie obszary DocType: Purchase Invoice,Items,Produkty DocType: Fiscal Year,Year Name,Nazwa roku -DocType: Process Payroll,Process Payroll, +DocType: Process Payroll,Process Payroll,Lista Płac apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month., DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł DocType: Sales Partner,Sales Partner Name, @@ -2699,7 +2699,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +293,Hour,Godzina apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \ using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \ Zdjęcie Pojednania za pomocą" -apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt, +apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nowy nr seryjny nie może mieć Magazynu. Magazyn musi być ustawiona przez Zasoby lub na podstawie Paragonu Zakupu DocType: Lead,Lead Type,Typ Tropu apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania liście na bloku Daty apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura @@ -2712,13 +2712,13 @@ apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: DocType: Production Planning Tool,Production Planning Tool,Narzędzie do planowania produkcji DocType: Quality Inspection,Report Date,Data raportu DocType: C-Form,Invoices,Faktury -DocType: Job Opening,Job Title,Tytuł Pracy +DocType: Job Opening,Job Title,Nazwa stanowiska pracy DocType: Features Setup,Item Groups in Details,Element Szczegóły grupy apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C. apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Rozpocznij sesję POS apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Raport wizyty dla wezwania konserwacji. DocType: Stock Entry,Update Rate and Availability,Aktualizacja Cena i dostępność -DocType: Stock Settings,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., +DocType: Stock Settings,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.,"Procent który wolno Ci otrzymać lub dostarczyć ponad zamówioną ilość. Na przykład: jeśli zamówiłeś 100 jednostek i Twój procent wynosi 10% oznacza to, że możesz otrzymać 110 jednostek" DocType: Pricing Rule,Customer Group,Grupa Klientów apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0} DocType: Item,Website Description,Opis strony WWW @@ -2746,7 +2746,7 @@ DocType: Serial No,Creation Document Type, DocType: Leave Type,Is Encash, DocType: Purchase Invoice,Mobile No,Nr tel. Komórkowego DocType: Payment Tool,Make Journal Entry,Dodać Journal Entry -DocType: Leave Allocation,New Leaves Allocated, +DocType: Leave Allocation,New Leaves Allocated,Nowe Zwolnienie Przypisano apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation, DocType: Project,Expected End Date,Spodziewana data końcowa DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny @@ -2756,7 +2756,7 @@ DocType: Cost Center,Distribution Id,ID Dystrybucji apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Niesamowity Serwis apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Wszystkie produkty i usługi. DocType: Purchase Invoice,Supplier Address,Adres dostawcy -apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty, +apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Brak Ilości apps/erpnext/erpnext/config/accounts.py +138,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory, apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe @@ -2773,7 +2773,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fet DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik) apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Due Date jest obowiązkowe apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0 -DocType: Journal Entry,Pay To / Recd From, +DocType: Journal Entry,Pay To / Recd From,Zapłać / Rachunek od DocType: Naming Series,Setup Series, DocType: Payment Reconciliation,To Invoice Date,Aby Data faktury DocType: Supplier,Contact HTML,HTML kontaktu @@ -2790,7 +2790,7 @@ DocType: Upload Attendance,Download Template,Ściągnij Szablon DocType: GL Entry,Remarks,Uwagi DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca DocType: Journal Entry,Write Off Based On,Odpis bazowano na -DocType: Features Setup,POS View, +DocType: Features Setup,POS View,Podgląd POS apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Numer instalacyjny dla numeru seryjnego apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sprecyzuj DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź @@ -2799,7 +2799,7 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} nie może być Grupą (kontem dzielonym) apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji. -apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed, +apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona DocType: Holiday List,Weekly Off, DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13" apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Wstępny Zysk / Strata (Credit) @@ -2809,14 +2809,14 @@ apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Comp DocType: Serial No,Creation Time,Czas utworzenia apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Łączne przychody DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Pomoc -,Monthly Attendance Sheet, +,Monthly Attendance Sheet,Miesięczna karta obecności apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nie znaleziono wyników apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2} apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Elementy z Bundle produktu apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} jest nieaktywne DocType: GL Entry,Is Advance,Zaawansowany proces apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Frekwencja od dnia i usługa do dnia jest obowiązkowa -apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No, +apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Proszę wprowadź ""Zlecona"" jako Tak lub Nie" DocType: Sales Team,Contact No.,Numer Kontaktu apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Konto typu 'Zyski i Straty' ({0}) nie może być wpisem otwierającym rok DocType: Features Setup,Sales Discounts, @@ -2866,7 +2866,7 @@ DocType: Bank Reconciliation Detail,Cheque Date,Data czeku apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2} apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą! apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,W sprawie daty -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation, +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Wyrok lub staż apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1} DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje" apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kwota całkowita Płatny @@ -2895,9 +2895,9 @@ DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Requir DocType: GL Entry,Party Type,Typ Grupy apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +66,Raw material cannot be same as main Item,Surowiec nie może być taki sam jak główny Przedmiot DocType: Item Attribute Value,Abbreviation,Skrót -apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits, +apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Brak autoryzacji od {0} przekroczono granice apps/erpnext/erpnext/config/hr.py +123,Salary template master., -DocType: Leave Type,Max Days Leave Allowed, +DocType: Leave Type,Max Days Leave Allowed,Udzielono maksymalna ilość dni zwolnienia apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Ustaw Reguła podatkowa do koszyka DocType: Payment Tool,Set Matching Amounts,Ustaw Dopasowane Kwoty DocType: Purchase Invoice,Taxes and Charges Added, @@ -2914,7 +2914,7 @@ apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is m apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy) DocType: Account,Temporary,Tymczasowy -DocType: Address,Preferred Billing Address, +DocType: Address,Preferred Billing Address,Preferowany Adres Rozliczeniowy DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary, DocType: Serial No,Distinct unit of an Item,Odrębna jednostka przedmiotu @@ -2955,7 +2955,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Pr DocType: Hub Settings,Name Token,Nazwa jest już w użyciu apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +142,Standard Selling, apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany -DocType: Serial No,Out of Warranty,Poza Gwarancją +DocType: Serial No,Out of Warranty,Brak Gwarancji DocType: BOM Replace Tool,Replace, apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +331,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1} apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary @@ -2969,7 +2969,7 @@ DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Płatnoś apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Podatek należny (zwrot) DocType: BOM Item,BOM No,Nr zestawienia materiałowego apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon -DocType: Item,Moving Average, +DocType: Item,Moving Average,Średnia Ruchoma DocType: BOM Replace Tool,The BOM which will be replaced, DocType: Account,Debit,Debet apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5 @@ -3006,7 +3006,7 @@ DocType: Time Log,Additional Cost,Dodatkowy koszt apps/erpnext/erpnext/public/js/setup_wizard.js +67,Financial Year End Date,Data końca roku finansowego apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy" DocType: Quality Inspection,Incoming,Przychodzące -DocType: BOM,Materials Required (Exploded), +DocType: BOM,Materials Required (Exploded),Materiał Wymaga (Rozdzielony) DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop apps/erpnext/erpnext/public/js/setup_wizard.js +186,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie" apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3} @@ -3023,7 +3023,7 @@ DocType: Opportunity,Opportunity Date,Data szansy DocType: Purchase Receipt,Return Against Purchase Receipt,Powrót Przeciwko ZAKUPU DocType: Purchase Order,To Bill,Bill DocType: Material Request,% Ordered,% Zamówione -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework, +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Praca akordowa apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Średnia. Kupno Cena DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach) DocType: Employee,History In Company,Historia Firmy @@ -3081,7 +3081,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance a apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością DocType: Production Planning Tool,Filter based on customer,Filtr bazujący na kliencie DocType: Payment Tool Detail,Against Voucher No,Dowód nr -apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0}, +apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Wprowadź ilość dla przedmiotu {0} DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą DocType: Tax Rule,Purchase,Zakup apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Ilość bilansu @@ -3091,7 +3091,7 @@ apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Magazyny. DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stawka przy użyciu której waluta dostawcy jest konwertowana do podstawowej waluty firmy apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Wiersz # {0}: taktowania konflikty z rzędu {1} -DocType: Opportunity,Next Contact,Następnie Kontakt +DocType: Opportunity,Next Contact,Następny Kontakt apps/erpnext/erpnext/config/accounts.py +94,Setup Gateway accounts.,Rachunki konfiguracji bramy. DocType: Employee,Employment Type,Typ zatrudnienia apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Środki trwałe @@ -3134,7 +3134,7 @@ DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be creat apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu. DocType: Company,Distribution,Dystrybucja apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Kwota zapłacona -apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager, +apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menadżer Projektu apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}% DocType: Account,Receivable,Należności @@ -3147,11 +3147,11 @@ DocType: Hub Settings,Seller Description,Sprzedawca Opis DocType: Employee Education,Qualification,Kwalifikacja DocType: Item Price,Item Price,Cena apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent, -apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video, +apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Ruchomy Obraz i Video apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione DocType: Warehouse,Warehouse Name,Nazwa magazynu DocType: Naming Series,Select Transaction, -apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User, +apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Proszę podj Rolę Zatwierdzającego lub Zatwierdzającego Użytkownika DocType: Journal Entry,Write Off Entry,Wpis Odpisu DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics, @@ -3164,9 +3164,9 @@ DocType: Leave Block List,Applies to Company,Dotyczy Firmy apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje" DocType: Purchase Invoice,In Words,Słownie apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Dziś jest {0} 'urodziny! -DocType: Production Planning Tool,Material Request For Warehouse, +DocType: Production Planning Tool,Material Request For Warehouse,Zamówienie produktu dla Magazynu DocType: Sales Order Item,For Production,Dla Produkcji -apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table, +apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Wprowadź zamówienie sprzedaży w tabelkę powyżej DocType: Payment Request,payment_url,payment_url DocType: Project Task,View Task,Zobacz Zadanie apps/erpnext/erpnext/public/js/setup_wizard.js +66,Your financial year begins on,Rozpoczęcie roku podatkowego @@ -3202,7 +3202,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Urlop DocType: Email Digest,Email Digest,przetwarzanie emaila DocType: Delivery Note,Billing Address Name,Nazwa Adresu do Faktury apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores, -apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses, +apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Zapisz dokument jako pierwszy. DocType: Account,Chargeable,Odpowedni do pobierania opłaty. DocType: Company,Change Abbreviation,Zmień Skrót @@ -3304,8 +3304,8 @@ apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been succ apps/erpnext/erpnext/stock/doctype/item/item.py +420,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}" apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted, -apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0}, +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Zamówienie Produkcji {0} musi być zgłoszone +apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0} apps/erpnext/erpnext/config/stock.py +136,Main Reports,Raporty główne apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date, DocType: Purchase Receipt Item,Prevdoc DocType, @@ -3326,8 +3326,8 @@ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Inv apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +24,Fiscal Year {0} does not exist,Rok fiskalny {0} nie istnieje apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data ukończenia DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy) -apps/erpnext/erpnext/config/hr.py +113,Organization unit (department) master., -apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos, +apps/erpnext/erpnext/config/hr.py +113,Organization unit (department) master.,Szef departamentu organizacji +apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Wprowadź poprawny numer telefonu kom DocType: Budget Detail,Budget Detail,Szczegóły Budżetu apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Proszę wpisać wiadomość przed wysłaniem apps/erpnext/erpnext/config/accounts.py +137,Point-of-Sale Profile,Point-of-Sale profil @@ -3337,7 +3337,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów DocType: Maintenance Schedule Detail,Scheduled Date, apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Łączna wypłacona Amt -DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages, +DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Wiadomości dłuższe niż 160 znaków zostaną podzielone na kilka wiadomości DocType: Purchase Receipt Item,Received and Accepted,Otrzymano i zaakceptowano ,Serial No Service Contract Expiry, DocType: Item,Unit of Measure Conversion,Jednostka miary Conversion @@ -3361,7 +3361,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: S apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć DocType: Issue,Content Type,Typ zawartości apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer -DocType: Item,List this Item in multiple groups on the website., +DocType: Item,List this Item in multiple groups on the website.,Pokaż ten produkt w wielu grupach na stronie internetowej. apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach" apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości @@ -3387,7 +3387,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od ostatniego zamówienia apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Balance Sheet account,Obciążenie rachunku musi być kontem Bilans DocType: Buying Settings,Naming Series,Seria nazw -DocType: Leave Block List,Leave Block List Name, +DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aktywa obrotowe apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Czy na pewno chcesz Wysłać wszystkie Pensje za miesiąc {0} i rok {1} apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import abonentów @@ -3538,7 +3538,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Va DocType: Item,Default Warehouse,Domyślny magazyn DocType: Task,Actual End Date (via Time Logs),Rzeczywista Data zakończenia (przez Time Logs) apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0} -apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center, +apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Proszę podać nadrzędne centrum kosztów DocType: Delivery Note,Print Without Amount,Drukuj bez wartości apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items, DocType: Issue,Support Team,Support Team @@ -3567,7 +3567,7 @@ apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_recei DocType: Supplier,Credit Days Based On,Dni kredytowe w oparciu o DocType: Tax Rule,Tax Rule,Reguła podatkowa DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Utrzymanie tej samej stawki przez cały cykl sprzedaży -DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Workstation Pracy. +DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Pracy Workstation. apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zostało już dodane ,Items To Be Requested, DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu @@ -3587,7 +3587,7 @@ DocType: Leave Block List,Stop users from making Leave Applications on following apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze DocType: Sales Invoice,Is POS, apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1} -DocType: Production Order,Manufactured Qty, +DocType: Production Order,Manufactured Qty,Ilość wyprodukowanych DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rachunki dla klientów. @@ -3624,7 +3624,7 @@ DocType: Serial No,Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inwentaryzacja partii DocType: Employee,Contract End Date,Data końcowa kontraktu DocType: Sales Order,Track this Sales Order against any Project, -DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria, +DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Wyciągnij zlecenia sprzedaży (oczekujące na dostarczenie) na podstawie powyższych kryteriów DocType: Deduction Type,Deduction Type,Typ odliczenia DocType: Attendance,Half Day,Pół Dnia DocType: Pricing Rule,Min Qty,Min. ilość @@ -3645,7 +3645,7 @@ DocType: Hub Settings,Hub Settings,Ustawienia Hub DocType: Project,Gross Margin %,Marża brutto % DocType: BOM,With Operations,Wraz z działaniami apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}. -,Monthly Salary Register, +,Monthly Salary Register,Rejestr Miesięcznego Wynagrodzenia DocType: Warranty Claim,If different than customer address,Jeśli jest inny niż adres klienta DocType: BOM Operation,BOM Operation, DocType: Purchase Taxes and Charges,On Previous Row Amount, @@ -3674,7 +3674,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57, apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card, DocType: BOM,Item to be manufactured or repacked,"Produkt, który ma zostać wyprodukowany lub przepakowany" apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu -DocType: Purchase Invoice,Next Date, +DocType: Purchase Invoice,Next Date,Następna Data DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Proszę wprowadzić podatki i opłaty DocType: Sales Invoice Item,Drop Ship,Drop Ship diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv index f5ed6866e1..d484234dde 100644 --- a/erpnext/translations/pt-BR.csv +++ b/erpnext/translations/pt-BR.csv @@ -213,7 +213,7 @@ apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação DocType: Sales Invoice,Is Opening Entry,Está abrindo Entry DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se não padronizado conta a receber aplicável -apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Para for necessário Armazém antes Enviar +apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Almoxarifado de destino necessário antes de enviar apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,"Recebeu, em" DocType: Sales Partner,Reseller,Revendedor apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Por favor, indique Empresa" @@ -831,7 +831,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Não envie aos empre DocType: Opportunity,Walk In,Caminhe em apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entradas de Stock DocType: Item,Inspection Criteria,Critérios de Inspeção -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Árvore de Centros de custo financial . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Árvore de Centros de custo finanial . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Branco @@ -1223,7 +1223,7 @@ DocType: Employee External Work History,Total Experience,Experiência total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos -DocType: Material Request Item,Sales Order,Nº da Ordem de Venda +DocType: Material Request Item,Sales Order No,Nº da Ordem de Venda DocType: Item Group,Item Group Name,Nome do Grupo de Itens apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiais de transferência para Fabricação @@ -1373,7 +1373,7 @@ apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unidade únic apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado ' DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faça Contabilidade entrada para cada Banco de Movimento DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +394,Warehouse required at Row No {0},Armazém necessário na Coluna No {0} +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +394,Warehouse required at Row No {0},Almoxarifado necessário na Coluna No {0} apps/erpnext/erpnext/public/js/setup_wizard.js +81,Please enter valid Financial Year Start and End Dates,"Por favor, indique Ano válido Financial datas inicial e final" DocType: Employee,Date Of Retirement,Data da aposentadoria DocType: Upload Attendance,Get Template,Obter Modelo @@ -1470,7 +1470,7 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity fo DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Leaves apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Para apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total' -DocType: Sales Order Item,Delivery Warehouse,Armazém de entrega +DocType: Sales Order Item,Delivery Warehouse,Almoxarifado de entrega DocType: Stock Settings,Allowance Percent,Percentual de tolerância DocType: SMS Settings,Message Parameter,Parâmetro da mensagem DocType: Serial No,Delivery Document No,Nº do Documento de Entrega @@ -1578,7 +1578,7 @@ DocType: Journal Entry,Accounts Receivable,Contas a Receber DocType: Address Template,This format is used if country specific format is not found,Este formato é usado se o formato específico país não é encontrado DocType: Production Order,Use Multi-Level BOM,Utilize LDM de Vários Níveis DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Árvore de contas financial . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Árvore de contas finanial . DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"A Conta {0} deve ser do tipo ""Ativo Fixo"" pois o item {1} é um item de ativos" @@ -1870,7 +1870,7 @@ DocType: Delivery Note,Transporter Name,Nome da Transportadora DocType: Authorization Rule,Authorized Value,Valor Autorizado DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que este contato pertence apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Faltas -apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +736,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais +apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +736,Item or Warehouse for row {0} does not match Material Request,Item ou Almoxarifado para linha {0} não corresponde Pedido de materiais apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidade de Medida DocType: Fiscal Year,Year End Date,Data final do ano DocType: Task Depends On,Task Depends On,Tarefa depende de @@ -2264,7 +2264,7 @@ apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Cap DocType: UOM,Must be Whole Number,Deve ser Número inteiro DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças alocadas (em dias) apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe -DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazém Cliente (Opcional) +DocType: Sales Invoice Item,Customer Warehouse (Optional),Almoxarifado Cliente (Opcional) DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura apps/erpnext/erpnext/hooks.py +55,Orders,Encomendas @@ -2402,7 +2402,7 @@ DocType: Item,Inspection Required,Inspeção Obrigatória DocType: Purchase Invoice Item,PR Detail,Detalhe PR DocType: Sales Order,Fully Billed,Totalmente Anunciado apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão -apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +120,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0} +apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +120,Delivery warehouse required for stock item {0},Almoxarifado de entrega necessário para estoque item {0} DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão) DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os usuários com esta função são autorizados a estabelecer contas congeladas e criar / modificar lançamentos contábeis contra contas congeladas DocType: Serial No,Is Cancelled,É cancelado @@ -2648,7 +2648,7 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}' DocType: Shipping Rule,Calculate Based On,Calcule Baseado em -DocType: Delivery Note Item,From Warehouse,Do Armazém +DocType: Delivery Note Item,From Warehouse,Almoxarifado de origem DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total DocType: Tax Rule,Shipping City,O envio da Cidade apps/erpnext/erpnext/stock/doctype/item/item.js +59,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido" @@ -3271,7 +3271,7 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ... DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0} -apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Warehouse is mandatory,Armazém é obrigatória +apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Warehouse is mandatory,Almoxarifado é obrigatório DocType: Supplier,Address and Contacts,Endereços e Contatos DocType: UOM Conversion Detail,UOM Conversion Detail,Detalhe da Conversão de UDM apps/erpnext/erpnext/public/js/setup_wizard.js +169,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h ) @@ -3455,7 +3455,7 @@ apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a DocType: Notification Control,Prompt for Email on Submission of,Solicitar e-mail no envio da apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no período apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de estoque -DocType: Manufacturing Settings,Default Work In Progress Warehouse,Padrão trabalho no armazém Progresso +DocType: Manufacturing Settings,Default Work In Progress Warehouse,Trabalho padrão em progresso no almoxarifado apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,As configurações padrão para as transações contábeis. apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +58,Expected Date cannot be before Material Request Date,Data prevista não pode ser antes de Material Data do Pedido apps/erpnext/erpnext/stock/get_item_details.py +115,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv index 44e3ee8f56..28ccc7ee3f 100644 --- a/erpnext/translations/pt.csv +++ b/erpnext/translations/pt.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer DocType: Opportunity,Walk In,Entrar apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entradas de Stock DocType: Item,Inspection Criteria,Critérios de inspeção -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Árvore de Centros de custo financial . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Árvore de Centros de custo finanial . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Branco @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Experiência total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos -DocType: Material Request Item,Sales Order,Vendas decreto n º +DocType: Material Request Item,Sales Order No,Vendas decreto n º DocType: Item Group,Item Group Name,Nome do Grupo item apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiais de transferência para Fabricação @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,Contas a receber DocType: Address Template,This format is used if country specific format is not found,Este formato é usado se o formato específico país não é encontrado DocType: Production Order,Use Multi-Level BOM,Utilize Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Árvore de contas financeiras. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Árvore de contas financeiras. DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Conta {0} deve ser do tipo "" Ativo Fixo "" como item {1} é um item de ativos" diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv index 6b2993eefa..05a1d40d98 100644 --- a/erpnext/translations/ro.csv +++ b/erpnext/translations/ro.csv @@ -830,7 +830,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Mement DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stoc Entries DocType: Item,Inspection Criteria,Criteriile de inspecție -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Arborele de centre de cost financial. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Arborele de centre de cost finanial. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferat apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Alb @@ -1221,7 +1221,7 @@ DocType: Employee External Work History,Total Experience,Experiența totală apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip de ambalare (e) anulate apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow de la Investiții apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere -DocType: Material Request Item,Sales Order,Vânzări Ordinul nr +DocType: Material Request Item,Sales Order No,Vânzări Ordinul nr DocType: Item Group,Item Group Name,Denumire Grup Articol apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Luate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiale de transfer de Fabricare @@ -1573,7 +1573,7 @@ DocType: Journal Entry,Accounts Receivable,Conturi de Incasare DocType: Address Template,This format is used if country specific format is not found,Acest format este utilizat în cazul în format specific țării nu este găsit DocType: Production Order,Use Multi-Level BOM,Utilizarea Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Includ intrările împăcat -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Arborele de conturi financial. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Arborele de conturi finanial. DocType: Leave Control Panel,Leave blank if considered for all employee types,Lăsați necompletat dacă se consideră pentru toate tipurile de angajați DocType: Landed Cost Voucher,Distribute Charges Based On,Împărțiți taxelor pe baza apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Contul {0} trebuie să fie de tipul 'valoare stabilită' deoarece articolul {1} este un articol de valoare @@ -2047,7 +2047,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ext ,Profit and Loss Statement,Profit și pierdere DocType: Bank Reconciliation Detail,Cheque Number,Număr Cec DocType: Payment Tool Detail,Payment Tool Detail,Plata Instrumentul Detalii -,Sales Browser,Vânzări Browser +,Sales Browser,Browser de vanzare DocType: Journal Entry,Total Credit,Total credit apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +501,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2} apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +398,Local,Local @@ -2067,7 +2067,7 @@ apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on DocType: Sales Partner,Targets,Obiective DocType: Price List,Price List Master,Lista de preturi Masterat DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective. -,S.O. No.,SO Nu. +,S.O. No.,SO No. DocType: Production Order Operation,Make Time Log,Fa-ti timp Log apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0} DocType: Price List,Applicable for Countries,Aplicabile pentru țările @@ -2134,7 +2134,7 @@ DocType: Account,Stock Received But Not Billed,"Stock primite, dar nu Considerat apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root Account must be a group,Contul de root trebuie să fie un grup DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brut Suma de plată + restante Suma + încasări - Total Deducerea DocType: Monthly Distribution,Distribution Name,Denumire Distribuție -DocType: Features Setup,Sales and Purchase,Vanzari si cumparare +DocType: Features Setup,Sales and Purchase,Vanzari si cumparari DocType: Supplier Quotation Item,Material Request No,Cerere de material Nu apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0} DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rata la care moneda clientului este convertită în valuta de bază a companiei @@ -3542,7 +3542,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manuf apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Amount,Sumă apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit -,Sales Analytics,Analytics de vânzare +,Sales Analytics,Analitice de vânzare DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurarea e-mail apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv index bf2887b2f1..b3dc718100 100644 --- a/erpnext/translations/ru.csv +++ b/erpnext/translations/ru.csv @@ -833,7 +833,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправл DocType: Opportunity,Walk In,Прогулка в apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток Записи DocType: Item,Inspection Criteria,Осмотр Критерии -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Дерево financial центры Стоимость. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Все передаваемые apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Белый @@ -1225,7 +1225,7 @@ DocType: Employee External Work History,Total Experience,Суммарный оп apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Поток денежных средств от инвестиционной apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы -DocType: Material Request Item,Sales Order,Номер Заказа клиента +DocType: Material Request Item,Sales Order No,Номер Заказа клиента DocType: Item Group,Item Group Name,Пункт Название группы apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Передача материалов для производства @@ -1580,7 +1580,7 @@ DocType: Journal Entry,Accounts Receivable,Дебиторская задолже DocType: Address Template,This format is used if country specific format is not found,"Этот формат используется, если конкретный формат страна не найден" DocType: Production Order,Use Multi-Level BOM,Использование Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Включите примириться Записи -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Дерево financial счетов. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Дерево finanial счетов. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставьте пустым, если считать для всех типов сотрудников" DocType: Landed Cost Voucher,Distribute Charges Based On,Распределите плату на основе apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', так как позиция {1} является активом" diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv index 51714af63b..fc5c464111 100644 --- a/erpnext/translations/sk.csv +++ b/erpnext/translations/sk.csv @@ -832,7 +832,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměst DocType: Opportunity,Walk In,Vejít apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Sklad Príspevky DocType: Item,Inspection Criteria,Inspekční Kritéria -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Strom financial nákladových středisek. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Strom finanial nákladových středisek. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prevedené apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.) apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Biela @@ -1224,7 +1224,7 @@ DocType: Employee External Work History,Total Experience,Celková zkušenost apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Balení Slip (y) zrušeno apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peňažný tok z investičných apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky -DocType: Material Request Item,Sales Order,Prodejní objednávky No +DocType: Material Request Item,Sales Order No,Prodejní objednávky No DocType: Item Group,Item Group Name,Položka Název skupiny apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Přenos Materiály pro výrobu @@ -1579,7 +1579,7 @@ DocType: Journal Entry,Accounts Receivable,Pohledávky DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen" DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Strom financial účtů. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Strom finanial účtů. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců" DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka" diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv index baa405e703..566a5b0e2d 100644 --- a/erpnext/translations/sl.csv +++ b/erpnext/translations/sl.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zapos DocType: Opportunity,Walk In,Vstopiti apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Zaloga Vnosi DocType: Item,Inspection Criteria,Merila Inšpekcijske -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Drevo financial centrov stalo. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Drevo finanial centrov stalo. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenese apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bela @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Skupaj Izkušnje apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Dobavnico (e) odpovedan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Denarni tokovi iz naložbenja apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški -DocType: Material Request Item,Sales Order,Prodaja Zaporedna številka +DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka DocType: Item Group,Item Group Name,Item Name Group apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferji Materiali za Izdelava @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Terjatve DocType: Address Template,This format is used if country specific format is not found,"Ta oblika se uporablja, če je ni mogoče najti poseben format državo" DocType: Production Order,Use Multi-Level BOM,Uporabite Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Vključi usklajene vnose -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Drevo financial računov. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Drevo finanial računov. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Pustite prazno, če velja za vse vrste zaposlenih" DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirajo pristojbin na podlagi apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Račun {0}, mora biti tipa "osnovno sredstvo", kot {1} je postavka sredstvo Item" diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv index 9852f76993..e7d19b0451 100644 --- a/erpnext/translations/sq.csv +++ b/erpnext/translations/sq.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Mos dërgoni punonj DocType: Opportunity,Walk In,Ecni Në apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Entries DocType: Item,Inspection Criteria,Kriteret e Inspektimit -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Pema e Qendrave financial kostos. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Pema e Qendrave finanial kostos. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferuar apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,E bardhë @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Përvoja Total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow nga Investimi apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat -DocType: Material Request Item,Sales Order,Rendit Sales Asnjë +DocType: Material Request Item,Sales Order No,Rendit Sales Asnjë DocType: Item Group,Item Group Name,Item Emri i Grupit apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Marrë apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Llogaritë e arkëtueshme DocType: Address Template,This format is used if country specific format is not found,Ky format përdoret në qoftë se format specifik i vendit nuk është gjetur DocType: Production Order,Use Multi-Level BOM,Përdorni Multi-Level bom DocType: Bank Reconciliation,Include Reconciled Entries,Përfshini gjitha pajtuar -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Pema e llogarive financial. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Pema e llogarive finanial. DocType: Leave Control Panel,Leave blank if considered for all employee types,Lini bosh nëse konsiderohet për të gjitha llojet e punonjësve DocType: Landed Cost Voucher,Distribute Charges Based On,Shpërndarjen Akuzat Bazuar Në apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Llogaria {0} duhet të jetë e tipit "aseteve fikse" si i artikullit {1} është një çështje e Aseteve diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv index 6d6028a460..10e84a6ebf 100644 --- a/erpnext/translations/sr.csv +++ b/erpnext/translations/sr.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте сл DocType: Opportunity,Walk In,Шетња у apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток Записи DocType: Item,Inspection Criteria,Инспекцијски Критеријуми -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Дерево financial центры Стоимость . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Преносе apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бео @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Укупно Искус apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Новчани ток од Инвестирање apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы -DocType: Material Request Item,Sales Order,Продаја Наручите Нема +DocType: Material Request Item,Sales Order No,Продаја Наручите Нема DocType: Item Group,Item Group Name,Ставка Назив групе apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Трансфер материјал за производњу @@ -1580,7 +1580,7 @@ DocType: Journal Entry,Accounts Receivable,Потраживања DocType: Address Template,This format is used if country specific format is not found,Овај формат се користи ако земља специфична формат није пронађен DocType: Production Order,Use Multi-Level BOM,Користите Мулти-Левел бом DocType: Bank Reconciliation,Include Reconciled Entries,Укључи помирили уносе -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Дерево financial счетов. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Дерево finanial счетов. DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставите празно ако се сматра за све типове запослених DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирају пријава по apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа "" Fixed Asset "", как товара {1} является активом Пункт" diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv index b019ed4288..3a95e5ad49 100644 --- a/erpnext/translations/sv.csv +++ b/erpnext/translations/sv.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställ DocType: Opportunity,Walk In,Gå In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Inlägg DocType: Item,Inspection Criteria,Inspektionskriterier -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Tree of financial kostnadsställen. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Tree of finanial kostnadsställen. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Överfört apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Vit @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Följesedlar avbryts apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kassaflöde från investeringsverksamheten apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter" -DocType: Material Request Item,Sales Order,Kundorder Ingen +DocType: Material Request Item,Sales Order No,Kundorder Ingen DocType: Item Group,Item Group Name,Produkt Gruppnamn apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Överför Material Tillverkning @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Kundreskontra DocType: Address Template,This format is used if country specific format is not found,Det här formatet används om landsspecifika format inte hittas DocType: Production Order,Use Multi-Level BOM,Använd Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Inkludera avstämnignsanteckningar -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Träd financial konton. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Träd finanial konton. DocType: Leave Control Panel,Leave blank if considered for all employee types,Lämna tomt om det anses vara för alla typer av anställda DocType: Landed Cost Voucher,Distribute Charges Based On,Fördela avgifter som grundas på apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Kontot {0} måste vara av typen ""Fast tillgång"" som punkt {1} är en tillgångspost" diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv index 0de536f3bf..820e611159 100644 --- a/erpnext/translations/ta.csv +++ b/erpnext/translations/ta.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாள DocType: Opportunity,Walk In,ல் நடக்க apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,பங்கு பதிவுகள் DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள் -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial செலவு மையங்கள் மரம் . +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial செலவு மையங்கள் மரம் . apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,மாற்றப்பட்டால் apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,வெள்ளை @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,மொத்த அ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம் -DocType: Material Request Item,Sales Order,விற்பனை ஆணை இல்லை +DocType: Material Request Item,Sales Order No,விற்பனை ஆணை இல்லை DocType: Item Group,Item Group Name,உருப்படியை குழு பெயர் apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,எடுக்கப்பட்ட apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள் @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,கணக்குகள் DocType: Address Template,This format is used if country specific format is not found,நாட்டின் குறிப்பிட்ட வடிவமைப்பில் இல்லை என்றால் இந்த வடிவமைப்பு பயன்படுத்தப்படும் DocType: Production Order,Use Multi-Level BOM,மல்டி லெவல் BOM பயன்படுத்த DocType: Bank Reconciliation,Include Reconciled Entries,ஆர தழுவி பதிவுகள் சேர்க்கிறது -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial கணக்குகளின் மரம் . +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial கணக்குகளின் மரம் . DocType: Leave Control Panel,Leave blank if considered for all employee types,அனைத்து பணியாளர் வகையான கருதப்படுகிறது என்றால் வெறுமையாக DocType: Landed Cost Voucher,Distribute Charges Based On,விநியோகிக்க குற்றச்சாட்டுக்களை அடிப்படையாகக் கொண்டு apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,பொருள் {1} சொத்து பொருள் என கணக்கு {0} வகை ' நிலையான சொத்து ' இருக்க வேண்டும் diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv index 656e7dd90b..c6359f8695 100644 --- a/erpnext/translations/te.csv +++ b/erpnext/translations/te.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Employee జన్ DocType: Opportunity,Walk In,లో వల్క్ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,స్టాక్ ఎంట్రీలు DocType: Item,Inspection Criteria,ఇన్స్పెక్షన్ ప్రమాణం -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial ఖర్చు సెంటర్స్ చెట్టు. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finanial ఖర్చు సెంటర్స్ చెట్టు. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,బదిలీ apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,వైట్ @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,మొత్తం ఎ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,రద్దు ప్యాకింగ్ స్లిప్ (లు) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు -DocType: Material Request Item,Sales Order,సేల్స్ ఆర్డర్ సంఖ్య +DocType: Material Request Item,Sales Order No,సేల్స్ ఆర్డర్ సంఖ్య DocType: Item Group,Item Group Name,అంశం గ్రూప్ పేరు apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,తీసుకోబడినది apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,తయారీకి ట్రాన్స్ఫర్ మెటీరియల్స్ @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,స్వీకరించదగి DocType: Address Template,This format is used if country specific format is not found,దేశం నిర్దిష్ట ఫార్మాట్ దొరకలేదు ఒకవేళ ఈ ఫార్మాట్ ఉపయోగిస్తారు DocType: Production Order,Use Multi-Level BOM,బహుళస్థాయి BOM ఉపయోగించండి DocType: Bank Reconciliation,Include Reconciled Entries,అనుకూలీకరించబడిన ఎంట్రీలు చేర్చండి -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial ఖాతాల యొక్క చెట్టు. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finanial ఖాతాల యొక్క చెట్టు. DocType: Leave Control Panel,Leave blank if considered for all employee types,అన్ని ఉద్యోగి రకాల భావిస్తారు ఉంటే ఖాళీ వదిలి DocType: Landed Cost Voucher,Distribute Charges Based On,పంపిణీ ఆరోపణలపై బేస్డ్ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,అంశం {1} నిధుల అంశం గా ఖాతా {0} 'స్థిర ఆస్తి' రకం ఉండాలి diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv index 1847549ab5..dd262216eb 100644 --- a/erpnext/translations/th.csv +++ b/erpnext/translations/th.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ DocType: Opportunity,Walk In,Walk In apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,หุ้นรายการ DocType: Item,Inspection Criteria,เกณฑ์การตรวจสอบ -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,ต้นไม้ ของ ศูนย์ ต้นทุน financial +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,ต้นไม้ ของ ศูนย์ ต้นทุน finanial apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,โอน apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง) apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,ขาว @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,ประสบกา apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,กระแสเงินสดจากการลงทุน apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย -DocType: Material Request Item,Sales Order,สั่งซื้อยอดขาย +DocType: Material Request Item,Sales Order No,สั่งซื้อยอดขาย DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ยึด apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,ลูกหนี้ DocType: Address Template,This format is used if country specific format is not found,รูปแบบนี้ใช้ในกรณีที่รูปแบบเฉพาะของประเทศจะไม่พบ DocType: Production Order,Use Multi-Level BOM,ใช้ BOM หลายระดับ DocType: Bank Reconciliation,Include Reconciled Entries,รวมถึง คอมเมนต์ Reconciled -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,ผังต้นไม้ของบัญชีการเงิน +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,ผังต้นไม้ของบัญชีการเงิน DocType: Leave Control Panel,Leave blank if considered for all employee types,เว้นไว้หากพิจารณาให้พนักงานทุกประเภท DocType: Landed Cost Voucher,Distribute Charges Based On,กระจายค่าใช้จ่ายขึ้นอยู่กับ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,บัญชี {0} ต้องเป็นชนิด ' สินทรัพย์ถาวร ' เป็น รายการ {1} เป็น รายการสินทรัพย์ diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv index 3b17a30f54..39f7f8c115 100644 --- a/erpnext/translations/tr.csv +++ b/erpnext/translations/tr.csv @@ -35,7 +35,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114, DocType: C-Form,Customer,Müşteri DocType: C-Form,Customer,Müşteri DocType: Purchase Receipt Item,Required By,Gerekli -DocType: Delivery Note,Return Against Delivery Note,İrsaliye Karşı dön +DocType: Delivery Note,Return Against Delivery Note,İrsaliye Karşılığı İade DocType: Department,Department,Departman DocType: Department,Department,Departman DocType: Purchase Order,% Billed,% Faturalanan @@ -221,7 +221,7 @@ apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has alr DocType: Lead,Request Type,İstek Türü DocType: Lead,Request Type,İstek Türü DocType: Leave Application,Reason,Nedeni -apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Çalışan olun +apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Çalışan Girişi Yap apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme @@ -354,7 +354,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı DocType: Employee,External Work History,Dış Çalışma Geçmişi apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Dairesel Referans Hatası -DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sözlü (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır. +DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Tutarın Yazılı Hali (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır. DocType: Lead,Industry,Sanayi DocType: Employee,Job Profile,İş Profili DocType: Employee,Job Profile,İş Profili @@ -1019,7 +1019,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Çalışanların Do DocType: Opportunity,Walk In,Rezervasyonsuz Müşteri apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stok Girişler DocType: Item,Inspection Criteria,Muayene Kriterleri -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Finansal Maliyet Merkezleri Ağacı +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Finansal Maliyet Merkezleri Ağacı apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Aktarılan apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Beyaz @@ -1495,8 +1495,8 @@ DocType: Employee External Work History,Total Experience,Toplam Deneyim apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Yatırım Nakit Akışı apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri -DocType: Material Request Item,Sales Order,Satış Sipariş No -DocType: Material Request Item,Sales Order,Satış Sipariş No +DocType: Material Request Item,Sales Order No,Satış Sipariş No +DocType: Material Request Item,Sales Order No,Satış Sipariş No DocType: Item Group,Item Group Name,Ürün Grup Adı DocType: Item Group,Item Group Name,Ürün Grup Adı apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Alınmış @@ -1524,7 +1524,7 @@ DocType: UOM,UOM Name,Ölçü Birimi apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Katkı Tutarı DocType: Sales Invoice,Shipping Address,Teslimat Adresi DocType: Stock Reconciliation,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.,"Bu araç, güncellemek veya sistemde stok miktarı ve değerleme düzeltmek için yardımcı olur. Genellikle sistem değerlerini ve ne aslında depolarda var eşitlemek için kullanılır." -DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Sözlü İrsaliyeyi kaydettiğinizde görünür olacaktır +DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Tutarın Yazılı Hali İrsaliyeyi kaydettiğinizde görünür olacaktır apps/erpnext/erpnext/config/stock.py +115,Brand master.,Esas marka. DocType: Sales Invoice Item,Brand Name,Marka Adı DocType: Sales Invoice Item,Brand Name,Marka Adı @@ -1919,7 +1919,7 @@ DocType: Journal Entry,Accounts Receivable,Alacak hesapları DocType: Address Template,This format is used if country specific format is not found,Ülkeye özgü format bulunamazsa bu format kullanılır DocType: Production Order,Use Multi-Level BOM,Çok Seviyeli BOM kullan DocType: Bank Reconciliation,Include Reconciled Entries,Mutabık girdileri dahil edin -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Finansal Hesaplar Ağacı +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Finansal Hesaplar Ağacı DocType: Leave Control Panel,Leave blank if considered for all employee types,Tüm çalışan tipleri için kabul ise boş bırakın DocType: Landed Cost Voucher,Distribute Charges Based On,Dağıt Masraflar Dayalı apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Hesap {0} Madde {1} Varlık Maddesi olmak üzere 'Sabit Varlık' türünde olmalıdır @@ -2161,7 +2161,7 @@ DocType: Item,"Allow in Sales Order of type ""Service""","Satış Siparişi tür apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Mağazalar apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Mağazalar DocType: Time Log,Projects Manager,Proje Yöneticisi -DocType: Serial No,Delivery Time,Teslimat süresi +DocType: Serial No,Delivery Time,İrsaliye Zamanı apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma DocType: Item,End of Life,Kullanım süresi Sonu @@ -2430,7 +2430,7 @@ DocType: Landed Cost Voucher,Purchase Receipt Items,Satın alma makbuzu Ürünle apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Özelleştirme Formları DocType: Account,Income Account,Gelir Hesabı DocType: Account,Income Account,Gelir Hesabı -apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +645,Delivery,Teslimat +apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +645,Delivery,İrsaliye DocType: Stock Reconciliation Item,Current Qty,Güncel Adet DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız" DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı @@ -3028,7 +3028,7 @@ DocType: Buying Settings,Purchase Order Required,gerekli Satın alma Siparişi ,Item-wise Sales History,Ürün bilgisi Satış Geçmişi DocType: Expense Claim,Total Sanctioned Amount,Toplam Tasdiklenmiş Tutar ,Purchase Analytics,Satın alma analizleri -DocType: Sales Invoice Item,Delivery Note Item,Ürün İrsaliyesi +DocType: Sales Invoice Item,Delivery Note Item,İrsaliye Ürünleri DocType: Expense Claim,Task,Görev DocType: Expense Claim,Task,Görev DocType: Purchase Taxes and Charges,Reference Row #,Referans Satırı # @@ -3639,7 +3639,7 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} satır {1} de Alınan veya Taşerona verilen bir Ürün olmalıdır. apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir DocType: GL Entry,Party,Taraf -DocType: Sales Order,Delivery Date,Teslimat Tarihi +DocType: Sales Order,Delivery Date,İrsaliye Tarihi DocType: Opportunity,Opportunity Date,Fırsat tarihi DocType: Purchase Receipt,Return Against Purchase Receipt,Satınalma Makbuzu Karşı dön DocType: Purchase Order,To Bill,Faturala diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv index 82678f1f5f..a85cbbe202 100644 --- a/erpnext/translations/uk.csv +++ b/erpnext/translations/uk.csv @@ -810,7 +810,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилат DocType: Opportunity,Walk In,Заходити apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток Записи DocType: Item,Inspection Criteria,Інспекційні Критерії -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Дерево financial МВЗ. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Дерево finanial МВЗ. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Всі передані apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Завантажити лист голову і логотип. (ви можете редагувати їх пізніше). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Білий @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Загальний до apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Потік грошових коштів від інвестиційної apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори -DocType: Material Request Item,Sales Order,Продажі Замовити Немає +DocType: Material Request Item,Sales Order No,Продажі Замовити Немає DocType: Item Group,Item Group Name,Назва товару Група apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Передача матеріалів для виробництва @@ -1555,7 +1555,7 @@ DocType: Journal Entry,Accounts Receivable,Дебіторська заборго DocType: Address Template,This format is used if country specific format is not found,"Цей формат використовується, якщо певний формат країна не знайдений" DocType: Production Order,Use Multi-Level BOM,Використовувати багаторівневе специфікації DocType: Bank Reconciliation,Include Reconciled Entries,Включити примиритися Записи -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Дерево financial рахунків. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Дерево finanial рахунків. DocType: Leave Control Panel,Leave blank if considered for all employee types,"Залиште порожнім, якщо розглядати для всіх типів працівників" DocType: Landed Cost Voucher,Distribute Charges Based On,Розподілити плату на основі apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Рахунок {0} повинен бути типу "основний актив", як товару {1} є активом товару" diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv index 6170b73a12..35fab86935 100644 --- a/erpnext/translations/ur.csv +++ b/erpnext/translations/ur.csv @@ -808,7 +808,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,ملازم سالگ DocType: Opportunity,Walk In,میں چلنے apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,اسٹاک میں لکھے DocType: Item,Inspection Criteria,معائنہ کا کلیہ -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,financial لاگت کے مراکز کا درخت. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,finanial لاگت کے مراکز کا درخت. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,transfered کیا apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,وائٹ @@ -1199,7 +1199,7 @@ DocType: Employee External Work History,Total Experience,کل تجربہ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,منسوخ پیکنگ پرچی (ے) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,سرمایہ کاری سے کیش فلو apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز -DocType: Material Request Item,Sales Order,سیلز آرڈر نہیں +DocType: Material Request Item,Sales Order No,سیلز آرڈر نہیں DocType: Item Group,Item Group Name,آئٹم گروپ کا نام apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,لیا apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,تیاری کے لئے کی منتقلی کی معدنیات @@ -1553,7 +1553,7 @@ DocType: Journal Entry,Accounts Receivable,وصولی اکاؤنٹس DocType: Address Template,This format is used if country specific format is not found,ملک مخصوص شکل نہیں ملا ہے تو یہ فارمیٹ استعمال کیا جاتا ہے DocType: Production Order,Use Multi-Level BOM,ملٹی لیول BOM استعمال DocType: Bank Reconciliation,Include Reconciled Entries,Reconciled میں لکھے گئے مراسلے شامل -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,financial اکاؤنٹس کا درخت. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,finanial اکاؤنٹس کا درخت. DocType: Leave Control Panel,Leave blank if considered for all employee types,تمام ملازم اقسام کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں DocType: Landed Cost Voucher,Distribute Charges Based On,تقسیم الزامات کی بنیاد پر apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,آئٹم {1} ایک اثاثہ ہے آئٹم کے طور پر اکاؤنٹ {0} 'فکسڈ اثاثہ' قسم کا ہونا چاہیے diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv index ec6f5d7c38..d71bb6e187 100644 --- a/erpnext/translations/vi.csv +++ b/erpnext/translations/vi.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,Không gửi nhân v DocType: Opportunity,Walk In,Trong đi bộ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Cổ Entries DocType: Item,Inspection Criteria,Tiêu chuẩn kiểm tra -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,Cây của Trung tâm Chi phí financial. +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,Cây của Trung tâm Chi phí finanial. apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nhận chuyển nhượng apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,Tải lên đầu thư của bạn và logo. (Bạn có thể chỉnh sửa chúng sau này). apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Trắng @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Tổng số kinh nghi apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí -DocType: Material Request Item,Sales Order,Không bán hàng đặt hàng +DocType: Material Request Item,Sales Order No,Không bán hàng đặt hàng DocType: Item Group,Item Group Name,Mục Group Name apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lấy apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất @@ -1581,7 +1581,7 @@ DocType: Journal Entry,Accounts Receivable,Tài khoản Phải thu DocType: Address Template,This format is used if country specific format is not found,Định dạng này được sử dụng nếu định dạng quốc gia cụ thể không được tìm thấy DocType: Production Order,Use Multi-Level BOM,Sử dụng Multi-Level BOM DocType: Bank Reconciliation,Include Reconciled Entries,Bao gồm Entries hòa giải -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,Cây tài khoản financial. +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,Cây tài khoản finanial. DocType: Leave Control Panel,Leave blank if considered for all employee types,Để trống nếu xem xét tất cả các loại nhân viên DocType: Landed Cost Voucher,Distribute Charges Based On,Phân phối Phí Dựa Trên apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Tài khoản {0} phải là loại 'tài sản cố định ""như mục {1} là một khoản tài sản" diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv index 2d6fd4a8b4..516bb14ffc 100644 --- a/erpnext/translations/zh-cn.csv +++ b/erpnext/translations/zh-cn.csv @@ -821,7 +821,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工 DocType: Opportunity,Walk In,主动上门 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,库存条目 DocType: Item,Inspection Criteria,检验标准 -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,树financial成本中心。 +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,树finanial成本中心。 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,转移 apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,白 @@ -1212,7 +1212,7 @@ DocType: Employee External Work History,Total Experience,总经验 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,装箱单（ S）取消 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,从投资现金流 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费 -DocType: Material Request Item,Sales Order,销售订单编号 +DocType: Material Request Item,Sales Order No,销售订单编号 DocType: Item Group,Item Group Name,品目群组名称 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,转移制造材料 @@ -1567,7 +1567,7 @@ DocType: Journal Entry,Accounts Receivable,应收帐款 DocType: Address Template,This format is used if country specific format is not found,此格式用于如果找不到特定国家的格式 DocType: Production Order,Use Multi-Level BOM,采用多级物料清单 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录 -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,会计科目树 +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,会计科目树 DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产” diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv index 4a2f1469bc..1f28b0f1ec 100644 --- a/erpnext/translations/zh-tw.csv +++ b/erpnext/translations/zh-tw.csv @@ -834,7 +834,7 @@ DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生 DocType: Opportunity,Walk In,走在 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock條目 DocType: Item,Inspection Criteria,檢驗標準 -apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,樹financial成本中心。 +apps/erpnext/erpnext/config/accounts.py +111,Tree of finanial Cost Centers.,樹finanial成本中心。 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,轉移 apps/erpnext/erpnext/public/js/setup_wizard.js +165,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,白 @@ -1225,7 +1225,7 @@ DocType: Employee External Work History,Total Experience,總經驗 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,包裝單（ S）已取消 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,從投資現金流 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費 -DocType: Material Request Item,Sales Order,銷售訂單號 +DocType: Material Request Item,Sales Order No,銷售訂單號 DocType: Item Group,Item Group Name,項目群組名稱 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,轉移製造材料 @@ -1580,7 +1580,7 @@ DocType: Journal Entry,Accounts Receivable,應收帳款 DocType: Address Template,This format is used if country specific format is not found,此格式用於如果找不到特定國家的格式 DocType: Production Order,Use Multi-Level BOM,採用多級物料清單 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目 -apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,樹financial帳戶。 +apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,樹finanial帳戶。 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目 From 883cc047016c98d2224fe672546a132febc6f6f5 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 21 Jan 2016 15:43:07 +0530 Subject: [PATCH 35/49] [fixes] compare attributes in lower case --- .../payment_gateway_account.js | 2 +- .../payment_gateway_account.json | 28 +----- .../payment_request/payment_request.js | 3 +- .../payment_request/payment_request.json | 38 ++------ .../payment_request/payment_request.py | 6 +- .../shopping_cart_settings.json | 95 ++++++++++++++++++- erpnext/templates/pages/order.html | 16 ++-- erpnext/templates/pages/order.py | 4 + 8 files changed, 119 insertions(+), 73 deletions(-) diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js index c9bdc9b80a..e1fe5a16a3 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js @@ -1,6 +1,6 @@ cur_frm.cscript.refresh = function(doc, dt, dn){ if(!doc.__islocal){ - var df = frappe.meta.get_docfield(doc.doctype, "gateway", doc.name); + var df = frappe.meta.get_docfield(doc.doctype, "payment_gateway", doc.name); df.read_only = 1; } } \ No newline at end of file diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json index 579c2c29b3..df8eaebed5 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json @@ -12,7 +12,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "gateway", + "fieldname": "payment_gateway", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -203,30 +203,6 @@ "search_index": 0, "set_only_once": 0, "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "payment_success_url", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Payment Success URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 } ], "hide_heading": 0, @@ -238,7 +214,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-01-18 03:53:50.534673", + "modified": "2016-01-21 11:32:10.311015", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Gateway Account", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index b519dee734..51ff50bb03 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -1,8 +1,7 @@ cur_frm.add_fetch("payment_gateway", "payment_account", "payment_account") -cur_frm.add_fetch("payment_gateway", "gateway", "gateway") +cur_frm.add_fetch("payment_gateway", "payment_gateway", "payment_gateway") cur_frm.add_fetch("payment_gateway", "message", "message") cur_frm.add_fetch("payment_gateway", "payment_url_message", "payment_url_message") -cur_frm.add_fetch("payment_gateway", "payment_success_url", "payment_success_url") frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){ if (frm.doc.reference_doctype) { diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 7655b5872e..bfd6442edf 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -183,13 +183,13 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "payment_gateway", + "fieldname": "payment_gateway_account", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Payment Gateway", + "label": "Payment Gateway Account", "length": 0, "no_copy": 0, "options": "Payment Gateway Account", @@ -204,30 +204,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "payment_success_url", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Payment Success URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -255,16 +231,16 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "gateway", + "fieldname": "payment_gateway", "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Gateway", + "label": "Payment Gateway", "length": 0, "no_copy": 0, - "options": "payment_gateway.gateway", + "options": "payment_gateway_account.payment_gateway", "permlevel": 0, "precision": "", "print_hide": 0, @@ -289,7 +265,7 @@ "label": "Payment Account", "length": 0, "no_copy": 0, - "options": "payment_gateway.payment_account", + "options": "payment_gateway_account.payment_account", "permlevel": 0, "precision": "", "print_hide": 0, @@ -603,7 +579,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-01-11 05:49:28.342786", + "modified": "2016-01-21 11:44:04.920584", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index ba7413d886..b1af6cc02f 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -12,8 +12,6 @@ from erpnext.accounts.utils import get_account_currency, get_balance_on from erpnext.accounts.doctype.journal_entry.journal_entry import (get_payment_entry_against_invoice, get_payment_entry_against_order) -from itertools import chain - class PaymentRequest(Document): def validate(self): self.validate_payment_gateway_account() @@ -207,11 +205,11 @@ def get_gateway_details(args): """return gateway and payment account of default payment gateway""" if args.payemnt_gateway: gateway_account = frappe.db.get_value("Payment Gateway Account", args.payemnt_gateway, - ["name", "gateway", "payment_account", "message", "payment_url_message", "payment_success_url"], + ["name", "payment_gateway", "payment_account", "message", "payment_url_message"], as_dict=1) gateway_account = frappe.db.get_value("Payment Gateway Account", {"is_default": 1}, - ["name", "gateway", "payment_account", "message", "payment_url_message", "payment_success_url"], + ["name", "payment_gateway", "payment_account", "message", "payment_url_message"], as_dict=1) if not gateway_account: diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json index fbc9ba0220..5b9dc32a2e 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json @@ -19,9 +19,11 @@ "in_filter": 0, "in_list_view": 1, "label": "Enable Shopping Cart", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -39,9 +41,11 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -60,10 +64,12 @@ "in_filter": 0, "in_list_view": 1, "label": "Company", + "length": 0, "no_copy": 0, "options": "Company", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -82,11 +88,13 @@ "in_filter": 0, "in_list_view": 0, "label": "Price List", + "length": 0, "no_copy": 0, "options": "Price List", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -104,9 +112,11 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -126,10 +136,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Default Customer Group", + "length": 0, "no_copy": 0, "options": "Customer Group", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -148,15 +160,92 @@ "in_filter": 0, "in_list_view": 0, "label": "Quotation Series", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.enable_checkout", + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Checkout Settings", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "enable_checkout", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Enable Checkout", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "default": "Orders", + "fieldname": "payment_success_url", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Payment Success Url", + "length": 0, + "no_copy": 0, + "options": "\nOrders\nInvoices\nMy Account", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 } ], "hide_heading": 0, @@ -168,7 +257,8 @@ "is_submittable": 0, "issingle": 1, "istable": 0, - "modified": "2015-09-17 07:56:09.176098", + "max_attachments": 0, + "modified": "2016-02-01 11:58:39.741582", "modified_by": "Administrator", "module": "Shopping Cart", "name": "Shopping Cart Settings", @@ -196,5 +286,6 @@ } ], "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "sort_order": "ASC" } \ No newline at end of file diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index fae55f3264..3252eb9eb5 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -82,14 +82,16 @@
- {% if (doc.doctype=="Sales Order" and doc.per_billed <= 0) - or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0) %} -
-

- Pay {{ doc.get_formatted("grand_total") }} -

+ {% if enabled_checkout %} + {% if (doc.doctype=="Sales Order" and doc.per_billed <= 0) + or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0) %} +
+

+ Pay {{ doc.get_formatted("grand_total") }} +

+ {% endif %} {% endif %}
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py index 4824d4403f..5cb3ff23dd 100644 --- a/erpnext/templates/pages/order.py +++ b/erpnext/templates/pages/order.py @@ -15,6 +15,10 @@ def get_context(context): context.parents = frappe.form_dict.parents context.payment_ref = frappe.db.get_value("Payment Request", {"reference_name": frappe.form_dict.name}, "name") + + context.enabled_checkout = frappe.get_doc("Shopping Cart Settings").enable_checkout + + print context.enabled_checkout if not context.doc.has_website_permission("read"): frappe.throw(_("Not Permitted"), frappe.PermissionError) From dca6302e157cb022ab4f6f73197de5f0d772914e Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 10 Feb 2016 12:33:44 +0530 Subject: [PATCH 36/49] [fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment --- .../doctype/journal_entry/journal_entry.py | 17 ++++--- .../payment_gateway_account.py | 4 +- .../payment_request/payment_request.json | 30 +++++++++-- .../payment_request/payment_request.py | 49 ++++++++++-------- erpnext/patches.txt | 2 +- .../shopping_cart_settings.json | 51 ++++++++++++++++++- .../templates/includes/cart/cart_address.html | 7 ++- .../templates/includes/cart/cart_macros.html | 9 +++- 8 files changed, 129 insertions(+), 40 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index afb9b85fb9..e910f54161 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -551,7 +551,7 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None, a } @frappe.whitelist() -def get_payment_entry_against_order(dt, dn, amount=None, journal_entry=False, bank_account=None): +def get_payment_entry_against_order(dt, dn, base_rounded_total=None, rounded_total=None, journal_entry=False, bank_account=None): ref_doc = frappe.get_doc(dt, dn) if flt(ref_doc.per_billed, 2) > 0: @@ -569,7 +569,7 @@ def get_payment_entry_against_order(dt, dn, amount=None, journal_entry=False, ba party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company) party_account_currency = get_account_currency(party_account) - if not amount: + if not base_rounded_total or not rounded_total: if party_account_currency == ref_doc.company_currency: amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) else: @@ -581,7 +581,8 @@ def get_payment_entry_against_order(dt, dn, amount=None, journal_entry=False, ba "party_account_currency": party_account_currency, "amount_field_party": amount_field_party, "amount_field_bank": amount_field_bank, - "amount": amount, + "amount": base_rounded_total or amount, + "rounded_total": rounded_total, "remarks": 'Advance Payment received against {0} {1}'.format(dt, dn), "is_advance": "Yes", "bank_account": bank_account, @@ -589,7 +590,7 @@ def get_payment_entry_against_order(dt, dn, amount=None, journal_entry=False, ba }) @frappe.whitelist() -def get_payment_entry_against_invoice(dt, dn, amount=None, journal_entry=False, bank_account=None): +def get_payment_entry_against_invoice(dt, dn, base_rounded_total=None, rounded_total=None, journal_entry=False, bank_account=None): ref_doc = frappe.get_doc(dt, dn) if dt == "Sales Invoice": party_type = "Customer" @@ -613,7 +614,8 @@ def get_payment_entry_against_invoice(dt, dn, amount=None, journal_entry=False, "party_account_currency": ref_doc.party_account_currency, "amount_field_party": amount_field_party, "amount_field_bank": amount_field_bank, - "amount": amount if amount else abs(ref_doc.outstanding_amount), + "amount": base_rounded_total if base_rounded_total else abs(ref_doc.outstanding_amount), + "rounded_total": rounded_total, "remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks), "is_advance": "No", "bank_account": bank_account, @@ -662,10 +664,11 @@ def get_payment_entry(ref_doc, args): bank_row.cost_center = cost_center + amount = args.get("rounded_total") or args.get("amount") if bank_row.account_currency == args.get("party_account_currency"): - bank_row.set(args.get("amount_field_bank"), args.get("amount")) + bank_row.set(args.get("amount_field_bank"), amount) else: - bank_row.set(args.get("amount_field_bank"), args.get("amount") * exchange_rate) + bank_row.set(args.get("amount_field_bank"), amount * exchange_rate) # set multi currency check if party_row.account_currency != ref_doc.company_currency \ diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py index 468f8778c4..fd213a47a1 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py @@ -8,7 +8,7 @@ from frappe.model.document import Document class PaymentGatewayAccount(Document): def autoname(self): - self.name = self.gateway + " - " + self.currency + self.name = self.payment_gateway + " - " + self.currency def validate(self): self.currency = frappe.db.get_value("Account", self.payment_account, "account_currency") @@ -24,4 +24,4 @@ class PaymentGatewayAccount(Document): def set_as_default_if_not_set(self): if not frappe.db.get_value("Payment Gateway Account", {"is_default": 1, "name": ("!=", self.name)}, "name"): - self.is_default = 1 + self.is_default = 1 diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index bfd6442edf..55c6524cf8 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -37,13 +37,13 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "amount", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Amount", + "label": "Base Rounded Total", "length": 0, "no_copy": 0, "permlevel": 0, @@ -57,6 +57,30 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "rounded_total", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Rounded Total", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -579,7 +603,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-01-21 11:44:04.920584", + "modified": "2016-02-09 21:15:55.153924", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index b1af6cc02f..588e436bfc 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -8,7 +8,7 @@ from frappe import _ from frappe.model.document import Document from frappe.utils import flt, nowdate, get_url, cstr from erpnext.accounts.party import get_party_account -from erpnext.accounts.utils import get_account_currency, get_balance_on +from erpnext.accounts.utils import get_balance_on from erpnext.accounts.doctype.journal_entry.journal_entry import (get_payment_entry_against_invoice, get_payment_entry_against_order) @@ -80,29 +80,27 @@ class PaymentRequest(Document): def create_journal_entry(self): """create entry""" - payment_details = { - "amount": self.amount, - "journal_entry": True, - "bank_account": self.payment_account - } - frappe.flags.ignore_account_permission = True if self.reference_doctype == "Sales Order": jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name,\ - amount=self.amount, journal_entry=True, bank_account=self.payment_account) + base_rounded_total=self.base_rounded_total, rounded_total= self.rounded_total,\ + journal_entry=True, bank_account=self.payment_account) if self.reference_doctype == "Sales Invoice": jv = get_payment_entry_against_invoice(self.reference_doctype, self.reference_name,\ - amount=self.amount, journal_entry=True, bank_account=self.payment_account) + base_rounded_total=self.base_rounded_total, rounded_total= self.rounded_total, \ + journal_entry=True, bank_account=self.payment_account) jv.update({ "voucher_type": "Journal Entry", "posting_date": nowdate() - }) + }) + + print jv.as_dict() jv.insert(ignore_permissions=True) jv.submit() - + #set status as paid for Payment Request frappe.db.set_value(self.doctype, self.name, "status", "Paid") @@ -148,20 +146,23 @@ def make_payment_request(**args): ref_doc = frappe.get_doc(args.dt, args.dn) gateway_account = get_gateway_details(args) + base_rounded_total, rounded_total = get_amount(ref_doc, args.dt) existing_payment_request = frappe.db.get_value("Payment Request", {"reference_doctype": args.dt, "reference_name": args.dn}) + if existing_payment_request: pr = frappe.get_doc("Payment Request", existing_payment_request) - else: + + else: pr = frappe.new_doc("Payment Request") - pr.update({ - "payment_gateway": gateway_account.name, - "gateway": gateway_account.gateway, + "payment_gateway_account": gateway_account.name, + "payment_gateway": gateway_account.payment_gateway, "payment_account": gateway_account.payment_account, "currency": ref_doc.currency, "make_sales_invoice": args.cart or 0, - "amount": get_amount(ref_doc, args.dt), + "base_rounded_total": base_rounded_total, + "rounded_total": rounded_total, "mute_email": args.mute_email or 0, "email_to": args.recipient_id or "", "subject": "Payment Request for %s"%args.dn, @@ -178,11 +179,12 @@ def make_payment_request(**args): if args.submit_doc: pr.insert(ignore_permissions=True) pr.submit() - + + if args.cart: generate_payment_request(pr.name) frappe.db.commit() - + if not args.cart: return pr @@ -191,13 +193,16 @@ def make_payment_request(**args): def get_amount(ref_doc, dt): """get amount based on doctype""" if dt == "Sales Order": - amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) + base_rounded_total = flt(ref_doc.base_grand_total) + rounded_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) if dt == "Sales Invoice": - amount = abs(ref_doc.outstanding_amount) + base_rounded_total = flt(ref_doc.base_grand_total) + rounded_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) - if amount > 0: - return amount + if base_rounded_total > 0 and rounded_total > 0 : + return base_rounded_total, rounded_total + else: frappe.throw(_("Payment Entry is already created")) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index e5ec4548d0..76bffc2de9 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -246,6 +246,6 @@ erpnext.patches.v6_16.update_billing_status_in_dn_and_pr erpnext.patches.v6_16.create_manufacturer_records execute:frappe.db.sql("update `tabPricing Rule` set title=name where title='' or title is null") #2016-01-27 erpnext.patches.v6_20.set_party_account_currency_in_orders -erpnext.patches.v6_19.comment_feed_communication +#erpnext.patches.v6_19.comment_feed_communication erpnext.patches.v6_21.fix_reorder_level erpnext.patches.v6_21.rename_material_request_fields diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json index 5b9dc32a2e..4c462c28db 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json @@ -226,6 +226,7 @@ "bold": 0, "collapsible": 0, "default": "Orders", + "description": "After payment completion redirect user to selected page.", "fieldname": "payment_success_url", "fieldtype": "Select", "hidden": 0, @@ -246,6 +247,54 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "column_break_11", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "payment_gateway_account", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Payment Gateway Account", + "length": 0, + "no_copy": 0, + "options": "Payment Gateway Account", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 } ], "hide_heading": 0, @@ -258,7 +307,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2016-02-01 11:58:39.741582", + "modified": "2016-02-09 15:45:03.389220", "modified_by": "Administrator", "module": "Shopping Cart", "name": "Shopping Cart Settings", diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html index 44964da47c..1af8f0bb48 100644 --- a/erpnext/templates/includes/cart/cart_address.html +++ b/erpnext/templates/includes/cart/cart_address.html @@ -1,12 +1,15 @@ {% from "erpnext/templates/includes/cart/cart_macros.html" import show_address %}
+ {% if addresses|length == 1%} + {% set select_address = True %} + {% endif %}

{{ _("Shipping Address") }}

{% for address in addresses %} - {{ show_address(address, doc, "shipping_address_name") }} + {{ show_address(address, doc, "shipping_address_name", select_address) }} {% endfor %}
@@ -17,7 +20,7 @@
{% for address in addresses %} - {{ show_address(address, doc, "customer_address") }} + {{ show_address(address, doc, "customer_address", select_address) }} {% endfor %}
diff --git a/erpnext/templates/includes/cart/cart_macros.html b/erpnext/templates/includes/cart/cart_macros.html index 250b487920..c77aa6aa50 100644 --- a/erpnext/templates/includes/cart/cart_macros.html +++ b/erpnext/templates/includes/cart/cart_macros.html @@ -1,5 +1,10 @@ -{% macro show_address(address, doc, fieldname) %} -{% set selected=address.name==doc.get(fieldname) %} +{% macro show_address(address, doc, fieldname, select_address=False) %} +{% if select_address %} + {% set selected=True %} +{% else %} + {% set selected=address.name==doc.get(fieldname) %} +{% endif %} +
From da9e9cdb13cc59223c11a74eb2df74353e8d1407 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 10 Feb 2016 17:53:58 +0530 Subject: [PATCH 37/49] [fixes] minor get_payment_gateway_account --- .../payment_request/payment_request.py | 19 +++++++++++++------ .../templates/includes/cart/cart_macros.html | 6 +----- erpnext/templates/pages/order.html | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 588e436bfc..2faa586f88 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -67,6 +67,7 @@ class PaymentRequest(Document): def send_payment_request(self): self.payment_url = get_url("/api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request?name={0}".format(self.name)) if self.payment_url: + frappe.db.set_value(self.doctype, self.name, "payment_url", self.payment_url) frappe.db.set_value(self.doctype, self.name, "status", "Initiated") def set_as_paid(self): @@ -114,6 +115,7 @@ class PaymentRequest(Document): def get_message(self): """return message with payment gateway link""" + print self.payment_url return cstr(self.message) + " {1}".format(self.payment_url, \ self.payment_url_message or _(" Click here to pay")) @@ -209,18 +211,23 @@ def get_amount(ref_doc, dt): def get_gateway_details(args): """return gateway and payment account of default payment gateway""" if args.payemnt_gateway: - gateway_account = frappe.db.get_value("Payment Gateway Account", args.payemnt_gateway, - ["name", "payment_gateway", "payment_account", "message", "payment_url_message"], - as_dict=1) + return get_payment_gateway_account(args.payemnt_gateway) + + if args.cart: + payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account + return get_payment_gateway_account(payment_gateway_account) - gateway_account = frappe.db.get_value("Payment Gateway Account", {"is_default": 1}, - ["name", "payment_gateway", "payment_account", "message", "payment_url_message"], - as_dict=1) + gateway_account = get_payment_gateway_account({"is_default": 1}) if not gateway_account: frappe.throw(_("Payment Gateway Account is not configured")) return gateway_account + +def get_payment_gateway_account(args): + return frappe.db.get_value("Payment Gateway Account", args, + ["name", "payment_gateway", "payment_account", "message", "payment_url_message"], + as_dict=1) @frappe.whitelist() def get_print_format_list(ref_doctype): diff --git a/erpnext/templates/includes/cart/cart_macros.html b/erpnext/templates/includes/cart/cart_macros.html index c77aa6aa50..fd95dba424 100644 --- a/erpnext/templates/includes/cart/cart_macros.html +++ b/erpnext/templates/includes/cart/cart_macros.html @@ -1,9 +1,5 @@ {% macro show_address(address, doc, fieldname, select_address=False) %} -{% if select_address %} - {% set selected=True %} -{% else %} - {% set selected=address.name==doc.get(fieldname) %} -{% endif %} +{% set selected=address.name==doc.get(fieldname) %}
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index 3252eb9eb5..03e625da1f 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -1,4 +1,4 @@ -{% extends "templates/web.html" %} +t{% extends "templates/web.html" %} {% block header %}

{{ doc.name }}

From 1e800a9ef0e1c734ebd4670e5a0a8b05ed859bd5 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 16 Feb 2016 16:55:51 +0530 Subject: [PATCH 38/49] [fixes] multi-currency via payment request --- .../doctype/journal_entry/journal_entry.py | 19 +++++++----- .../payment_request/payment_request.json | 8 ++--- .../payment_request/payment_request.py | 29 ++++++++++++++----- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index e910f54161..f11a16c640 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -551,7 +551,7 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None, a } @frappe.whitelist() -def get_payment_entry_against_order(dt, dn, base_rounded_total=None, rounded_total=None, journal_entry=False, bank_account=None): +def get_payment_entry_against_order(dt, dn, amount=None, debit_in_account_currency=None, journal_entry=False, bank_account=None): ref_doc = frappe.get_doc(dt, dn) if flt(ref_doc.per_billed, 2) > 0: @@ -569,7 +569,7 @@ def get_payment_entry_against_order(dt, dn, base_rounded_total=None, rounded_tot party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company) party_account_currency = get_account_currency(party_account) - if not base_rounded_total or not rounded_total: + if not amount: if party_account_currency == ref_doc.company_currency: amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) else: @@ -581,8 +581,8 @@ def get_payment_entry_against_order(dt, dn, base_rounded_total=None, rounded_tot "party_account_currency": party_account_currency, "amount_field_party": amount_field_party, "amount_field_bank": amount_field_bank, - "amount": base_rounded_total or amount, - "rounded_total": rounded_total, + "amount": amount, + "debit_in_account_currency": debit_in_account_currency, "remarks": 'Advance Payment received against {0} {1}'.format(dt, dn), "is_advance": "Yes", "bank_account": bank_account, @@ -590,7 +590,7 @@ def get_payment_entry_against_order(dt, dn, base_rounded_total=None, rounded_tot }) @frappe.whitelist() -def get_payment_entry_against_invoice(dt, dn, base_rounded_total=None, rounded_total=None, journal_entry=False, bank_account=None): +def get_payment_entry_against_invoice(dt, dn, amount=None, debit_in_account_currency=None, journal_entry=False, bank_account=None): ref_doc = frappe.get_doc(dt, dn) if dt == "Sales Invoice": party_type = "Customer" @@ -614,8 +614,8 @@ def get_payment_entry_against_invoice(dt, dn, base_rounded_total=None, rounded_t "party_account_currency": ref_doc.party_account_currency, "amount_field_party": amount_field_party, "amount_field_bank": amount_field_bank, - "amount": base_rounded_total if base_rounded_total else abs(ref_doc.outstanding_amount), - "rounded_total": rounded_total, + "amount": amount if amount else abs(ref_doc.outstanding_amount), + "debit_in_account_currency": debit_in_account_currency, "remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks), "is_advance": "No", "bank_account": bank_account, @@ -626,6 +626,8 @@ def get_payment_entry(ref_doc, args): cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center") exchange_rate = 1 if args.get("party_account"): + print "here..." + print args.get("party_account"), args.get("party_account_currency") exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"), ref_doc.company, ref_doc.doctype, ref_doc.name) @@ -664,7 +666,8 @@ def get_payment_entry(ref_doc, args): bank_row.cost_center = cost_center - amount = args.get("rounded_total") or args.get("amount") + amount = args.get("debit_in_account_currency") or args.get("amount") + if bank_row.account_currency == args.get("party_account_currency"): bank_row.set(args.get("amount_field_bank"), amount) else: diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 55c6524cf8..39330a59e7 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -62,7 +62,7 @@ "bold": 0, "collapsible": 0, "fieldname": "rounded_total", - "fieldtype": "Data", + "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -71,7 +71,7 @@ "length": 0, "no_copy": 0, "permlevel": 0, - "precision": "", + "precision": "2", "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, @@ -603,8 +603,8 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-09 21:15:55.153924", - "modified_by": "Administrator", + "modified": "2016-02-16 12:29:45.290729", + "modified_by": "saurabh@erpnext.com", "module": "Accounts", "name": "Payment Request", "name_case": "", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 2faa586f88..0115072a98 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -8,7 +8,7 @@ from frappe import _ from frappe.model.document import Document from frappe.utils import flt, nowdate, get_url, cstr from erpnext.accounts.party import get_party_account -from erpnext.accounts.utils import get_balance_on +from erpnext.accounts.utils import get_account_currency from erpnext.accounts.doctype.journal_entry.journal_entry import (get_payment_entry_against_invoice, get_payment_entry_against_order) @@ -82,16 +82,31 @@ class PaymentRequest(Document): def create_journal_entry(self): """create entry""" frappe.flags.ignore_account_permission = True + + ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name) + + party_account = get_party_account("Customer", ref_doc.get("customer"), ref_doc.company) + party_account_currency = get_account_currency(party_account) + + debit_in_account_currency = 0.0 + + if party_account_currency == ref_doc.company_currency: + amount = self.base_rounded_total + if self.currency != ref_doc.company_currency: + debit_in_account_currency = self.rounded_total + + else: + amount = self.rounded_total if self.reference_doctype == "Sales Order": - jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name,\ - base_rounded_total=self.base_rounded_total, rounded_total= self.rounded_total,\ - journal_entry=True, bank_account=self.payment_account) + jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name, + amount=amount, debit_in_account_currency=debit_in_account_currency , journal_entry=True, + bank_account=self.payment_account) if self.reference_doctype == "Sales Invoice": - jv = get_payment_entry_against_invoice(self.reference_doctype, self.reference_name,\ - base_rounded_total=self.base_rounded_total, rounded_total= self.rounded_total, \ - journal_entry=True, bank_account=self.payment_account) + jv = get_payment_entry_against_invoice(self.reference_doctype, self.reference_name, + amount=amount, debit_in_account_currency=debit_in_account_currency, journal_entry=True, + bank_account=self.payment_account) jv.update({ "voucher_type": "Journal Entry", From fa32588e72a8ef5130c66f9e1f3b119ef73dfcf7 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 18 Feb 2016 18:43:11 +0530 Subject: [PATCH 39/49] [fixes] minor fix in test-case --- .../accounts/doctype/payment_request/test_payment_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index 49c604a8c2..ad387cb18a 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -39,7 +39,7 @@ class TestPaymentRequest(unittest.TestCase): frappe.get_doc(payment_gateway).insert(ignore_permissions=True) for method in payment_method: - if not frappe.db.get_value("Payment Gateway Account", {"gateway": method["gateway"], + if not frappe.db.get_value("Payment Gateway Account", {"payment_gateway": method["gateway"], "currency": method["currency"]}, "name"): frappe.get_doc(method).insert(ignore_permissions=True) From 7d5b47e113fe504f62587f736b9d44b4a7ee122b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 18 Feb 2016 18:43:55 +0530 Subject: [PATCH 40/49] [fixes] minor fix in test-case --- .../doctype/payment_request/test_payment_request.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index ad387cb18a..8ef340da9d 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -21,13 +21,13 @@ payment_method = [ { "doctype": "Payment Gateway Account", "is_default": 1, - "gateway": "_Test Gateway", + "payment_gateway": "_Test Gateway", "payment_account": "_Test Bank - _TC", "currency": "INR" }, { "doctype": "Payment Gateway Account", - "gateway": "_Test Gateway", + "payment_gateway": "_Test Gateway", "payment_account": "_Test Bank USD - _TC", "currency": "USD" } @@ -39,7 +39,7 @@ class TestPaymentRequest(unittest.TestCase): frappe.get_doc(payment_gateway).insert(ignore_permissions=True) for method in payment_method: - if not frappe.db.get_value("Payment Gateway Account", {"payment_gateway": method["gateway"], + if not frappe.db.get_value("Payment Gateway Account", {"payment_gateway": method["payment_gateway"], "currency": method["currency"]}, "name"): frappe.get_doc(method).insert(ignore_permissions=True) From 2dc2d671da6891639213372d9f77dd3b27e0c304 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 19 Feb 2016 13:00:55 +0530 Subject: [PATCH 41/49] [clean-up] --- .../accounts/doctype/payment_request/payment_request.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 0115072a98..8418567e5f 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -47,14 +47,10 @@ class PaymentRequest(Document): def on_cancel(self): self.set_as_cancelled() - - def on_update_after_submit(self): - pass - - def set_status(self): - pass def get_payment_url(self): + """ This is blanck method to trigger hooks call from individual payment gateway app + which will return respective payment gateway""" pass def make_invoice(self): @@ -161,6 +157,7 @@ def make_payment_request(**args): args = frappe._dict(args) ref_doc = frappe.get_doc(args.dt, args.dn) + gateway_account = get_gateway_details(args) base_rounded_total, rounded_total = get_amount(ref_doc, args.dt) From 3a2682919a6f106c67653bcf26423b172aab7cea Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 22 Feb 2016 15:18:40 +0530 Subject: [PATCH 42/49] [enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable --- .../payment_request/payment_request.json | 115 +++++++++--------- .../payment_request/payment_request.py | 25 ++-- erpnext/accounts/utils.py | 14 +++ erpnext/shopping_cart/cart.py | 44 ++++++- .../shopping_cart_settings.js | 14 +++ 5 files changed, 143 insertions(+), 69 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 39330a59e7..14daba7f2f 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -33,54 +33,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "base_rounded_total", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Base Rounded Total", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "2", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "rounded_total", - "fieldtype": "Float", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Rounded Total", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "2", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -91,7 +43,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Currency", + "label": "Transaction Currency", "length": 0, "no_copy": 0, "options": "Currency", @@ -110,18 +62,44 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "eval:doc.reference_doctype==\"Sales Order\"", - "fieldname": "make_sales_invoice", - "fieldtype": "Check", + "description": "Amount in customer's currency", + "fieldname": "grand_total", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Make Sales Invoice", + "label": "Grand Total", + "length": 0, + "no_copy": 0, + "options": "currency", + "permlevel": 0, + "precision": "2", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "description": "Amount in company's currency", + "fieldname": "base_grand_total", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Base Grand Total", "length": 0, "no_copy": 0, "permlevel": 0, - "precision": "", + "precision": "2", "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, @@ -180,6 +158,31 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval:doc.reference_doctype==\"Sales Order\"", + "fieldname": "make_sales_invoice", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Make Sales Invoice", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -603,8 +606,8 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-16 12:29:45.290729", - "modified_by": "saurabh@erpnext.com", + "modified": "2016-02-19 16:19:55.933694", + "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", "name_case": "", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 8418567e5f..0ef6aa37fc 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -87,12 +87,12 @@ class PaymentRequest(Document): debit_in_account_currency = 0.0 if party_account_currency == ref_doc.company_currency: - amount = self.base_rounded_total + amount = self.base_grand_total if self.currency != ref_doc.company_currency: - debit_in_account_currency = self.rounded_total + debit_in_account_currency = self.grand_total else: - amount = self.rounded_total + amount = self.grand_total if self.reference_doctype == "Sales Order": jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name, @@ -160,7 +160,8 @@ def make_payment_request(**args): gateway_account = get_gateway_details(args) - base_rounded_total, rounded_total = get_amount(ref_doc, args.dt) + base_grand_total, grand_total = get_amount(ref_doc, args.dt) + existing_payment_request = frappe.db.get_value("Payment Request", {"reference_doctype": args.dt, "reference_name": args.dn}) @@ -175,8 +176,8 @@ def make_payment_request(**args): "payment_account": gateway_account.payment_account, "currency": ref_doc.currency, "make_sales_invoice": args.cart or 0, - "base_rounded_total": base_rounded_total, - "rounded_total": rounded_total, + "base_grand_total": base_grand_total, + "grand_total": grand_total, "mute_email": args.mute_email or 0, "email_to": args.recipient_id or "", "subject": "Payment Request for %s"%args.dn, @@ -207,15 +208,15 @@ def make_payment_request(**args): def get_amount(ref_doc, dt): """get amount based on doctype""" if dt == "Sales Order": - base_rounded_total = flt(ref_doc.base_grand_total) - rounded_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) + base_grand_total = flt(ref_doc.base_grand_total) + grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) if dt == "Sales Invoice": - base_rounded_total = flt(ref_doc.base_grand_total) - rounded_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) + base_grand_total = flt(ref_doc.base_grand_total) + grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) - if base_rounded_total > 0 and rounded_total > 0 : - return base_rounded_total, rounded_total + if base_grand_total > 0 and grand_total > 0 : + return base_grand_total, grand_total else: frappe.throw(_("Payment Entry is already created")) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index d59b179fd4..53a1b6a083 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -477,3 +477,17 @@ def get_outstanding_invoices(party_type, party, account, condition=None): }) return outstanding_invoices + + +def get_account(account_type=None, root_type=None, is_group=None, account_name=None): + """return account based on matching conditions""" + if account_name: + if not frappe.db.get_value("Account", {"account_name": account_name}): + return False + else: + return frappe.get_doc("Account", { + "account_type": account_type or '', + "root_type": root_type or '', + "is_group": is_group or 0, + "account_name": account_name or '' + }) \ No newline at end of file diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index 561a50cd72..b4df27dca2 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -9,6 +9,7 @@ from frappe.utils import cint, flt, get_fullname, cstr from erpnext.utilities.doctype.address.address import get_address_display from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings from frappe.utils.nestedset import get_root_of +from erpnext.accounts.utils import get_account class WebsitePriceListMissingError(frappe.ValidationError): pass @@ -280,7 +281,13 @@ def get_customer(user=None): user = frappe.session.user customer = frappe.db.get_value("Contact", {"email_id": user}, "customer") - + cart_settings = frappe.get_doc("Shopping Cart Settings") + + debtors_account = '' + + if cart_settings.enable_checkout: + debtors_account = get_debtors_account(cart_settings) + if customer: return frappe.get_doc("Customer", customer) @@ -293,6 +300,15 @@ def get_customer(user=None): "customer_group": get_shopping_cart_settings().default_customer_group, "territory": get_root_of("Territory") }) + + if debtors_account: + customer.update({ + "accounts": [{ + "company": cart_settings.company, + "account": debtors_account.name + }] + }) + customer.flags.ignore_mandatory = True customer.insert(ignore_permissions=True) @@ -307,6 +323,32 @@ def get_customer(user=None): return customer +def get_debtors_account(cart_settings): + payment_gateway_account_currency = \ + frappe.get_doc("Payment Gateway Account", cart_settings.payment_gateway_account).currency + + account_name = _("Debtors ({0})".format(payment_gateway_account_currency)) + + debtors_account = get_account("Receivable", "Asset", is_group=0, account_name=account_name) + + if not debtors_account: + debtors_account = frappe.get_doc({ + "doctype": "Account", + "account_type": "Receivable", + "root_type": "Asset", + "is_group": 0, + "parent_account": get_account(root_type="Asset", is_group=1, \ + account_name=_("Accounts Receivable")).name, + "account_name": account_name, + "currency": payment_gateway_account_currency + }).insert(ignore_permissions=True) + + return debtors_account + + else: + return debtors_account + + def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None): if not party: party = get_customer() diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js index 550e34d504..3219d7a5cd 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js @@ -6,5 +6,19 @@ $.extend(cur_frm.cscript, { if(cur_frm.doc.__onload && cur_frm.doc.__onload.quotation_series) { cur_frm.fields_dict.quotation_series.df.options = cur_frm.doc.__onload.quotation_series; } + }, + refresh: function(){ + toggle_mandatory(cur_frm) + }, + enable_checkout: function(){ + toggle_mandatory(cur_frm) } }); + + +function toggle_mandatory (cur_frm){ + cur_frm.toggle_reqd("payment_gateway_account", false); + if(cur_frm.doc.enabled && cur_frm.doc.enable_checkout) { + cur_frm.toggle_reqd("payment_gateway_account", true); + } +} From 1864879b9136f0ccfdbf8df31960a946d479cad2 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 22 Feb 2016 20:35:16 +0530 Subject: [PATCH 43/49] [fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button --- .../payment_request/payment_request.js | 24 ++++++++++--------- .../payment_request/payment_request.py | 4 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index 51ff50bb03..1f0e9bc9a1 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -16,18 +16,20 @@ frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){ }) frappe.ui.form.on("Payment Request", "refresh", function(frm) { - frm.add_custom_button(__('Resend Payment Email'), function(){ - frappe.call({ - method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email", - args: {"docname": frm.doc.name}, - freeze: true, - freeze_message: __("Sending"), - callback: function(r){ - if(!r.exc) { - frappe.msgprint(__("Message Sent")); + if(!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal){ + frm.add_custom_button(__('Resend Payment Email'), function(){ + frappe.call({ + method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email", + args: {"docname": frm.doc.name}, + freeze: true, + freeze_message: __("Sending"), + callback: function(r){ + if(!r.exc) { + frappe.msgprint(__("Message Sent")); + } } - } + }); }); - }); + } }); diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 0ef6aa37fc..92ffc223bf 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -209,11 +209,11 @@ def get_amount(ref_doc, dt): """get amount based on doctype""" if dt == "Sales Order": base_grand_total = flt(ref_doc.base_grand_total) - grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) + grand_total = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) / flt(ref_doc.conversion_rate) if dt == "Sales Invoice": base_grand_total = flt(ref_doc.base_grand_total) - grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) + grand_total = flt(ref_doc.base_grand_total) - flt(ref_doc.outstanding_amount) / flt(ref_doc.conversion_rate) if base_grand_total > 0 and grand_total > 0 : return base_grand_total, grand_total From f54be2c7f089adf806c3ec4aa6ea65c7f0cc733a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 23 Feb 2016 12:07:20 +0530 Subject: [PATCH 44/49] [fixes] test case fixes for multi-currency check --- .../doctype/journal_entry/journal_entry.py | 2 -- .../doctype/payment_request/payment_request.py | 10 ++++------ .../payment_request/test_payment_request.py | 16 ++++++++++++++-- erpnext/templates/pages/order.py | 4 +--- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index f11a16c640..ca7cb7edc4 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -626,8 +626,6 @@ def get_payment_entry(ref_doc, args): cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center") exchange_rate = 1 if args.get("party_account"): - print "here..." - print args.get("party_account"), args.get("party_account_currency") exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"), ref_doc.company, ref_doc.doctype, ref_doc.name) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 92ffc223bf..5b76907d00 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -33,7 +33,7 @@ class PaymentRequest(Document): frappe.throw(_("Payment Gateway Account is not configured")) def validate_payment_gateway(self): - if self.gateway == "PayPal": + if self.payment_gateway == "PayPal": if not frappe.db.get_value("PayPal Settings", None, "api_username"): if not frappe.conf.paypal_username: frappe.throw(_("PayPal Settings missing")) @@ -109,7 +109,6 @@ class PaymentRequest(Document): "posting_date": nowdate() }) - print jv.as_dict() jv.insert(ignore_permissions=True) jv.submit() @@ -126,7 +125,6 @@ class PaymentRequest(Document): def get_message(self): """return message with payment gateway link""" - print self.payment_url return cstr(self.message) + " {1}".format(self.payment_url, \ self.payment_url_message or _(" Click here to pay")) @@ -209,11 +207,11 @@ def get_amount(ref_doc, dt): """get amount based on doctype""" if dt == "Sales Order": base_grand_total = flt(ref_doc.base_grand_total) - grand_total = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) / flt(ref_doc.conversion_rate) - + grand_total = (flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)) / flt(ref_doc.conversion_rate, 2) + if dt == "Sales Invoice": base_grand_total = flt(ref_doc.base_grand_total) - grand_total = flt(ref_doc.base_grand_total) - flt(ref_doc.outstanding_amount) / flt(ref_doc.conversion_rate) + grand_total = (flt(ref_doc.base_grand_total) - flt(ref_doc.outstanding_amount)) / flt(ref_doc.conversion_rate, 2) if base_grand_total > 0 and grand_total > 0 : return base_grand_total, grand_total diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index 8ef340da9d..b041aa1ffd 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe import unittest from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order -from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request +from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request, get_gateway_details from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice # test_records = frappe.get_test_records('Payment Request') @@ -74,6 +74,18 @@ class TestPaymentRequest(unittest.TestCase): pr = make_payment_request(dt="Sales Invoice", dn=SI_USD.name, recipient_id="saurabh@erpnext.com", mute_email=1, return_doc=1, payemnt_gateway="_Test Gateway - USD") - self.assertRaises(frappe.ValidationError, pr.save) + jv = pr.set_as_paid() + + payemnt_gateway_details = get_gateway_details({"payemnt_gateway": "_Test Gateway - USD"}) + + accounts = jv.accounts.as_dict() + + self.assertEquals(accounts[0].account, "_Test Receivable USD - _TC") + self.assertEquals(accounts[0].account, payemnt_gateway_details.payment_account) + + + + + diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py index 5cb3ff23dd..bf1514ac2b 100644 --- a/erpnext/templates/pages/order.py +++ b/erpnext/templates/pages/order.py @@ -17,8 +17,6 @@ def get_context(context): {"reference_name": frappe.form_dict.name}, "name") context.enabled_checkout = frappe.get_doc("Shopping Cart Settings").enable_checkout - - print context.enabled_checkout - + if not context.doc.has_website_permission("read"): frappe.throw(_("Not Permitted"), frappe.PermissionError) From 4a6bbf9b723c12753bcc1ce48377ec578253bd83 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 23 Feb 2016 20:01:04 +0530 Subject: [PATCH 45/49] [fixes] added filters company and currency to get account, removed account name wise comparison --- erpnext/accounts/utils.py | 20 +++++++++----------- erpnext/shopping_cart/cart.py | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 53a1b6a083..36ff1ab72c 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -479,15 +479,13 @@ def get_outstanding_invoices(party_type, party, account, condition=None): return outstanding_invoices -def get_account(account_type=None, root_type=None, is_group=None, account_name=None): +def get_account(account_type=None, root_type=None, is_group=None, account_currency=None, company=None): """return account based on matching conditions""" - if account_name: - if not frappe.db.get_value("Account", {"account_name": account_name}): - return False - else: - return frappe.get_doc("Account", { - "account_type": account_type or '', - "root_type": root_type or '', - "is_group": is_group or 0, - "account_name": account_name or '' - }) \ No newline at end of file + return frappe.db.get_value("Account", { + "account_type": account_type or '', + "root_type": root_type or '', + "is_group": is_group or 0, + "account_currency": account_currency or frappe.defaults.get_defaults().currency, + "company": company or frappe.defaults.get_defaults().company + }, "name") + \ No newline at end of file diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index b4df27dca2..012aaf7750 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -329,7 +329,8 @@ def get_debtors_account(cart_settings): account_name = _("Debtors ({0})".format(payment_gateway_account_currency)) - debtors_account = get_account("Receivable", "Asset", is_group=0, account_name=account_name) + debtors_account = get_account("Receivable", "Asset", is_group=0,\ + account_currency=payment_gateway_account_currency, company=cart_settings.company) if not debtors_account: debtors_account = frappe.get_doc({ @@ -337,8 +338,7 @@ def get_debtors_account(cart_settings): "account_type": "Receivable", "root_type": "Asset", "is_group": 0, - "parent_account": get_account(root_type="Asset", is_group=1, \ - account_name=_("Accounts Receivable")).name, + "parent_account": get_account(root_type="Asset", is_group=1, company=cart_settings.company), "account_name": account_name, "currency": payment_gateway_account_currency }).insert(ignore_permissions=True) From 6d1dbd6384d0aaf81cc12774a227ce5b9f679815 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 24 Feb 2016 12:43:22 +0530 Subject: [PATCH 46/49] [fixes] currency exchange rate and payment gateway account fixes for multicurrency --- .../payment_request/payment_request.py | 16 ++-- .../payment_request/test_payment_request.py | 73 +++++++++---------- 2 files changed, 43 insertions(+), 46 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 5b76907d00..86aeba30bd 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -83,23 +83,23 @@ class PaymentRequest(Document): party_account = get_party_account("Customer", ref_doc.get("customer"), ref_doc.company) party_account_currency = get_account_currency(party_account) - + debit_in_account_currency = 0.0 - + if party_account_currency == ref_doc.company_currency: amount = self.base_grand_total if self.currency != ref_doc.company_currency: debit_in_account_currency = self.grand_total else: - amount = self.grand_total + amount = debit_in_account_currency = self.grand_total if self.reference_doctype == "Sales Order": jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name, amount=amount, debit_in_account_currency=debit_in_account_currency , journal_entry=True, bank_account=self.payment_account) - if self.reference_doctype == "Sales Invoice": + if self.reference_doctype == "Sales Invoice": jv = get_payment_entry_against_invoice(self.reference_doctype, self.reference_name, amount=amount, debit_in_account_currency=debit_in_account_currency, journal_entry=True, bank_account=self.payment_account) @@ -211,8 +211,8 @@ def get_amount(ref_doc, dt): if dt == "Sales Invoice": base_grand_total = flt(ref_doc.base_grand_total) - grand_total = (flt(ref_doc.base_grand_total) - flt(ref_doc.outstanding_amount)) / flt(ref_doc.conversion_rate, 2) - + grand_total = flt(ref_doc.outstanding_amount) + if base_grand_total > 0 and grand_total > 0 : return base_grand_total, grand_total @@ -221,8 +221,8 @@ def get_amount(ref_doc, dt): def get_gateway_details(args): """return gateway and payment account of default payment gateway""" - if args.payemnt_gateway: - return get_payment_gateway_account(args.payemnt_gateway) + if args.get("payment_gateway"): + return get_payment_gateway_account(args.get("payment_gateway")) if args.cart: payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index b041aa1ffd..eb8e55875c 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -8,6 +8,7 @@ import unittest from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request, get_gateway_details from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice +from erpnext.setup.utils import get_exchange_rate # test_records = frappe.get_test_records('Payment Request') test_dependencies = ["Currency Exchange", "Journal Entry", "Contact", "Address"] @@ -44,48 +45,44 @@ class TestPaymentRequest(unittest.TestCase): frappe.get_doc(method).insert(ignore_permissions=True) def test_payment_request_linkings(self): - SO_INR = make_sales_order(currency="INR") - pr = make_payment_request(dt="Sales Order", dn=SO_INR.name, recipient_id="saurabh@erpnext.com") - + so_inr = make_sales_order(currency="INR") + pr = make_payment_request(dt="Sales Order", dn=so_inr.name, recipient_id="saurabh@erpnext.com") + self.assertEquals(pr.reference_doctype, "Sales Order") - self.assertEquals(pr.reference_name, SO_INR.name) + self.assertEquals(pr.reference_name, so_inr.name) self.assertEquals(pr.currency, "INR") - - SI_USD = create_sales_invoice(currency="USD", conversion_rate=50) - pr = make_payment_request(dt="Sales Invoice", dn=SI_USD.name, recipient_id="saurabh@erpnext.com") + + conversion_rate = get_exchange_rate("USD", "INR") + + si_usd = create_sales_invoice(currency="USD", conversion_rate=conversion_rate) + pr = make_payment_request(dt="Sales Invoice", dn=si_usd.name, recipient_id="saurabh@erpnext.com") self.assertEquals(pr.reference_doctype, "Sales Invoice") - self.assertEquals(pr.reference_name, SI_USD.name) + self.assertEquals(pr.reference_name, si_usd.name) self.assertEquals(pr.currency, "USD") - - def test_payment_entry(self): - SO_INR = make_sales_order(currency="INR") - pr = make_payment_request(dt="Sales Order", dn=SO_INR.name, recipient_id="saurabh@erpnext.com", - mute_email=1, submit_doc=1) - jv = pr.set_as_paid() - - SO_INR = frappe.get_doc("Sales Order", SO_INR.name) - - self.assertEquals(SO_INR.advance_paid, jv.total_debit) - - SI_USD = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC", - currency="USD", conversion_rate=50) - pr = make_payment_request(dt="Sales Invoice", dn=SI_USD.name, recipient_id="saurabh@erpnext.com", - mute_email=1, return_doc=1, payemnt_gateway="_Test Gateway - USD") - + def test_payment_entry(self): + so_inr = make_sales_order(currency="INR") + pr = make_payment_request(dt="Sales Order", dn=so_inr.name, recipient_id="saurabh@erpnext.com", + mute_email=1, submit_doc=1) jv = pr.set_as_paid() - - payemnt_gateway_details = get_gateway_details({"payemnt_gateway": "_Test Gateway - USD"}) - - accounts = jv.accounts.as_dict() - - self.assertEquals(accounts[0].account, "_Test Receivable USD - _TC") - self.assertEquals(accounts[0].account, payemnt_gateway_details.payment_account) - - - - - - - + + so_inr = frappe.get_doc("Sales Order", so_inr.name) + + self.assertEquals(so_inr.advance_paid, jv.total_debit) + + conversion_rate = get_exchange_rate("USD", "INR") + + si_usd = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC", + currency="USD", conversion_rate=conversion_rate) + + pr = make_payment_request(dt="Sales Invoice", dn=si_usd.name, recipient_id="saurabh@erpnext.com", + mute_email=1, return_doc=1, payment_gateway="_Test Gateway - USD") + + jv = pr.set_as_paid() + + payment_gateway_details = get_gateway_details({"payment_gateway": "_Test Gateway - USD"}) + + self.assertEquals(jv.accounts[0].account, "_Test Receivable USD - _TC") + self.assertEquals(jv.accounts[1].account, payment_gateway_details.payment_account) + \ No newline at end of file From 00212a23e16549c31cccee6aa2cb264b94f70e07 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 24 Feb 2016 16:50:19 +0530 Subject: [PATCH 47/49] [fixes] removed base_grand_total from payment request --- .../payment_request/payment_request.json | 50 +++++++++---------- .../payment_request/payment_request.py | 16 +++--- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 14daba7f2f..e916034d29 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payment Details", @@ -41,6 +42,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Transaction Currency", @@ -67,6 +69,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Grand Total", @@ -84,31 +87,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "description": "Amount in company's currency", - "fieldname": "base_grand_total", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Base Grand Total", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "2", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -117,6 +95,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -141,6 +120,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Status", @@ -167,6 +147,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Make Sales Invoice", @@ -191,6 +172,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -214,6 +196,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payment Gateway Account", @@ -239,6 +222,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -262,6 +246,7 @@ "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payment Gateway", @@ -287,6 +272,7 @@ "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payment Account", @@ -312,6 +298,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Recipient and Message", @@ -337,6 +324,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Print Format", @@ -362,6 +350,7 @@ "fieldtype": "Check", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Mute Email", @@ -386,6 +375,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Email To", @@ -410,6 +400,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Subject", @@ -434,6 +425,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Message", @@ -458,6 +450,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Payment URL Message", @@ -482,6 +475,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "payment_url", @@ -506,6 +500,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference Details", @@ -530,6 +525,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference Doctype", @@ -555,6 +551,7 @@ "fieldtype": "Dynamic Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference Name", @@ -580,6 +577,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -606,7 +604,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-19 16:19:55.933694", + "modified": "2016-02-24 16:49:46.832403", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 86aeba30bd..bd4cc4d622 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -87,7 +87,10 @@ class PaymentRequest(Document): debit_in_account_currency = 0.0 if party_account_currency == ref_doc.company_currency: - amount = self.base_grand_total + amount = flt(flt(self.grand_total) * \ + flt(ref_doc.conversion_rate, ref_doc.precision("conversion_rate")), \ + ref_doc.precision("base_grand_total")) + if self.currency != ref_doc.company_currency: debit_in_account_currency = self.grand_total @@ -158,7 +161,7 @@ def make_payment_request(**args): gateway_account = get_gateway_details(args) - base_grand_total, grand_total = get_amount(ref_doc, args.dt) + grand_total = get_amount(ref_doc, args.dt) existing_payment_request = frappe.db.get_value("Payment Request", {"reference_doctype": args.dt, "reference_name": args.dn}) @@ -174,7 +177,6 @@ def make_payment_request(**args): "payment_account": gateway_account.payment_account, "currency": ref_doc.currency, "make_sales_invoice": args.cart or 0, - "base_grand_total": base_grand_total, "grand_total": grand_total, "mute_email": args.mute_email or 0, "email_to": args.recipient_id or "", @@ -206,15 +208,13 @@ def make_payment_request(**args): def get_amount(ref_doc, dt): """get amount based on doctype""" if dt == "Sales Order": - base_grand_total = flt(ref_doc.base_grand_total) - grand_total = (flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)) / flt(ref_doc.conversion_rate, 2) + grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) if dt == "Sales Invoice": - base_grand_total = flt(ref_doc.base_grand_total) grand_total = flt(ref_doc.outstanding_amount) - if base_grand_total > 0 and grand_total > 0 : - return base_grand_total, grand_total + if grand_total > 0 : + return grand_total else: frappe.throw(_("Payment Entry is already created")) From 40505dcfb1c121a00899cfacb4134eb7c515d911 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 24 Feb 2016 18:17:04 +0530 Subject: [PATCH 48/49] [change-log] --- erpnext/change_log/v6/v6_23_0.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 erpnext/change_log/v6/v6_23_0.md diff --git a/erpnext/change_log/v6/v6_23_0.md b/erpnext/change_log/v6/v6_23_0.md new file mode 100644 index 0000000000..d6f48a7d21 --- /dev/null +++ b/erpnext/change_log/v6/v6_23_0.md @@ -0,0 +1,10 @@ +- Material Request for manufacturing, plan production based on Material Request via Production Planning Tool +- Merged **STOP** and **Close** button to a single button **Close** +- Reorder level can be set as zero +- Added Stock balance in Quotation Item table +- **Payment Request and Payment Gateway** + - Create Payment Request from Sales Order / Sales Invoice + - Install paypal_integration application and setup as a Payment Gateway + - Give link of PayPal payment page to your customer + - On sucessful payment, system will create payment entry automatically and update Payment Request status + - Payment option in shopping cart \ No newline at end of file From ed08e88de43709b35cb55dac9d655dcb1f9d0ffc Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 24 Feb 2016 18:49:22 +0600 Subject: [PATCH 49/49] bumped to version 6.23.0 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 4b507476c9..5967305ca3 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.22.1' +__version__ = '6.23.0' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index d77c0f7f05..5645981791 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.22.1" +app_version = "6.23.0" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 885d74bcfd..cfbc311635 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.22.1" +version = "6.23.0" requirements = parse_requirements("requirements.txt", session="") setup(
'; - - // main table - out +=''; - - // add rows - if(cl.length){ - prevdoc_list = new Array(); - for(var i=0;i Date: Wed, 3 Feb 2016 18:33:43 +0530 Subject: [PATCH 21/49] Rename sales_order_no to sales_order in Material Request Item --- .../models/stock/material_request_item.html | 407 ++++++++++++++++++ .../production_planning_tool.py | 2 +- erpnext/patches.txt | 1 + erpnext/patches/v6_21/__init__.py | 1 + .../v6_21/rename_material_request_fields.py | 11 + .../doctype/sales_order/sales_order.py | 6 +- ...pending_so_items_for_purchase_request.json | 2 +- .../material_request/material_request.py | 16 +- .../material_request_item.json | 6 +- erpnext/translations/ar.csv | 2 +- erpnext/translations/bg.csv | 2 +- erpnext/translations/bn.csv | 2 +- erpnext/translations/bs.csv | 2 +- erpnext/translations/ca.csv | 2 +- erpnext/translations/cs.csv | 2 +- erpnext/translations/da-DK.csv | 2 +- erpnext/translations/da.csv | 2 +- erpnext/translations/de.csv | 2 +- erpnext/translations/el.csv | 2 +- erpnext/translations/es-PE.csv | 2 +- erpnext/translations/es.csv | 2 +- erpnext/translations/et.csv | 2 +- erpnext/translations/fa.csv | 2 +- erpnext/translations/fi.csv | 2 +- erpnext/translations/fr.csv | 2 +- erpnext/translations/gu.csv | 2 +- erpnext/translations/he.csv | 2 +- erpnext/translations/hi.csv | 2 +- erpnext/translations/hr.csv | 2 +- erpnext/translations/hu.csv | 2 +- erpnext/translations/id.csv | 2 +- erpnext/translations/it.csv | 2 +- erpnext/translations/ja.csv | 2 +- erpnext/translations/km.csv | 2 +- erpnext/translations/kn.csv | 2 +- erpnext/translations/ko.csv | 2 +- erpnext/translations/lv.csv | 2 +- erpnext/translations/mk.csv | 2 +- erpnext/translations/ml.csv | 2 +- erpnext/translations/mr.csv | 2 +- erpnext/translations/ms.csv | 2 +- erpnext/translations/my.csv | 2 +- erpnext/translations/nl.csv | 2 +- erpnext/translations/no.csv | 2 +- erpnext/translations/pl.csv | 4 +- erpnext/translations/pt-BR.csv | 2 +- erpnext/translations/pt.csv | 2 +- erpnext/translations/ro.csv | 2 +- erpnext/translations/ru.csv | 2 +- erpnext/translations/sk.csv | 2 +- erpnext/translations/sl.csv | 2 +- erpnext/translations/sq.csv | 2 +- erpnext/translations/sr.csv | 2 +- erpnext/translations/sv.csv | 2 +- erpnext/translations/ta.csv | 2 +- erpnext/translations/te.csv | 2 +- erpnext/translations/th.csv | 2 +- erpnext/translations/tr.csv | 4 +- erpnext/translations/uk.csv | 2 +- erpnext/translations/ur.csv | 2 +- erpnext/translations/vi.csv | 2 +- erpnext/translations/zh-cn.csv | 2 +- erpnext/translations/zh-tw.csv | 2 +- 63 files changed, 492 insertions(+), 72 deletions(-) create mode 100644 erpnext/docs/current/models/stock/material_request_item.html create mode 100644 erpnext/patches/v6_21/rename_material_request_fields.py diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html new file mode 100644 index 0000000000..2988065b2a --- /dev/null +++ b/erpnext/docs/current/models/stock/material_request_item.html @@ -0,0 +1,407 @@ + + + + + + +
+ + + Version 6.x.x + + + Source + +
+ + +Child Table + + +

Table Name: tabMaterial Request Item

+ + + + +

Fields

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SrFieldnameTypeLabelOptions
1item_code + Link + Item Code + + + + + + +Item + + + +
2col_break1 + Column Break + + +
3item_name + Data + Item Name + +
4section_break_4 + Section Break + Description + +
5description + Text Editor + Description + +
6column_break_6 + Column Break + + +
7image + Attach + Image + +
8image_view + Image + Image View + + + 
image
+
9quantity_and_warehouse + Section Break + Quantity and Warehouse + +
10qty + Float + Quantity + +
11uom + Link + Stock UOM + + + + + + +UOM + + + +
12warehouse + Link + For Warehouse + + + + + + +Warehouse + + + +
13col_break2 + Column Break + + +
14schedule_date + Date + Required Date + +
15more_info + Section Break + More Information + +
16item_group + Link + Item Group + + + + + + +Item Group + + + +
17brand + Link + Brand + + + + + + +Brand + + + +
18lead_time_date + Date + Lead Time Date + +
19sales_order + Link + Sales Order + + + + + + +Sales Order + + + +
20col_break3 + Column Break + + +
21min_order_qty + Float + Min Order Qty + +
22projected_qty + Float + Projected Qty + +
23ordered_qty + Float + Completed Qty + +
24page_break + Check + Page Break + +
+ + + + +

Child Table Of

+ + + + + + + \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index 46396ba103..67eab40ddc 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -383,7 +383,7 @@ class ProductionPlanningTool(Document): "qty": requested_qty, "schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)), "warehouse": self.purchase_request_for_warehouse, - "sales_order_no": sales_order if sales_order!="No Sales Order" else None + "sales_order": sales_order if sales_order!="No Sales Order" else None }) pr_doc.flags.ignore_permissions = 1 diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 2239f0a48d..e5ec4548d0 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -248,3 +248,4 @@ execute:frappe.db.sql("update `tabPricing Rule` set title=name where title='' or erpnext.patches.v6_20.set_party_account_currency_in_orders erpnext.patches.v6_19.comment_feed_communication erpnext.patches.v6_21.fix_reorder_level +erpnext.patches.v6_21.rename_material_request_fields diff --git a/erpnext/patches/v6_21/__init__.py b/erpnext/patches/v6_21/__init__.py index e69de29bb2..baffc48825 100644 --- a/erpnext/patches/v6_21/__init__.py +++ b/erpnext/patches/v6_21/__init__.py @@ -0,0 +1 @@ +from __future__ import unicode_literals diff --git a/erpnext/patches/v6_21/rename_material_request_fields.py b/erpnext/patches/v6_21/rename_material_request_fields.py new file mode 100644 index 0000000000..a65b2eb26e --- /dev/null +++ b/erpnext/patches/v6_21/rename_material_request_fields.py @@ -0,0 +1,11 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.utils.rename_field import rename_field + +def execute(): + frappe.reload_doc('Stock', 'doctype', 'material_request_item') + rename_field("Material Request Item", "sales_order", "sales_order") + \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index e692d6bb0e..bafdb34ecc 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -353,7 +353,7 @@ def make_material_request(source_name, target_doc=None): item_table: { "doctype": "Material Request Item", "field_map": { - "parent": "sales_order_no", + "parent": "sales_order", "stock_uom": "uom" } } @@ -471,7 +471,7 @@ def make_maintenance_schedule(source_name, target_doc=None): "Sales Order": { "doctype": "Maintenance Schedule", "field_map": { - "name": "sales_order_no" + "name": "sales_order" }, "validation": { "docstatus": ["=", 1] @@ -500,7 +500,7 @@ def make_maintenance_visit(source_name, target_doc=None): "Sales Order": { "doctype": "Maintenance Visit", "field_map": { - "name": "sales_order_no" + "name": "sales_order" }, "validation": { "docstatus": ["=", 1] diff --git a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json index 6d431faa21..6b19b6394b 100644 --- a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json +++ b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json @@ -12,7 +12,7 @@ "module": "Selling", "name": "Pending SO Items For Purchase Request", "owner": "Administrator", - "query": "select so_item.item_code as \"Item Code:Link/Item:120\",\n so_item.item_name as \"Item Name::120\",\n so_item.description as \"Description::120\",\n so.`name` as \"S.O. No.:Link/Sales Order:120\",\n so.`transaction_date` as \"Date:Date:120\",\n mr.name as \"Material Request:Link/Material Request:120\",\n so.customer as \"Customer:Link/Customer:120\",\n so.territory as \"Terretory:Link/Territory:120\",\n sum(so_item.qty) as \"SO Qty:Float:100 \",\n sum(mr_item.qty) as \"Requested Qty:Float:100\",\n sum(so_item.qty) - sum(mr_item.qty) as \"Pending Qty:Float:100 \", \n so.company as \"Company:Link/Company:\"\nfrom\n `tabSales Order` so, `tabSales Order Item` so_item, \n `tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere \n so_item.`parent` = so.`name` \n and mr_item.parent = mr.name\n and mr_item.sales_order_no = so.name\n and mr_item.item_code = so_item.item_code\n and so.docstatus = 1 and so.status != \"Stopped\" \n and mr.docstatus = 1 and mr.status != \"Stopped\"\ngroup by so.name, so_item.item_code\nhaving sum(so_item.qty) > sum(mr_item.qty)\norder by so.name desc, so_item.item_code asc", + "query": "select so_item.item_code as \"Item Code:Link/Item:120\",\n so_item.item_name as \"Item Name::120\",\n so_item.description as \"Description::120\",\n so.`name` as \"S.O. No.:Link/Sales Order:120\",\n so.`transaction_date` as \"Date:Date:120\",\n mr.name as \"Material Request:Link/Material Request:120\",\n so.customer as \"Customer:Link/Customer:120\",\n so.territory as \"Terretory:Link/Territory:120\",\n sum(so_item.qty) as \"SO Qty:Float:100 \",\n sum(mr_item.qty) as \"Requested Qty:Float:100\",\n sum(so_item.qty) - sum(mr_item.qty) as \"Pending Qty:Float:100 \", \n so.company as \"Company:Link/Company:\"\nfrom\n `tabSales Order` so, `tabSales Order Item` so_item, \n `tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere \n so_item.`parent` = so.`name` \n and mr_item.parent = mr.name\n and mr_item.sales_order = so.name\n and mr_item.item_code = so_item.item_code\n and so.docstatus = 1 and so.status != \"Stopped\" \n and mr.docstatus = 1 and mr.status != \"Stopped\"\ngroup by so.name, so_item.item_code\nhaving sum(so_item.qty) > sum(mr_item.qty)\norder by so.name desc, so_item.item_code asc", "ref_doctype": "Sales Order", "report_name": "Pending SO Items For Purchase Request", "report_type": "Query Report" diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index c6c6fe5a6a..f7dee98b3b 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -29,20 +29,20 @@ class MaterialRequest(BuyingController): def validate_qty_against_so(self): so_items = {} # Format --> {'SO/00001': {'Item/001': 120, 'Item/002': 24}} for d in self.get('items'): - if d.sales_order_no: - if not so_items.has_key(d.sales_order_no): - so_items[d.sales_order_no] = {d.item_code: flt(d.qty)} + if d.sales_order: + if not so_items.has_key(d.sales_order): + so_items[d.sales_order] = {d.item_code: flt(d.qty)} else: - if not so_items[d.sales_order_no].has_key(d.item_code): - so_items[d.sales_order_no][d.item_code] = flt(d.qty) + if not so_items[d.sales_order].has_key(d.item_code): + so_items[d.sales_order][d.item_code] = flt(d.qty) else: - so_items[d.sales_order_no][d.item_code] += flt(d.qty) + so_items[d.sales_order][d.item_code] += flt(d.qty) for so_no in so_items.keys(): for item in so_items[so_no].keys(): already_indented = frappe.db.sql("""select sum(qty) from `tabMaterial Request Item` - where item_code = %s and sales_order_no = %s and + where item_code = %s and sales_order = %s and docstatus = 1 and parent != %s""", (item, so_no, self.name)) already_indented = already_indented and flt(already_indented[0][0]) or 0 @@ -347,7 +347,7 @@ def make_production_order(source_name, item_code): prod_order.description = d.description prod_order.stock_uom = d.uom prod_order.expected_delivery_date = d.schedule_date - prod_order.sales_order = d.sales_order_no + prod_order.sales_order = d.sales_order prod_order.bom_no = get_item_details(item_code).bom_no prod_order.material_request = material_request.name return prod_order diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index 74792697db..eecb42a952 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -445,13 +445,13 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "sales_order_no", + "fieldname": "sales_order", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Sales Order No", + "label": "Sales Order", "length": 0, "no_copy": 0, "options": "Sales Order", @@ -601,7 +601,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-01-29 06:03:41.424851", + "modified": "2016-01-30 06:03:41.424851", "modified_by": "Administrator", "module": "Stock", "name": "Material Request Item", diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv index 90a19efbe9..79a1134f5c 100644 --- a/erpnext/translations/ar.csv +++ b/erpnext/translations/ar.csv @@ -1224,7 +1224,7 @@ DocType: Employee External Work History,Total Experience,مجموع الخبرة apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,تدفق النقد من الاستثمار apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم -DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا +DocType: Material Request Item,Sales Order,ترتيب المبيعات لا DocType: Item Group,Item Group Name,البند اسم المجموعة apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,المواد نقل لصناعة diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv index 645234f7fb..61bb51d0c0 100644 --- a/erpnext/translations/bg.csv +++ b/erpnext/translations/bg.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Общо Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични потоци от инвестиционна apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси -DocType: Material Request Item,Sales Order No,Продажбите Заповед № +DocType: Material Request Item,Sales Order,Продажбите Заповед № DocType: Item Group,Item Group Name,Име на артикул Group apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взети apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Прехвърляне Материали за Производство diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv index 8947059cb0..eb653f9c0f 100644 --- a/erpnext/translations/bn.csv +++ b/erpnext/translations/bn.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,মোট অভিজ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ -DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন +DocType: Material Request Item,Sales Order,বিক্রয় আদেশ কোন DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ধরা apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv index 98b176e627..6c9deaf4d6 100644 --- a/erpnext/translations/bs.csv +++ b/erpnext/translations/bs.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Ukupno Iskustvo apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tok iz ulagačkih apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe -DocType: Material Request Item,Sales Order No,Narudžba kupca br +DocType: Material Request Item,Sales Order,Narudžba kupca br DocType: Item Group,Item Group Name,Naziv grupe artikla apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv index e438744a8f..8a8d4bf02a 100644 --- a/erpnext/translations/ca.csv +++ b/erpnext/translations/ca.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Experiència total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux d'efectiu d'inversió apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges -DocType: Material Request Item,Sales Order No,Ordre de Venda No +DocType: Material Request Item,Sales Order,Ordre de Venda No DocType: Item Group,Item Group Name,Nom del Grup d'Articles apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materials de transferència per Fabricació diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv index 31e1002e62..09ae949169 100644 --- a/erpnext/translations/cs.csv +++ b/erpnext/translations/cs.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Celková zkušenost apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Balení Slip (y) zrušeno apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peněžní tok z investičních apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky -DocType: Material Request Item,Sales Order No,Prodejní objednávky No +DocType: Material Request Item,Sales Order,Prodejní objednávky No DocType: Item Group,Item Group Name,Položka Název skupiny apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Přenos Materiály pro výrobu diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv index 335518b8a0..e99c8414a0 100644 --- a/erpnext/translations/da-DK.csv +++ b/erpnext/translations/da-DK.csv @@ -1076,7 +1076,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +65,Financial Year Start Date,Reg DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (r) annulleret apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter -DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr +DocType: Material Request Item,Sales Order,Salg bekendtgørelse nr DocType: Item Group,Item Group Name,Item Group Name apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv index f5f62d5e18..044288120b 100644 --- a/erpnext/translations/da.csv +++ b/erpnext/translations/da.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (r) annulleret apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Pengestrømme fra investeringsaktivitet apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter -DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr +DocType: Material Request Item,Sales Order,Salg bekendtgørelse nr DocType: Item Group,Item Group Name,Item Group Name apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index 8458e88773..33ea1a3959 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -1222,7 +1222,7 @@ DocType: Employee External Work History,Total Experience,Gesamterfahrung apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packzettel storniert apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cashflow aus Investitionen apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten -DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr. +DocType: Material Request Item,Sales Order,Kundenauftrags-Nr. DocType: Item Group,Item Group Name,Name der Artikelgruppe apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Genommen apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Material der Fertigung übergeben diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv index bca0d08ec2..f0dba78aac 100644 --- a/erpnext/translations/el.csv +++ b/erpnext/translations/el.csv @@ -1222,7 +1222,7 @@ DocType: Employee External Work History,Total Experience,Συνολική εμπ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης -DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης +DocType: Material Request Item,Sales Order,Αρ. παραγγελίας πώλησης DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Πάρθηκε apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv index e562fee3a6..14f4d780d8 100644 --- a/erpnext/translations/es-PE.csv +++ b/erpnext/translations/es-PE.csv @@ -1099,7 +1099,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +65,Financial Year Start Date,Ini DocType: Employee External Work History,Total Experience,Experiencia Total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s) apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito -DocType: Material Request Item,Sales Order No,Orden de Venta No +DocType: Material Request Item,Sales Order,Orden de Venta No DocType: Item Group,Item Group Name,Nombre del grupo de artículos apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv index a8a3db6478..d39c77c0c2 100644 --- a/erpnext/translations/es.csv +++ b/erpnext/translations/es.csv @@ -1221,7 +1221,7 @@ DocType: Employee External Work History,Total Experience,Experiencia total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flujo de efectivo de inversión apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE -DocType: Material Request Item,Sales Order No,Orden de venta No. +DocType: Material Request Item,Sales Order,Orden de venta No. DocType: Item Group,Item Group Name,Nombre del grupo de productos apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferir materiales para producción diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv index b726df2cb8..a593e3536a 100644 --- a/erpnext/translations/et.csv +++ b/erpnext/translations/et.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Kokku Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakkesedel (s) tühistati apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Rahavood investeerimistegevusest apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude -DocType: Material Request Item,Sales Order No,Müük korraldusega nr +DocType: Material Request Item,Sales Order,Müük korraldusega nr DocType: Item Group,Item Group Name,Punkt Group Nimi apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Võtnud apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materjalid Tootmine diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv index ad09467d95..8cc353ebd3 100644 --- a/erpnext/translations/fa.csv +++ b/erpnext/translations/fa.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,تجربه ها apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات -DocType: Material Request Item,Sales Order No,سفارش فروش بدون +DocType: Material Request Item,Sales Order,سفارش فروش بدون DocType: Item Group,Item Group Name,مورد نام گروه apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,گرفته apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,انتقال مواد برای تولید diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv index b0240393c4..a73b0586c8 100644 --- a/erpnext/translations/fi.csv +++ b/erpnext/translations/fi.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,kustannukset yhteensä apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,pakkauslaput peruttu apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Investointien rahavirta apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut -DocType: Material Request Item,Sales Order No,"myyntitilaus, numero" +DocType: Material Request Item,Sales Order,"myyntitilaus, numero" DocType: Item Group,Item Group Name,"tuoteryhmä, nimi" apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,otettu apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,materiaalisiirto tuotantoon diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv index da23c14f00..267a876b14 100644 --- a/erpnext/translations/fr.csv +++ b/erpnext/translations/fr.csv @@ -1225,7 +1225,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bordereau(x) annulé apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux de trésorerie d'investissement apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fret et d'envoi en sus -DocType: Material Request Item,Sales Order No,Ordonnance n ° de vente +DocType: Material Request Item,Sales Order,Ordonnance n ° de vente DocType: Item Group,Item Group Name,Nom du groupe d'article apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pris apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv index 170cc452e3..ee4e87e13f 100644 --- a/erpnext/translations/gu.csv +++ b/erpnext/translations/gu.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,કુલ અનુભ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,રદ પેકિંગ કાપલી (ઓ) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,રોકાણ કેશ ફ્લો apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત -DocType: Material Request Item,Sales Order No,વેચાણ ઓર્ડર કોઈ +DocType: Material Request Item,Sales Order,વેચાણ ઓર્ડર કોઈ DocType: Item Group,Item Group Name,વસ્તુ ગ્રુપ નામ apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,લેવામાં apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ઉત્પાદન માટે ટ્રાન્સફર સામગ્રી diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv index cb1810389a..9e663cfdd3 100644 --- a/erpnext/translations/he.csv +++ b/erpnext/translations/he.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,"ניסיון סה""כ" apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,תזרים מזומנים מהשקעות apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח -DocType: Material Request Item,Sales Order No,להזמין ללא מכירות +DocType: Material Request Item,Sales Order,להזמין ללא מכירות DocType: Item Group,Item Group Name,שם קבוצת פריט apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,לקחתי apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,העברת חומרים לייצור diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv index 26b72935b6..14fedb0b0d 100644 --- a/erpnext/translations/hi.csv +++ b/erpnext/translations/hi.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,कुल अनुभ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,निवेश से कैश फ्लो apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क -DocType: Material Request Item,Sales Order No,बिक्री आदेश नहीं +DocType: Material Request Item,Sales Order,बिक्री आदेश नहीं DocType: Item Group,Item Group Name,आइटम समूह का नाम apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,में ले ली apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv index d8864ccd95..1699e39c4f 100644 --- a/erpnext/translations/hr.csv +++ b/erpnext/translations/hr.csv @@ -1224,7 +1224,7 @@ DocType: Employee External Work History,Total Experience,Ukupno Iskustvo apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tijek iz investicijskih apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe -DocType: Material Request Item,Sales Order No,Broj narudžbe kupca +DocType: Material Request Item,Sales Order,Broj narudžbe kupca DocType: Item Group,Item Group Name,Proizvod - naziv grupe apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Prijenos Materijali za izradu diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv index b94fae5ed4..cb55a8f5cf 100644 --- a/erpnext/translations/hu.csv +++ b/erpnext/translations/hu.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Összesen Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Csomagjegy(ek) törölve apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow Befektetési apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak -DocType: Material Request Item,Sales Order No,Sales Order No +DocType: Material Request Item,Sales Order,Sales Order DocType: Item Group,Item Group Name,Anyagcsoport neve apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer anyagok gyártása diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv index a0c208c09a..51221c28a0 100644 --- a/erpnext/translations/id.csv +++ b/erpnext/translations/id.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Jumlah Pengalaman apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing slip (s) dibatalkan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Arus Kas dari Investasi apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya -DocType: Material Request Item,Sales Order No,No Order Penjualan +DocType: Material Request Item,Sales Order,Sales Order DocType: Item Group,Item Group Name,Nama Item Grup apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Material untuk Produksi diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv index d9f30725e8..2c824722b2 100644 --- a/erpnext/translations/it.csv +++ b/erpnext/translations/it.csv @@ -1223,7 +1223,7 @@ DocType: Employee External Work History,Total Experience,Esperienza totale apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow da investimenti apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese -DocType: Material Request Item,Sales Order No,Ordine di vendita No +DocType: Material Request Item,Sales Order,Ordine di vendita No DocType: Item Group,Item Group Name,Nome Gruppo Articoli apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Preso apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv index 67c855e00b..fad54750dc 100644 --- a/erpnext/translations/ja.csv +++ b/erpnext/translations/ja.csv @@ -1234,7 +1234,7 @@ DocType: Employee External Work History,Total Experience,実績合計 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,投資活動によるキャッシュフロー apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金 -DocType: Material Request Item,Sales Order No,受注番号 +DocType: Material Request Item,Sales Order,受注番号 DocType: Item Group,Item Group Name,アイテムグループ名 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,売上高 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,製造用資材配送 diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv index b0ba2f41da..1db6cf58ae 100644 --- a/erpnext/translations/km.csv +++ b/erpnext/translations/km.csv @@ -1200,7 +1200,7 @@ DocType: Employee External Work History,Total Experience,បទពិសោធ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត -DocType: Material Request Item,Sales Order No,គ្មានការលក់សណ្តាប់ធ្នាប់ +DocType: Material Request Item,Sales Order,គ្មានការលក់សណ្តាប់ធ្នាប់ DocType: Item Group,Item Group Name,ធាតុឈ្មោះក្រុម apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,គេយក apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv index 9de8a59937..34143a7a42 100644 --- a/erpnext/translations/kn.csv +++ b/erpnext/translations/kn.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್ -DocType: Material Request Item,Sales Order No,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ +DocType: Material Request Item,Sales Order,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ಟೇಕನ್ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್ diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv index 3c39d728d4..32b3582c8c 100644 --- a/erpnext/translations/ko.csv +++ b/erpnext/translations/ko.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,총 체험 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,포장 명세서 (들) 취소 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,투자의 현금 흐름 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금 -DocType: Material Request Item,Sales Order No,판매 주문 번호 +DocType: Material Request Item,Sales Order,판매 주문 번호 DocType: Item Group,Item Group Name,항목 그룹 이름 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,촬영 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,제조에 대한 전송 재료 diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv index 0678cd273a..8e3bc6ee5e 100644 --- a/erpnext/translations/lv.csv +++ b/erpnext/translations/lv.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Kopā pieredze apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (s) atcelts apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Naudas plūsma no ieguldījumu apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi -DocType: Material Request Item,Sales Order No,Pasūtījumu Nr +DocType: Material Request Item,Sales Order,Pasūtījumu Nr DocType: Item Group,Item Group Name,Postenis Grupas nosaukums apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materiāli Ražošana diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv index db945cc149..c773189958 100644 --- a/erpnext/translations/mk.csv +++ b/erpnext/translations/mk.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Вкупно Искус apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Пакување фиш (и) откажани apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични текови од инвестициони apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави -DocType: Material Request Item,Sales Order No,Продај Побарувања Не +DocType: Material Request Item,Sales Order,Продај Побарувања Не DocType: Item Group,Item Group Name,Точка име на група apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Земени apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Пренос на материјали за изработка diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv index 7fbf00cba9..ea56eb7c09 100644 --- a/erpnext/translations/ml.csv +++ b/erpnext/translations/ml.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,ആകെ അനുഭ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള -DocType: Material Request Item,Sales Order No,സെയിൽസ് ഓർഡർ ഇല്ല +DocType: Material Request Item,Sales Order,സെയിൽസ് ഓർഡർ ഇല്ല DocType: Item Group,Item Group Name,ഇനം ഗ്രൂപ്പ് പേര് apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,എടുത്ത apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽസ് കൈമാറുക diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv index a7ec841b0f..1c01841b7a 100644 --- a/erpnext/translations/mr.csv +++ b/erpnext/translations/mr.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,एकूण अनु apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,गुंतवणूक रोख प्रवाह apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क -DocType: Material Request Item,Sales Order No,विक्री ऑर्डर नाही +DocType: Material Request Item,Sales Order,विक्री ऑर्डर नाही DocType: Item Group,Item Group Name,आयटम गट नाव apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,घेतले apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv index f563902dff..cc6153af6b 100644 --- a/erpnext/translations/ms.csv +++ b/erpnext/translations/ms.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Jumlah Pengalaman apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Aliran tunai daripada Pelaburan apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding dan Caj -DocType: Material Request Item,Sales Order No,Pesanan Jualan No +DocType: Material Request Item,Sales Order,Pesanan Jualan No DocType: Item Group,Item Group Name,Perkara Kumpulan Nama apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Bahan Pemindahan bagi Pembuatan diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv index a555cfb742..7cfef14f6e 100644 --- a/erpnext/translations/my.csv +++ b/erpnext/translations/my.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,စုစုပေါ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက် -DocType: Material Request Item,Sales Order No,အရောင်းအမိန့်မရှိပါ +DocType: Material Request Item,Sales Order,အရောင်းအမိန့်မရှိပါ DocType: Item Group,Item Group Name,item Group မှအမည် apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv index 708b68b031..697f3a298f 100644 --- a/erpnext/translations/nl.csv +++ b/erpnext/translations/nl.csv @@ -1223,7 +1223,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakbon(en) geannuleerd apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,De kasstroom uit investeringsactiviteiten apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten -DocType: Material Request Item,Sales Order No,Verkooporder nr. +DocType: Material Request Item,Sales Order,Verkooporder nr. DocType: Item Group,Item Group Name,Artikel groepsnaam apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Ingenomen apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Verplaats Materialen voor Productie diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv index 8e458f42ab..98f5fb3335 100644 --- a/erpnext/translations/no.csv +++ b/erpnext/translations/no.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakking Slip (s) kansellert apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kontantstrøm fra investerings apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader -DocType: Material Request Item,Sales Order No,Salgsordre Nei +DocType: Material Request Item,Sales Order,Salgsordre Nei DocType: Item Group,Item Group Name,Sak Gruppenavn apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tatt apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materialer for produksjon diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv index 6e481a9257..0557923db6 100644 --- a/erpnext/translations/pl.csv +++ b/erpnext/translations/pl.csv @@ -1225,8 +1225,8 @@ DocType: Employee External Work History,Total Experience, apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,List(y) przewozowe anulowane apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Koszty dostaw i przesyłek -DocType: Material Request Item,Sales Order No,Nr Zlecenia Sprzedaży -DocType: Item Group,Item Group Name,Element Nazwa grupy +DocType: Material Request Item,Sales Order,Nr Zlecenia Sprzedaży +DocType: Item Group,Item Group Name, apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Wzięty apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiały transferowe dla Produkcja DocType: Pricing Rule,For Price List,Dla Listy Cen diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv index 57b1596105..f5ed6866e1 100644 --- a/erpnext/translations/pt-BR.csv +++ b/erpnext/translations/pt-BR.csv @@ -1223,7 +1223,7 @@ DocType: Employee External Work History,Total Experience,Experiência total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos -DocType: Material Request Item,Sales Order No,Nº da Ordem de Venda +DocType: Material Request Item,Sales Order,Nº da Ordem de Venda DocType: Item Group,Item Group Name,Nome do Grupo de Itens apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiais de transferência para Fabricação diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv index 5a19503f66..44e3ee8f56 100644 --- a/erpnext/translations/pt.csv +++ b/erpnext/translations/pt.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Experiência total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos -DocType: Material Request Item,Sales Order No,Vendas decreto n º +DocType: Material Request Item,Sales Order,Vendas decreto n º DocType: Item Group,Item Group Name,Nome do Grupo item apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiais de transferência para Fabricação diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv index 163616879f..6b2993eefa 100644 --- a/erpnext/translations/ro.csv +++ b/erpnext/translations/ro.csv @@ -1221,7 +1221,7 @@ DocType: Employee External Work History,Total Experience,Experiența totală apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip de ambalare (e) anulate apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow de la Investiții apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere -DocType: Material Request Item,Sales Order No,Vânzări Ordinul nr +DocType: Material Request Item,Sales Order,Vânzări Ordinul nr DocType: Item Group,Item Group Name,Denumire Grup Articol apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Luate apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materiale de transfer de Fabricare diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv index 0d5e835049..bf2887b2f1 100644 --- a/erpnext/translations/ru.csv +++ b/erpnext/translations/ru.csv @@ -1225,7 +1225,7 @@ DocType: Employee External Work History,Total Experience,Суммарный оп apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Поток денежных средств от инвестиционной apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы -DocType: Material Request Item,Sales Order No,Номер Заказа клиента +DocType: Material Request Item,Sales Order,Номер Заказа клиента DocType: Item Group,Item Group Name,Пункт Название группы apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Передача материалов для производства diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv index 21b736bc36..51714af63b 100644 --- a/erpnext/translations/sk.csv +++ b/erpnext/translations/sk.csv @@ -1224,7 +1224,7 @@ DocType: Employee External Work History,Total Experience,Celková zkušenost apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Balení Slip (y) zrušeno apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peňažný tok z investičných apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky -DocType: Material Request Item,Sales Order No,Prodejní objednávky No +DocType: Material Request Item,Sales Order,Prodejní objednávky No DocType: Item Group,Item Group Name,Položka Název skupiny apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Přenos Materiály pro výrobu diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv index d7d8e8ef26..baa405e703 100644 --- a/erpnext/translations/sl.csv +++ b/erpnext/translations/sl.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Skupaj Izkušnje apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Dobavnico (e) odpovedan apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Denarni tokovi iz naložbenja apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški -DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka +DocType: Material Request Item,Sales Order,Prodaja Zaporedna številka DocType: Item Group,Item Group Name,Item Name Group apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferji Materiali za Izdelava diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv index 9eea645f38..9852f76993 100644 --- a/erpnext/translations/sq.csv +++ b/erpnext/translations/sq.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Përvoja Total apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow nga Investimi apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat -DocType: Material Request Item,Sales Order No,Rendit Sales Asnjë +DocType: Material Request Item,Sales Order,Rendit Sales Asnjë DocType: Item Group,Item Group Name,Item Emri i Grupit apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Marrë apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv index c582b528a2..6d6028a460 100644 --- a/erpnext/translations/sr.csv +++ b/erpnext/translations/sr.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Укупно Искус apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Новчани ток од Инвестирање apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы -DocType: Material Request Item,Sales Order No,Продаја Наручите Нема +DocType: Material Request Item,Sales Order,Продаја Наручите Нема DocType: Item Group,Item Group Name,Ставка Назив групе apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Трансфер материјал за производњу diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv index d3d05248f9..b019ed4288 100644 --- a/erpnext/translations/sv.csv +++ b/erpnext/translations/sv.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Total Experience apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Följesedlar avbryts apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kassaflöde från investeringsverksamheten apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter" -DocType: Material Request Item,Sales Order No,Kundorder Ingen +DocType: Material Request Item,Sales Order,Kundorder Ingen DocType: Item Group,Item Group Name,Produkt Gruppnamn apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Överför Material Tillverkning diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv index 933ea271ac..0de536f3bf 100644 --- a/erpnext/translations/ta.csv +++ b/erpnext/translations/ta.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,மொத்த அ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம் -DocType: Material Request Item,Sales Order No,விற்பனை ஆணை இல்லை +DocType: Material Request Item,Sales Order,விற்பனை ஆணை இல்லை DocType: Item Group,Item Group Name,உருப்படியை குழு பெயர் apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,எடுக்கப்பட்ட apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள் diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv index 34be9881d4..656e7dd90b 100644 --- a/erpnext/translations/te.csv +++ b/erpnext/translations/te.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,మొత్తం ఎ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,రద్దు ప్యాకింగ్ స్లిప్ (లు) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు -DocType: Material Request Item,Sales Order No,సేల్స్ ఆర్డర్ సంఖ్య +DocType: Material Request Item,Sales Order,సేల్స్ ఆర్డర్ సంఖ్య DocType: Item Group,Item Group Name,అంశం గ్రూప్ పేరు apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,తీసుకోబడినది apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,తయారీకి ట్రాన్స్ఫర్ మెటీరియల్స్ diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv index fb0e9e074d..1847549ab5 100644 --- a/erpnext/translations/th.csv +++ b/erpnext/translations/th.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,ประสบกา apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,กระแสเงินสดจากการลงทุน apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย -DocType: Material Request Item,Sales Order No,สั่งซื้อยอดขาย +DocType: Material Request Item,Sales Order,สั่งซื้อยอดขาย DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ยึด apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv index 1153bd0659..3b17a30f54 100644 --- a/erpnext/translations/tr.csv +++ b/erpnext/translations/tr.csv @@ -1495,8 +1495,8 @@ DocType: Employee External Work History,Total Experience,Toplam Deneyim apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Yatırım Nakit Akışı apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri -DocType: Material Request Item,Sales Order No,Satış Sipariş No -DocType: Material Request Item,Sales Order No,Satış Sipariş No +DocType: Material Request Item,Sales Order,Satış Sipariş No +DocType: Material Request Item,Sales Order,Satış Sipariş No DocType: Item Group,Item Group Name,Ürün Grup Adı DocType: Item Group,Item Group Name,Ürün Grup Adı apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Alınmış diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv index 54384ce94f..82678f1f5f 100644 --- a/erpnext/translations/uk.csv +++ b/erpnext/translations/uk.csv @@ -1201,7 +1201,7 @@ DocType: Employee External Work History,Total Experience,Загальний до apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Потік грошових коштів від інвестиційної apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори -DocType: Material Request Item,Sales Order No,Продажі Замовити Немає +DocType: Material Request Item,Sales Order,Продажі Замовити Немає DocType: Item Group,Item Group Name,Назва товару Група apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Передача матеріалів для виробництва diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv index fdab335d49..6170b73a12 100644 --- a/erpnext/translations/ur.csv +++ b/erpnext/translations/ur.csv @@ -1199,7 +1199,7 @@ DocType: Employee External Work History,Total Experience,کل تجربہ apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,منسوخ پیکنگ پرچی (ے) apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,سرمایہ کاری سے کیش فلو apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز -DocType: Material Request Item,Sales Order No,سیلز آرڈر نہیں +DocType: Material Request Item,Sales Order,سیلز آرڈر نہیں DocType: Item Group,Item Group Name,آئٹم گروپ کا نام apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,لیا apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,تیاری کے لئے کی منتقلی کی معدنیات diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv index 623866b7a3..ec6f5d7c38 100644 --- a/erpnext/translations/vi.csv +++ b/erpnext/translations/vi.csv @@ -1226,7 +1226,7 @@ DocType: Employee External Work History,Total Experience,Tổng số kinh nghi apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí -DocType: Material Request Item,Sales Order No,Không bán hàng đặt hàng +DocType: Material Request Item,Sales Order,Không bán hàng đặt hàng DocType: Item Group,Item Group Name,Mục Group Name apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lấy apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv index a4073d355b..2d6fd4a8b4 100644 --- a/erpnext/translations/zh-cn.csv +++ b/erpnext/translations/zh-cn.csv @@ -1212,7 +1212,7 @@ DocType: Employee External Work History,Total Experience,总经验 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,装箱单（ S）取消 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,从投资现金流 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费 -DocType: Material Request Item,Sales Order No,销售订单编号 +DocType: Material Request Item,Sales Order,销售订单编号 DocType: Item Group,Item Group Name,品目群组名称 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,转移制造材料 diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv index 5074cddda9..4a2f1469bc 100644 --- a/erpnext/translations/zh-tw.csv +++ b/erpnext/translations/zh-tw.csv @@ -1225,7 +1225,7 @@ DocType: Employee External Work History,Total Experience,總經驗 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,包裝單（ S）已取消 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,從投資現金流 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費 -DocType: Material Request Item,Sales Order No,銷售訂單號 +DocType: Material Request Item,Sales Order,銷售訂單號 DocType: Item Group,Item Group Name,項目群組名稱 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,轉移製造材料 From dddf42560fa23f0b3a447c4bcf62dac4f1a52b12 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 10 Feb 2016 13:09:09 +0530 Subject: [PATCH 22/49] Added code to update Material Request on Submission of Production Order --- .../doctype/purchase_order/purchase_order.py | 1 - .../production_order/production_order.json | 29 +++++- .../production_order/production_order.py | 14 ++- .../material_request/material_request.js | 62 ++----------- .../material_request/material_request.py | 92 +++++++++++-------- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index caefe53ac3..44fe7cf600 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -145,7 +145,6 @@ class PurchaseOrder(BuyingController): and frappe.db.get_value("Item", d.item_code, "is_stock_item") \ and d.warehouse and not d.delivered_by_supplier: item_wh_list.append([d.item_code, d.warehouse]) - for item_code, warehouse in item_wh_list: update_bin_qty(item_code, warehouse, { "ordered_qty": get_ordered_qty(item_code, warehouse) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json index 997a6179e0..2ad2a3ba28 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.json +++ b/erpnext/manufacturing/doctype/production_order/production_order.json @@ -928,7 +928,31 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "material_request_item", + "fieldtype": "Data", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Material Request Item", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -972,7 +996,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-01-21 04:30:33.561347", + "modified": "2016-02-08 04:36:35.071206", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order", @@ -1021,5 +1045,6 @@ ], "read_only": 0, "read_only_onload": 0, + "sort_order": "ASC", "title_field": "production_item" } \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py index 59d371a7c1..ead8105a92 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.py +++ b/erpnext/manufacturing/doctype/production_order/production_order.py @@ -152,17 +152,19 @@ class ProductionOrder(Document): frappe.throw(_("Work-in-Progress Warehouse is required before Submit")) if not self.fg_warehouse: frappe.throw(_("For Warehouse is required before Submit")) + frappe.db.set(self,'status', 'Submitted') self.make_time_logs() self.update_planned_qty() - + self.update_completed_qty_in_material_request() def on_cancel(self): self.validate_cancel() frappe.db.set(self,'status', 'Cancelled') - self.update_planned_qty() self.delete_time_logs() + self.update_planned_qty() + self.update_completed_qty_in_material_request() def validate_cancel(self): if self.status == "Stopped": @@ -178,6 +180,14 @@ class ProductionOrder(Document): update_bin_qty(self.production_item, self.fg_warehouse, { "planned_qty": get_planned_qty(self.production_item, self.fg_warehouse) }) + + if self.material_request: + mr_obj = frappe.get_doc("Material Request", self.material_request) + mr_obj.update_requested_qty([self.material_request_item]) + + def update_completed_qty_in_material_request(self): + if self.material_request: + frappe.get_doc("Material Request", self.material_request).update_completed_qty([self.material_request_item]) def set_production_order_operations(self): """Fetch operations from BOM and set in 'Production Order'""" diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 29968d8d68..559b954963 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -55,7 +55,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten if(doc.material_request_type === "Manufacture" && doc.status === "Submitted") cur_frm.add_custom_button(__("Production Order"), - this.make_production_order, __("Make")); + this.raise_production_orders, __("Make")); cur_frm.page.set_inner_btn_group_as_primary(__("Make")); @@ -172,61 +172,13 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten }, - make_production_order: function() { - var items = [] - $.each(cur_frm.doc["items"] || [], function(i, d) { - items.push(d.item_code); + raise_production_orders: function() { + frappe.call({ + method:"erpnext.stock.doctype.material_request.material_request.raise_production_orders", + args: { + "source_name": cur_frm.doc.name + } }); - var d = new frappe.ui.Dialog({ - title: __("Production Order"), - fields: [ - { - "fieldtype": "Link", - "label": __("Production Item"), - "fieldname": "item", - "options": "Item", - "reqd": 1, - "get_query": function() { - return { - "filters": [ - ['item_code', 'in', items], - ] - } - } - } - ] - - }); - - d.set_primary_action(__("Make"), function() { - frappe.call({ - method:"erpnext.stock.doctype.material_request.material_request.validate_production_item", - args: { - "item_code": d.get_values().item - }, - callback: function(r) { - if(!r.message) { - msgprint("Cannot create Production Order for selected Item.") - } - else { - frappe.call({ - method:"erpnext.stock.doctype.material_request.material_request.make_production_order", - args: { - "source_name": cur_frm.doc.name, - "item_code": d.get_values().item, - }, - callback: function(r) { - if(!r.exe) { - var doclist = frappe.model.sync(r.message); - frappe.set_route("Form", doclist[0].doctype, doclist[0].name); - } - } - }); - } - } - }); - }); - d.show(); } }); diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index f7dee98b3b..80ec589d46 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -7,8 +7,8 @@ from __future__ import unicode_literals import frappe -from frappe.utils import cstr, flt, getdate -from frappe import _ +from frappe.utils import cstr, flt, getdate, comma_and +from frappe import msgprint, _ from frappe.model.mapper import get_mapped_doc from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty from erpnext.controllers.buying_controller import BuyingController @@ -107,35 +107,41 @@ class MaterialRequest(BuyingController): frappe.db.set(self,'status','Cancelled') - def update_completed_qty(self, mr_items=None): + def update_completed_qty(self, mr_items=None, update_modified=True): if self.material_request_type == "Purchase": return if not mr_items: mr_items = [d.name for d in self.get("items")] - per_ordered = 0.0 for d in self.get("items"): if d.name in mr_items: - d.ordered_qty = flt(frappe.db.sql("""select sum(transfer_qty) - from `tabStock Entry Detail` where material_request = %s - and material_request_item = %s and docstatus = 1""", - (self.name, d.name))[0][0]) + if self.material_request_type in ("Material Issue", "Material Transfer"): + d.ordered_qty = flt(frappe.db.sql("""select sum(transfer_qty) + from `tabStock Entry Detail` where material_request = %s + and material_request_item = %s and docstatus = 1""", + (self.name, d.name))[0][0]) - if d.ordered_qty and d.ordered_qty > d.qty: - frappe.throw(_("The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3}").format(d.ordered_qty, d.parent, d.qty, d.item_code)) + if d.ordered_qty and d.ordered_qty > d.qty: + frappe.throw(_("The total Issue / Transfer quantity {0} in Material Request {1} \ + cannot be greater than requested quantity {2} for Item {3}").format(d.ordered_qty, d.parent, d.qty, d.item_code)) + + elif self.material_request_type == "Manufacture": + d.ordered_qty = flt(frappe.db.sql("""select sum(qty) + from `tabProduction Order` where material_request = %s + and material_request_item = %s and docstatus = 1""", + (self.name, d.name))[0][0]) frappe.db.set_value(d.doctype, d.name, "ordered_qty", d.ordered_qty) - - # note: if qty is 0, its row is still counted in len(self.get("items")) - # 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)) - - self.per_ordered = flt((per_ordered / flt(len(self.get("items")))) * 100.0, 2) - frappe.db.set_value(self.doctype, self.name, "per_ordered", self.per_ordered) + + self._update_percent_field({ + "target_dt": "Material Request Item", + "target_parent_dt": self.doctype, + "target_parent_field": "per_ordered", + "target_ref_field": "qty", + "target_field": "ordered_qty", + "name": self.name, + }, update_modified) def update_requested_qty(self, mr_item_rows=None): """update requested qty (before ordered_qty is updated)""" @@ -329,25 +335,33 @@ def make_stock_entry(source_name, target_doc=None): return doclist - @frappe.whitelist() -def validate_production_item(item_code): - return frappe.db.get_value("Item", item_code, "is_pro_applicable") - -@frappe.whitelist() -def make_production_order(source_name, item_code): +def raise_production_orders(source_name): material_request= frappe.get_doc("Material Request", source_name) - prod_order = frappe.new_doc("Production Order") - prod_order.production_item = item_code - prod_order.qty = 0 + errors =[] + production_orders = [] for d in material_request.items: - if d.item_code == item_code: - prod_order.qty = d.qty - d.ordered_qty - prod_order.fg_warehouse = d.warehouse - prod_order.description = d.description - prod_order.stock_uom = d.uom - prod_order.expected_delivery_date = d.schedule_date - prod_order.sales_order = d.sales_order - prod_order.bom_no = get_item_details(item_code).bom_no - prod_order.material_request = material_request.name - return prod_order + if (d.qty - d.ordered_qty) >0 : + if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): + prod_order = frappe.new_doc("Production Order") + prod_order.production_item = d.item_code + prod_order.qty = d.qty - d.ordered_qty + prod_order.fg_warehouse = d.warehouse + prod_order.description = d.description + prod_order.stock_uom = d.uom + prod_order.expected_delivery_date = d.schedule_date + prod_order.sales_order = d.sales_order + prod_order.bom_no = get_item_details(d.item_code).bom_no + prod_order.material_request = material_request.name + prod_order.material_request_item = d.name + prod_order.planned_start_date = material_request.transaction_date + prod_order.save() + production_orders.append(prod_order.name) + else: + errors.append(d.item_code + " in Row " + cstr(d.idx)) + if production_orders: + message = ["""%s""" % \ + (p, p) for p in production_orders] + msgprint(_("Production Orders {0} created").format(comma_and(message))) + if errors: + msgprint(_("Could not Raise Production Orders for {0}").format(comma_and(errors))) \ No newline at end of file From 43114bab71c5ea65a9b9f65163c810801e7d5549 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 10 Feb 2016 13:10:25 +0530 Subject: [PATCH 23/49] renamed label of Quantity Requested for Purchase to Requested Quantity in Bin --- erpnext/stock/doctype/bin/bin.json | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json index 37fe0a4777..9eb3995cc9 100644 --- a/erpnext/stock/doctype/bin/bin.json +++ b/erpnext/stock/doctype/bin/bin.json @@ -26,6 +26,7 @@ "options": "Warehouse", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -51,6 +52,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -76,6 +78,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -101,6 +104,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -126,6 +130,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -144,13 +149,14 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Quantity Requested for Purchase", + "label": "Requested Quantity", "length": 0, "no_copy": 0, "oldfieldname": "indented_qty", "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -175,6 +181,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -199,6 +206,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -223,6 +231,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 1, "reqd": 0, @@ -248,6 +257,7 @@ "options": "UOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -272,6 +282,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 1, "reqd": 0, @@ -296,6 +307,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -320,6 +332,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -337,7 +350,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-11-16 06:29:42.363502", + "modified": "2016-02-10 02:39:45.738623", "modified_by": "Administrator", "module": "Stock", "name": "Bin", @@ -406,5 +419,6 @@ ], "read_only": 0, "read_only_onload": 0, - "search_fields": "item_code,warehouse" + "search_fields": "item_code,warehouse", + "sort_order": "ASC" } \ No newline at end of file From 877e2ebff8f459f82f80358b95e1ad3ff82a03e7 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 11 Feb 2016 12:06:31 +0530 Subject: [PATCH 24/49] Fixed Production PLanning Tool --- .../production_plan_item.json | 69 ++++++- .../__init__.py | 0 .../production_plan_material_request.json | 113 +++++++++++ .../production_plan_material_request.py | 10 + .../production_plan_sales_order.json | 12 +- .../production_planning_tool.json | 187 ++++++++++++++++-- .../production_planning_tool.py | 143 +++++++++++--- 7 files changed, 481 insertions(+), 53 deletions(-) create mode 100644 erpnext/manufacturing/doctype/production_plan_material_request/__init__.py create mode 100644 erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json create mode 100644 erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.py diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json index 49d31c961c..6596e23401 100644 --- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json +++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -26,6 +26,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 0, "report_hide": 0, @@ -53,6 +54,7 @@ "options": "BOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -79,6 +81,7 @@ "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 0, "report_hide": 0, @@ -105,6 +108,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -121,7 +125,7 @@ "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Sales Order", "length": 0, "no_copy": 0, @@ -130,6 +134,7 @@ "options": "Sales Order", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -141,19 +146,45 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "so_pending_qty", + "fieldname": "material_request", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Material Request", + "length": 0, + "no_copy": 0, + "options": "Material Request", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "pending_qty", "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 1, - "label": "SO Pending Qty", + "label": "Pending Qty", "length": 0, "no_copy": 0, "oldfieldname": "prevdoc_reqd_qty", "oldfieldtype": "Currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "100px", "read_only": 1, "report_hide": 0, @@ -180,6 +211,7 @@ "options": "Warehouse", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -205,6 +237,7 @@ "options": "UOM", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "80px", "read_only": 1, "report_hide": 0, @@ -231,6 +264,7 @@ "oldfieldtype": "Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "200px", "read_only": 1, "report_hide": 0, @@ -239,6 +273,30 @@ "set_only_once": 0, "unique": 0, "width": "200px" + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "material_request_item", + "fieldtype": "Data", + "hidden": 1, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "material_request_item", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 } ], "hide_heading": 0, @@ -250,12 +308,13 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:52.572122", + "modified": "2016-02-10 07:08:38.461787", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Item", "owner": "Administrator", "permissions": [], "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "sort_order": "ASC" } \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/__init__.py b/erpnext/manufacturing/doctype/production_plan_material_request/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json new file mode 100644 index 0000000000..0522e7a347 --- /dev/null +++ b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json @@ -0,0 +1,113 @@ +{ + "allow_copy": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "hash", + "creation": "2016-02-10 05:09:11.983251", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "fields": [ + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "material_request", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Material Request", + "length": 0, + "no_copy": 0, + "oldfieldname": "prevdoc_docname", + "oldfieldtype": "Data", + "options": "Material Request", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "print_width": "150px", + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0, + "width": "150px" + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "col_break1", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "material_request_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Material Request Date", + "length": 0, + "no_copy": 0, + "oldfieldname": "document_date", + "oldfieldtype": "Date", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "print_width": "120px", + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0, + "width": "120px" + } + ], + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "in_create": 0, + "in_dialog": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2016-02-10 05:13:07.529068", + "modified_by": "Administrator", + "module": "Manufacturing", + "name": "Production Plan Material Request", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "read_only": 0, + "read_only_onload": 0, + "sort_field": "modified", + "sort_order": "ASC" +} \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.py b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.py new file mode 100644 index 0000000000..44786f8388 --- /dev/null +++ b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class ProductionPlanMaterialRequest(Document): + pass diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json index d7fdea5a0a..bed893f921 100644 --- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json +++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json @@ -26,6 +26,7 @@ "options": "Sales Order", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 0, "report_hide": 0, @@ -45,13 +46,14 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 1, - "label": "SO Date", + "label": "Salse Order Date", "length": 0, "no_copy": 0, "oldfieldname": "document_date", "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "120px", "read_only": 1, "report_hide": 0, @@ -76,6 +78,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -99,6 +102,7 @@ "options": "Customer", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 1, "report_hide": 0, @@ -124,6 +128,7 @@ "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "120px", "read_only": 1, "report_hide": 0, @@ -143,12 +148,13 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:52.629618", + "modified": "2016-02-10 05:13:30.301297", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Sales Order", "owner": "Administrator", "permissions": [], "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "sort_order": "ASC" } \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json index e54b168776..3f047138fd 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json @@ -12,17 +12,21 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "description": "Select Sales Orders from which you want to create Production Orders.", - "fieldname": "select_sales_orders", - "fieldtype": "Section Break", + "default": "Sales Order", + "fieldname": "plan_using", + "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Select Sales Orders", + "label": "Plan Using", + "length": 0, "no_copy": 0, + "options": "Sales Order\nMaterial Request", "permlevel": 0, + "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -34,22 +38,26 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "column_break0", - "fieldtype": "Column Break", + "depends_on": "", + "description": "", + "fieldname": "filters", + "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "label": "Filters", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, "search_index": 0, "set_only_once": 0, - "unique": 0, - "width": "50%" + "unique": 0 }, { "allow_on_submit": 0, @@ -61,11 +69,13 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 1, - "label": "Filter based on item", + "label": "Item", + "length": 0, "no_copy": 0, "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -77,17 +87,20 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "eval: doc.plan_using == \"Sales Order\"", "fieldname": "customer", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 1, - "label": "Filter based on customer", + "label": "Customer", + "length": 0, "no_copy": 0, "options": "Customer", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -99,6 +112,33 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "eval: doc.plan_using == \"Material Request\"", + "fieldname": "warehouse", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Warehouse", + "length": 0, + "no_copy": 0, + "options": "Warehouse", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval: doc.plan_using == \"Sales Order\"", "fieldname": "company", "fieldtype": "Link", "hidden": 0, @@ -106,13 +146,15 @@ "in_filter": 0, "in_list_view": 1, "label": "Company", + "length": 0, "no_copy": 0, "options": "Company", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -127,9 +169,11 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -149,9 +193,11 @@ "in_filter": 0, "in_list_view": 0, "label": "From Date", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -170,9 +216,11 @@ "in_filter": 0, "in_list_view": 0, "label": "To Date", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -184,16 +232,19 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "eval: doc.plan_using == \"Sales Order\"", "fieldname": "section_break1", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, - "options": "Simple", + "options": "", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -213,10 +264,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Get Sales Orders", + "length": 0, "no_copy": 0, "options": "get_open_sales_orders", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -235,10 +288,87 @@ "in_filter": 0, "in_list_view": 0, "label": "Sales Orders", + "length": 0, "no_copy": 0, "options": "Production Plan Sales Order", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "eval: doc.plan_using == \"Material Request\"", + "fieldname": "section_break_16", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "description": "Pull Material Request of type Manufacture based on the above criteria", + "fieldname": "get_material_request", + "fieldtype": "Button", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Get Material Request", + "length": 0, + "no_copy": 0, + "options": "get_pending_material_requests", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "material_requests", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Material Requests", + "length": 0, + "no_copy": 0, + "options": "Production Plan Material Request", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -257,9 +387,11 @@ "in_filter": 0, "in_list_view": 0, "label": "Select Items", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -271,17 +403,19 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "get_items_from_so", + "fieldname": "get_items", "fieldtype": "Button", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Get Items From Sales Orders", + "label": "Get Items", + "length": 0, "no_copy": 0, - "options": "get_items_from_so", + "options": "get_items", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -302,9 +436,11 @@ "in_filter": 0, "in_list_view": 0, "label": "Use Multi-Level BOM", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -323,10 +459,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Items", + "length": 0, "no_copy": 0, "options": "Production Plan Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -346,9 +484,11 @@ "in_filter": 0, "in_list_view": 0, "label": "Production Orders", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -368,10 +508,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Create Production Orders", + "length": 0, "no_copy": 0, "options": "raise_production_order", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -383,6 +525,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "", "fieldname": "sb5", "fieldtype": "Section Break", "hidden": 0, @@ -390,9 +533,11 @@ "in_filter": 0, "in_list_view": 0, "label": "Material Requirement", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -411,10 +556,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Material Request For Warehouse", + "length": 0, "no_copy": 0, "options": "Warehouse", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -434,10 +581,12 @@ "in_filter": 0, "in_list_view": 0, "label": "Create Material Requests", + "length": 0, "no_copy": 0, "options": "", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -457,9 +606,11 @@ "in_filter": 0, "in_list_view": 0, "label": "Download Materials Required", + "length": 0, "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -477,7 +628,8 @@ "is_submittable": 0, "issingle": 1, "istable": 0, - "modified": "2015-06-05 11:44:31.629114", + "max_attachments": 0, + "modified": "2016-02-10 07:28:50.298538", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Planning Tool", @@ -505,5 +657,6 @@ } ], "read_only": 1, - "read_only_onload": 0 + "read_only_onload": 0, + "sort_order": "ASC" } \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index 67eab40ddc..4be22e4080 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -33,6 +33,9 @@ class ProductionPlanningTool(Document): def clear_so_table(self): self.set('sales_orders', []) + def clear_mr_table(self): + self.set('material_requests', []) + def clear_item_table(self): self.set('items', []) @@ -88,19 +91,59 @@ class ProductionPlanningTool(Document): pp_so.sales_order_date = cstr(r['transaction_date']) pp_so.customer = cstr(r['customer']) pp_so.grand_total = flt(r['base_grand_total']) + + def get_pending_material_requests(self): + """ Pull Material Requests that are pending based on criteria selected""" + mr_filter = item_filter = "" + if self.from_date: + mr_filter += " and mr.transaction_date >= %(from_date)s" + if self.to_date: + mr_filter += " and mr.transaction_date <= %(to_date)s" + if self.warehouse: + mr_filter += " and mr_item.warehouse = %(warehouse)s" + + if self.fg_item: + item_filter += " and item.name = %(item)s" - def get_items_from_so(self): - """ Pull items from Sales Order, only proction item - and subcontracted item will be pulled from Packing item - and add items in the table - """ - items = self.get_items() - self.add_items(items) + pending_mr = frappe.db.sql(""" + select distinct mr.name, mr.transaction_date + from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item + where mr_item.parent = mr.name + and mr.material_request_type = "Manufacture" + and mr.docstatus = 1 + and mr_item.qty > mr_item.ordered_qty {0} + and (exists (select name from `tabItem` item where item.name=mr_item.item_code + and (item.is_pro_applicable = 1 or item.is_sub_contracted_item = 1 {1}))) + """.format(mr_filter, item_filter), { + "from_date": self.from_date, + "to_date": self.to_date, + "warehouse": self.warehouse, + "item": self.fg_item + }, as_dict=1) + + self.add_mr_in_table(pending_mr) + + def add_mr_in_table(self, pending_mr): + """ Add Material Requests in the table""" + self.clear_mr_table() + + mr_list = [d.material_request for d in self.get('material_requests')] + for r in pending_mr: + if cstr(r['name']) not in mr_list: + mr = self.append('material_requests', {}) + mr.material_request = r['name'] + mr.material_request_date = cstr(r['transaction_date']) def get_items(self): + if self.plan_using == "Sales Order": + self.get_so_items() + elif self.plan_using == "Material Request": + self.get_mr_items() + + def get_so_items(self): so_list = filter(None, [d.sales_order for d in self.get('sales_orders')]) if not so_list: - msgprint(_("Please enter sales order in the above table")) + msgprint(_("Please enter Sales Orders in the above table")) return [] item_condition = "" @@ -131,24 +174,49 @@ class ProductionPlanningTool(Document): or item.is_sub_contracted_item = 1)) %s""" % \ (", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1) - return items + packed_items + self.add_items(items + packed_items) + + def get_mr_items(self): + mr_list = filter(None, [d.material_request for d in self.get('material_requests')]) + if not mr_list: + msgprint(_("Please enter Material Requests in the above table")) + return [] + item_condition = "" + if self.fg_item: + item_condition = ' and mr_item.item_code = "' + self.fg_item + '"' + + items = frappe.db.sql("""select distinct parent, name, item_code, warehouse, + (qty - ordered_qty) as pending_qty + from `tabMaterial Request Item` mr_item + where parent in (%s) and docstatus = 1 and qty > ordered_qty + and exists (select * from `tabItem` item where item.name=mr_item.item_code + and (item.is_pro_applicable = 1 + or item.is_sub_contracted_item = 1)) %s""" % \ + (", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1) + + self.add_items(items) + def add_items(self, items): self.clear_item_table() - for p in items: item_details = get_item_details(p['item_code']) pi = self.append('items', {}) - pi.sales_order = p['parent'] pi.warehouse = p['warehouse'] pi.item_code = p['item_code'] pi.description = item_details and item_details.description or '' pi.stock_uom = item_details and item_details.stock_uom or '' pi.bom_no = item_details and item_details.bom_no or '' - pi.so_pending_qty = flt(p['pending_qty']) pi.planned_qty = flt(p['pending_qty']) - + pi.pending_qty = flt(p['pending_qty']) + + if self.plan_using == "Sales Order": + pi.sales_order = p['parent'] + elif self.plan_using == "Material Request": + pi.material_request = p['parent'] + pi.material_request_item = p['name'] + def validate_data(self): self.validate_company() for d in self.get('items'): @@ -181,21 +249,38 @@ class ProductionPlanningTool(Document): item_dict, bom_dict = {}, {} for d in self.get("items"): if d.bom_no: - bom_dict.setdefault(d.bom_no, []).append([d.sales_order, flt(d.planned_qty)]) - if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): - item_dict[(d.item_code, d.sales_order, d.warehouse)] = { - "production_item" : d.item_code, - "sales_order" : d.sales_order, - "qty" : flt(item_dict.get((d.item_code, d.sales_order, d.warehouse), - {}).get("qty")) + flt(d.planned_qty), - "bom_no" : d.bom_no, - "description" : d.description, - "stock_uom" : d.stock_uom, - "company" : self.company, - "wip_warehouse" : "", - "fg_warehouse" : d.warehouse, - "status" : "Draft", - } + if self.plan_using == "Sales Order": + bom_dict.setdefault(d.bom_no, []).append([d.sales_order, flt(d.planned_qty)]) + if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): + item_dict[(d.item_code, d.sales_order, d.warehouse)] = { + "production_item" : d.item_code, + "sales_order" : d.sales_order, + "qty" : flt(item_dict.get((d.item_code, d.sales_order, d.warehouse), + {}).get("qty")) + flt(d.planned_qty), + "bom_no" : d.bom_no, + "description" : d.description, + "stock_uom" : d.stock_uom, + "company" : self.company, + "wip_warehouse" : "", + "fg_warehouse" : d.warehouse, + "status" : "Draft", + } + elif self.plan_using == "Material Request": + bom_dict.setdefault(d.bom_no, []).append([d.material_request_item, flt(d.planned_qty)]) + if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): + item_dict[(d.item_code, d.material_request_item, d.warehouse)] = { + "production_item" : d.item_code, + "material_request" : d.material_request, + "material_request_item" : d.material_request_item, + "qty" : d.planned_qty, + "bom_no" : d.bom_no, + "description" : d.description, + "stock_uom" : d.stock_uom, + "company" : self.company, + "wip_warehouse" : "", + "fg_warehouse" : d.warehouse, + "status" : "Draft", + } return bom_dict, item_dict def create_production_order(self, items): @@ -329,6 +414,8 @@ class ProductionPlanningTool(Document): for item_details in so_item_qty: if requested_qty: sales_order = item_details[4] or "No Sales Order" + if self.plan_using == "Material Request": + sales_order = "No Sales Order" if requested_qty <= item_details[0]: adjusted_qty = requested_qty else: From fd9dc5e9f5bb8da881bd9e7c10190448f269ea3e Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 12 Feb 2016 14:32:23 +0530 Subject: [PATCH 25/49] refactor code in Production Planning Tool --- .../production_plan_item.json | 77 ++++--- .../production_plan_material_request.json | 5 +- .../production_plan_sales_order.json | 16 +- .../production_planning_tool.js | 19 +- .../production_planning_tool.json | 4 +- .../production_planning_tool.py | 207 +++++++++--------- 6 files changed, 173 insertions(+), 155 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json index 6596e23401..6138435ae7 100644 --- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json +++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -116,6 +116,54 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "column_break_6", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "description": "Reserved Warehouse in Sales Order / Finished Goods Warehouse", + "fieldname": "warehouse", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Warehouse", + "length": 0, + "no_copy": 0, + "options": "Warehouse", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -160,7 +208,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -194,31 +242,6 @@ "unique": 0, "width": "100px" }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "description": "Reserved Warehouse in Sales Order / Finished Goods Warehouse", - "fieldname": "warehouse", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Warehouse", - "length": 0, - "no_copy": 0, - "options": "Warehouse", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -308,7 +331,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-02-10 07:08:38.461787", + "modified": "2016-02-11 05:08:19.492712", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Item", diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json index 0522e7a347..1a7c89485c 100644 --- a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json +++ b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json @@ -66,7 +66,7 @@ "bold": 0, "collapsible": 0, "fieldname": "material_request_date", - "fieldtype": "Date", + "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -76,6 +76,7 @@ "no_copy": 0, "oldfieldname": "document_date", "oldfieldtype": "Date", + "options": "material_request.transaction_date", "permlevel": 0, "precision": "", "print_hide": 0, @@ -99,7 +100,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-02-10 05:13:07.529068", + "modified": "2016-02-11 04:21:34.372317", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Material Request", diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json index bed893f921..85bf7d6d60 100644 --- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json +++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json @@ -41,7 +41,7 @@ "bold": 0, "collapsible": 0, "fieldname": "sales_order_date", - "fieldtype": "Date", + "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -51,11 +51,12 @@ "no_copy": 0, "oldfieldname": "document_date", "oldfieldtype": "Date", + "options": "sales_order.transaction_date", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, "print_width": "120px", - "read_only": 1, + "read_only": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -91,7 +92,7 @@ "bold": 0, "collapsible": 0, "fieldname": "customer", - "fieldtype": "Link", + "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -99,7 +100,7 @@ "label": "Customer", "length": 0, "no_copy": 0, - "options": "Customer", + "options": "sales_order.customer", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -116,8 +117,9 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "default": "", "fieldname": "grand_total", - "fieldtype": "Currency", + "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -125,7 +127,7 @@ "label": "Grand Total", "length": 0, "no_copy": 0, - "options": "Company:company:default_currency", + "options": "sales_order.base_grand_total", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -148,7 +150,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-02-10 05:13:30.301297", + "modified": "2016-02-11 04:17:42.849873", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Sales Order", diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js index 15c4245fe5..3fa1160d7e 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js @@ -5,24 +5,25 @@ frappe.require("assets/erpnext/js/utils.js"); cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.set_value("company", frappe.defaults.get_user_default("Company")) - cur_frm.set_value("use_multi_level_bom", 1) } cur_frm.cscript.refresh = function(doc) { cur_frm.disable_save(); } -cur_frm.cscript.sales_order = function(doc,cdt,cdn) { - var d = locals[cdt][cdn]; - if (d.sales_order) { - return get_server_fields('get_so_details', d.sales_order, 'sales_orders', doc, cdt, cdn, 1); - } -} - cur_frm.cscript.item_code = function(doc,cdt,cdn) { var d = locals[cdt][cdn]; if (d.item_code) { - return get_server_fields('get_item_details', d.item_code, 'items', doc, cdt, cdn, 1); + frappe.call({ + method: "erpnext.manufacturing.doctype.production_order.production_order.get_item_details", + args: { + "item" : d.item_code + }, + callback: function(r) { + $.extend(d, r.message); + refresh_field("items"); + } + }); } } diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json index 3f047138fd..19b5fd9784 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json @@ -510,7 +510,7 @@ "label": "Create Production Orders", "length": 0, "no_copy": 0, - "options": "raise_production_order", + "options": "raise_production_orders", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -629,7 +629,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2016-02-10 07:28:50.298538", + "modified": "2016-02-11 06:18:45.077263", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Planning Tool", diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index 4be22e4080..bec97d1c03 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -16,28 +16,8 @@ class ProductionPlanningTool(Document): super(ProductionPlanningTool, self).__init__(arg1, arg2) self.item_dict = {} - def get_so_details(self, so): - """Pull other details from so""" - so = frappe.db.sql("""select transaction_date, customer, base_grand_total - from `tabSales Order` where name = %s""", so, as_dict = 1) - ret = { - 'sales_order_date': so and so[0]['transaction_date'] or '', - 'customer' : so[0]['customer'] or '', - 'grand_total': so[0]['base_grand_total'] - } - return ret - - def get_item_details(self, item_code): - return get_item_details(item_code) - - def clear_so_table(self): - self.set('sales_orders', []) - - def clear_mr_table(self): - self.set('material_requests', []) - - def clear_item_table(self): - self.set('items', []) + def clear_table(self, table_name): + self.set(table_name, []) def validate_company(self): if not self.company: @@ -81,7 +61,7 @@ class ProductionPlanningTool(Document): def add_so_in_table(self, open_so): """ Add sales orders in the table""" - self.clear_so_table() + self.clear_table("sales_orders") so_list = [d.sales_order for d in self.get('sales_orders')] for r in open_so: @@ -125,7 +105,7 @@ class ProductionPlanningTool(Document): def add_mr_in_table(self, pending_mr): """ Add Material Requests in the table""" - self.clear_mr_table() + self.clear_table("material_requests") mr_list = [d.material_request for d in self.get('material_requests')] for r in pending_mr: @@ -199,7 +179,7 @@ class ProductionPlanningTool(Document): def add_items(self, items): - self.clear_item_table() + self.clear_table("items") for p in items: item_details = get_item_details(p['item_code']) pi = self.append('items', {}) @@ -220,97 +200,108 @@ class ProductionPlanningTool(Document): def validate_data(self): self.validate_company() for d in self.get('items'): - validate_bom_no(d.item_code, d.bom_no) + if not d.bom_no: + frappe.throw(_("Please select BOM for Item in Row {0}".format(d.idx))) + else: + validate_bom_no(d.item_code, d.bom_no) + if not flt(d.planned_qty): frappe.throw(_("Please enter Planned Qty for Item {0} at row {1}").format(d.item_code, d.idx)) - def raise_production_order(self): + def raise_production_orders(self): """It will raise production order (Draft) for all distinct FG items""" self.validate_data() from erpnext.utilities.transaction_base import validate_uom_is_integer validate_uom_is_integer(self, "stock_uom", "planned_qty") - items = self.get_distinct_items_and_boms()[1] - pro = self.create_production_order(items) - if pro: - pro = ["""%s""" % \ - (p, p) for p in pro] - msgprint(_("{0} created").format(comma_and(pro))) + items = self.get_production_items() + + pro_list = [] + frappe.flags.mute_messages = True + + for key in items: + production_order = self.create_production_order(items[key]) + if production_order: + pro_list.append(production_order) + + frappe.flags.mute_messages = False + + if pro_list: + pro_list = ["""%s""" % \ + (p, p) for p in pro_list] + msgprint(_("{0} created").format(comma_and(pro_list))) else : msgprint(_("No Production Orders created")) - def get_distinct_items_and_boms(self): - """ Club similar BOM and item for processing + def get_production_items(self): + item_dict = {} + for d in self.get("items"): + item_details= { + "production_item" : d.item_code, + "sales_order" : d.sales_order, + "material_request" : d.material_request, + "material_request_item" : d.material_request_item, + "bom_no" : d.bom_no, + "description" : d.description, + "stock_uom" : d.stock_uom, + "company" : self.company, + "wip_warehouse" : "", + "fg_warehouse" : d.warehouse, + "status" : "Draft", + } + + """ Club similar BOM and item for processing in case of Sales Orders """ + if self.plan_using == "Sales Order": + item_details.update({ + "qty":flt(item_dict.get((d.item_code, d.sales_order, d.warehouse),{}) + .get("qty")) + flt(d.planned_qty) + }) + item_dict[(d.item_code, d.sales_order, d.warehouse)] = item_details + + elif self.plan_using == "Material Request": + item_details.update({ + "qty": d.planned_qty + }) + item_dict[(d.item_code, d.material_request_item, d.warehouse)] = item_details + + return item_dict + + def create_production_order(self, item_dict): + """Create production order. Called from Production Planning Tool""" + from erpnext.manufacturing.doctype.production_order.production_order import OverProductionError, get_default_warehouse + warehouse = get_default_warehouse() + pro = frappe.new_doc("Production Order") + pro.update(item_dict) + pro.set_production_order_operations() + if warehouse: + pro.wip_warehouse = warehouse.get('wip_warehouse') + if not pro.fg_warehouse: + pro.fg_warehouse = warehouse.get('fg_warehouse') + + try: + pro.insert() + return pro.name + except OverProductionError: + pass + + def get_so_wise_planned_qty(self): + """ bom_dict { bom_no: ['sales_order', 'qty'] } """ - item_dict, bom_dict = {}, {} + bom_dict = {} for d in self.get("items"): - if d.bom_no: - if self.plan_using == "Sales Order": - bom_dict.setdefault(d.bom_no, []).append([d.sales_order, flt(d.planned_qty)]) - if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): - item_dict[(d.item_code, d.sales_order, d.warehouse)] = { - "production_item" : d.item_code, - "sales_order" : d.sales_order, - "qty" : flt(item_dict.get((d.item_code, d.sales_order, d.warehouse), - {}).get("qty")) + flt(d.planned_qty), - "bom_no" : d.bom_no, - "description" : d.description, - "stock_uom" : d.stock_uom, - "company" : self.company, - "wip_warehouse" : "", - "fg_warehouse" : d.warehouse, - "status" : "Draft", - } - elif self.plan_using == "Material Request": - bom_dict.setdefault(d.bom_no, []).append([d.material_request_item, flt(d.planned_qty)]) - if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"): - item_dict[(d.item_code, d.material_request_item, d.warehouse)] = { - "production_item" : d.item_code, - "material_request" : d.material_request, - "material_request_item" : d.material_request_item, - "qty" : d.planned_qty, - "bom_no" : d.bom_no, - "description" : d.description, - "stock_uom" : d.stock_uom, - "company" : self.company, - "wip_warehouse" : "", - "fg_warehouse" : d.warehouse, - "status" : "Draft", - } - return bom_dict, item_dict - - def create_production_order(self, items): - """Create production order. Called from Production Planning Tool""" - from erpnext.manufacturing.doctype.production_order.production_order import OverProductionError, get_default_warehouse - warehouse = get_default_warehouse() - pro_list = [] - for key in items: - pro = frappe.new_doc("Production Order") - pro.update(items[key]) - pro.set_production_order_operations() - if warehouse: - pro.wip_warehouse = warehouse.get('wip_warehouse') - if not pro.fg_warehouse: - pro.fg_warehouse = warehouse.get('fg_warehouse') - frappe.flags.mute_messages = True - - try: - pro.insert() - pro_list.append(pro.name) - except OverProductionError: - pass - - frappe.flags.mute_messages = False - return pro_list - + if self.plan_using == "Sales Order": + bom_dict.setdefault(d.bom_no, []).append({d.sales_order: flt(d.planned_qty)}) + elif self.plan_using == "Material Request": + bom_dict.setdefault(d.bom_no, []).append({d.material_request_item: flt(d.planned_qty)}) + def download_raw_materials(self): """ Create csv data for required raw material to produce finished goods""" self.validate_data() - bom_dict = self.get_distinct_items_and_boms()[0] + bom_dict = self.get_so_wise_planned_qty() self.get_raw_materials(bom_dict) return self.get_csv() @@ -389,7 +380,7 @@ class ProductionPlanningTool(Document): if not self.purchase_request_for_warehouse: frappe.throw(_("Please enter Warehouse for which Material Request will be raised")) - bom_dict = self.get_distinct_items_and_boms()[0] + bom_dict = self.get_so_wise_planned_qty() self.get_raw_materials(bom_dict) if self.item_dict: @@ -445,12 +436,12 @@ class ProductionPlanningTool(Document): def insert_purchase_request(self): items_to_be_requested = self.get_requested_items() - purchase_request_list = [] + material_request_list = [] if items_to_be_requested: for item in items_to_be_requested: item_wrapper = frappe.get_doc("Item", item) - pr_doc = frappe.new_doc("Material Request") - pr_doc.update({ + material_request = frappe.new_doc("Material Request") + material_request.update({ "transaction_date": nowdate(), "status": "Draft", "company": self.company, @@ -458,7 +449,7 @@ class ProductionPlanningTool(Document): "material_request_type": "Purchase" }) for sales_order, requested_qty in items_to_be_requested[item].items(): - pr_doc.append("items", { + material_request.append("items", { "doctype": "Material Request Item", "__islocal": 1, "item_code": item, @@ -473,13 +464,13 @@ class ProductionPlanningTool(Document): "sales_order": sales_order if sales_order!="No Sales Order" else None }) - pr_doc.flags.ignore_permissions = 1 - pr_doc.submit() - purchase_request_list.append(pr_doc.name) + material_request.flags.ignore_permissions = 1 + material_request.submit() + material_request_list.append(material_request.name) - if purchase_request_list: - pur_req = ["""%s""" % \ - (p, p) for p in purchase_request_list] - msgprint(_("Material Requests {0} created").format(comma_and(pur_req))) + if material_request_list: + message = ["""%s""" % \ + (p, p) for p in material_request_list] + msgprint(_("Material Requests {0} created").format(comma_and(message))) else: msgprint(_("Nothing to request")) From d5e15eaadfdfb05292219fcb0453dc0e790b6971 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 16 Feb 2016 15:41:43 +0530 Subject: [PATCH 26/49] Added test cases --- .../erpnext/material-request-workflow.jpg | Bin 11600 -> 37471 bytes .../models/stock/material_request_item.html | 50 +++++++----------- .../material_request/material_request.py | 4 +- .../material_request/test_material_request.py | 20 +++++++ .../material_request/test_records.json | 21 ++++++++ 5 files changed, 62 insertions(+), 33 deletions(-) diff --git a/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg b/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg index 6846fa5baac84ed2655008cb9a2f03e2b3c662e1..c462e209f1a1b0331d39ed382541e866370c4c1a 100644 GIT binary patch literal 37471 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

|cmcq}CcKr&XYI_UHsl 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 diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html index 2988065b2a..d1d8f6fbca 100644 --- a/erpnext/docs/current/models/stock/material_request_item.html +++ b/erpnext/docs/current/models/stock/material_request_item.html @@ -123,30 +123,16 @@

7 image - Attach + Attach Image Image
8image_view - Image - Image View - - - 
image
-
98 quantity_and_warehouse Section Break
109 qty Float
1110 uom Link
1211 warehouse Link
1312 col_break2 Column Break
1413 schedule_date Date
1514 more_info Section Break
1615 item_group Link
1716 brand Link
1817 lead_time_date Date
1918 sales_order Link
2019 col_break3 Column Break
2120 min_order_qty Float
2221 projected_qty Float
2322 ordered_qty Float
2423 page_break Check