mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-21 05:59:18 +00:00
merge
This commit is contained in:
@@ -1 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
@@ -1,13 +0,0 @@
|
||||
[
|
||||
"Selling",
|
||||
"Description",
|
||||
"Sales and Purchase Return Item",
|
||||
"Qty",
|
||||
"Serial No",
|
||||
"Rate",
|
||||
"Detail Name",
|
||||
"Batch No",
|
||||
"Returned Qty",
|
||||
"Item Code",
|
||||
"UOM"
|
||||
]
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "\u0644\u0627 \u062f\u0641\u0639\u0629",
|
||||
"Description": "\u0648\u0635\u0641",
|
||||
"Detail Name": "\u0627\u0644\u0627\u0633\u0645",
|
||||
"Item Code": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0631\u0645\u0632",
|
||||
"Qty": "\u0627\u0644\u0643\u0645\u064a\u0629",
|
||||
"Rate": "\u0645\u0639\u062f\u0644",
|
||||
"Returned Qty": "\u0639\u0627\u062f \u0627\u0644\u0643\u0645\u064a\u0629",
|
||||
"Sales and Purchase Return Item": "\u0645\u0628\u064a\u0639\u0627\u062a \u0648\u0634\u0631\u0627\u0621 \u0627\u0644\u0633\u0644\u0639\u0629 \u0627\u0644\u0639\u0648\u062f\u0629",
|
||||
"Selling": "\u0628\u064a\u0639",
|
||||
"Serial No": "\u0627\u0644\u0645\u0633\u0644\u0633\u0644 \u0644\u0627",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "Batch No",
|
||||
"Description": "Beschreibung",
|
||||
"Detail Name": "Detail Name",
|
||||
"Item Code": "Item Code",
|
||||
"Qty": "Menge",
|
||||
"Rate": "Rate",
|
||||
"Returned Qty": "Kehrte Menge",
|
||||
"Sales and Purchase Return Item": "Sales and Purchase Zur\u00fcck Artikel",
|
||||
"Selling": "Verkauf",
|
||||
"Serial No": "Serial In",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "Lote n \u00ba",
|
||||
"Description": "Descripci\u00f3n",
|
||||
"Detail Name": "Detalle Nombre",
|
||||
"Item Code": "C\u00f3digo del art\u00edculo",
|
||||
"Qty": "Cantidad",
|
||||
"Rate": "Velocidad",
|
||||
"Returned Qty": "Cantidad devuelta",
|
||||
"Sales and Purchase Return Item": "Venta y Compra de art\u00edculo de vuelta",
|
||||
"Selling": "De venta",
|
||||
"Serial No": "N\u00famero de orden",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "Aucun lot",
|
||||
"Description": "Description",
|
||||
"Detail Name": "Nom de d\u00e9tails",
|
||||
"Item Code": "Code de l'article",
|
||||
"Qty": "Qt\u00e9",
|
||||
"Rate": "Taux",
|
||||
"Returned Qty": "Quantit\u00e9 retourn\u00e9e",
|
||||
"Sales and Purchase Return Item": "Vente et achat du lot Retour",
|
||||
"Selling": "Vente",
|
||||
"Serial No": "N \u00b0 de s\u00e9rie",
|
||||
"UOM": "Emballage"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "\u0915\u094b\u0908 \u092c\u0948\u091a",
|
||||
"Description": "\u0935\u093f\u0935\u0930\u0923",
|
||||
"Detail Name": "\u0935\u093f\u0938\u094d\u0924\u093e\u0930 \u0938\u0947 \u0928\u093e\u092e",
|
||||
"Item Code": "\u0906\u0907\u091f\u092e \u0915\u094b\u0921",
|
||||
"Qty": "\u092e\u093e\u0924\u094d\u0930\u093e",
|
||||
"Rate": "\u0926\u0930",
|
||||
"Returned Qty": "\u0935\u093e\u092a\u0938 \u0906 \u0917\u090f \u092e\u093e\u0924\u094d\u0930\u093e",
|
||||
"Sales and Purchase Return Item": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0914\u0930 \u0916\u0930\u0940\u0926 \u0915\u0947 \u092e\u0926 \u0935\u093e\u092a\u0938\u0940",
|
||||
"Selling": "\u0935\u093f\u0915\u094d\u0930\u092f",
|
||||
"Serial No": "\u0928\u0939\u0940\u0902 \u0938\u0940\u0930\u093f\u092f\u0932",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "Hrpa Ne",
|
||||
"Description": "Opis",
|
||||
"Detail Name": "Detalj Ime",
|
||||
"Item Code": "Stavka \u0160ifra",
|
||||
"Qty": "Kol",
|
||||
"Rate": "Stopa",
|
||||
"Returned Qty": "Vra\u0107eno Kol",
|
||||
"Sales and Purchase Return Item": "Prodaja i kupnja Povratak Stavka",
|
||||
"Selling": "Prodaja",
|
||||
"Serial No": "Serijski br",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "Batch nr.",
|
||||
"Description": "Beschrijving",
|
||||
"Detail Name": "Detail Naam",
|
||||
"Item Code": "Artikelcode",
|
||||
"Qty": "Aantal",
|
||||
"Rate": "Tarief",
|
||||
"Returned Qty": "Geretourneerde Aantal",
|
||||
"Sales and Purchase Return Item": "Verkoop en Inkoop Return Item",
|
||||
"Selling": "Selling",
|
||||
"Serial No": "Serienummer",
|
||||
"UOM": "Verpakking"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "N\u00ba do Lote",
|
||||
"Description": "Descri\u00e7\u00e3o",
|
||||
"Detail Name": "Nome do Detalhe",
|
||||
"Item Code": "C\u00f3digo do Item",
|
||||
"Qty": "Qtde.",
|
||||
"Rate": "Taxa",
|
||||
"Returned Qty": "Qtde. retornada",
|
||||
"Sales and Purchase Return Item": "Item de retorno de compra e venda",
|
||||
"Selling": "Vendas",
|
||||
"Serial No": "N\u00ba de S\u00e9rie",
|
||||
"UOM": "UDM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "No lote",
|
||||
"Description": "Descri\u00e7\u00e3o",
|
||||
"Detail Name": "Nome detalhes",
|
||||
"Item Code": "C\u00f3digo do artigo",
|
||||
"Qty": "Qty",
|
||||
"Rate": "Taxa",
|
||||
"Returned Qty": "Qtde voltou",
|
||||
"Sales and Purchase Return Item": "Vendas e item retorno de compra",
|
||||
"Selling": "Vendendo",
|
||||
"Serial No": "N \u00ba de S\u00e9rie",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "\u0413\u0440\u0443\u043f\u043d\u043e \u041d\u0435\u043c\u0430",
|
||||
"Description": "\u041e\u043f\u0438\u0441",
|
||||
"Detail Name": "\u0414\u0435\u0442\u0430\u0459 \u0418\u043c\u0435",
|
||||
"Item Code": "\u0428\u0438\u0444\u0440\u0430",
|
||||
"Qty": "\u041a\u043e\u043b",
|
||||
"Rate": "\u0421\u0442\u043e\u043f\u0430",
|
||||
"Returned Qty": "\u0412\u0440\u0430\u045b\u0435\u043d\u0438 \u041a\u043e\u043b",
|
||||
"Sales and Purchase Return Item": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430 \u0438 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u041f\u043e\u0432\u0440\u0430\u0442\u0430\u043a \u0430\u0443\u043a\u0446\u0438\u0458\u0438",
|
||||
"Selling": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430",
|
||||
"Serial No": "\u0421\u0435\u0440\u0438\u0458\u0441\u043a\u0438 \u0431\u0440\u043e\u0458",
|
||||
"UOM": "\u0423\u041e\u041c"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "\u0ba4\u0bc6\u0bbe\u0b95\u0bc1\u0ba4\u0bbf \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
|
||||
"Description": "\u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0bae\u0bcd",
|
||||
"Detail Name": "\u0bb5\u0bbf\u0bb0\u0bbf\u0bb5\u0bbe\u0b95 \u0baa\u0bc6\u0baf\u0bb0\u0bcd",
|
||||
"Item Code": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0baf\u0bc8 \u0b95\u0bc7\u0bbe\u0b9f\u0bcd",
|
||||
"Qty": "\u0b85\u0bb3\u0bb5\u0bc1",
|
||||
"Rate": "\u0bb5\u0bbf\u0bb2\u0bc8",
|
||||
"Returned Qty": "\u0ba4\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bbf \u0b85\u0bb3\u0bb5\u0bc1",
|
||||
"Sales and Purchase Return Item": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa \u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf",
|
||||
"Selling": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8",
|
||||
"Serial No": "\u0b87\u0bb2\u0bcd\u0bb2\u0bc8 \u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd",
|
||||
"UOM": "\u0bae\u0bc6\u0bbe\u0bb1\u0b9f\u0bcd\u0b9f\u0bc1\u0bb5 \u0baa\u0bb2\u0bcd\u0b95\u0bb2\u0bc8\u0b95\u0bb4\u0b95\u0bae\u0bcd"
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Batch No": "\u0e0a\u0e38\u0e14\u0e44\u0e21\u0e48\u0e21\u0e35",
|
||||
"Description": "\u0e25\u0e31\u0e01\u0e29\u0e13\u0e30",
|
||||
"Detail Name": "\u0e0a\u0e37\u0e48\u0e2d\u0e23\u0e32\u0e22\u0e25\u0e30\u0e40\u0e2d\u0e35\u0e22\u0e14",
|
||||
"Item Code": "\u0e23\u0e2b\u0e31\u0e2a\u0e2a\u0e34\u0e19\u0e04\u0e49\u0e32",
|
||||
"Qty": "\u0e08\u0e33\u0e19\u0e27\u0e19",
|
||||
"Rate": "\u0e2d\u0e31\u0e15\u0e23\u0e32",
|
||||
"Returned Qty": "\u0e08\u0e33\u0e19\u0e27\u0e19\u0e01\u0e25\u0e31\u0e1a",
|
||||
"Sales and Purchase Return Item": "\u0e01\u0e32\u0e23\u0e02\u0e32\u0e22\u0e41\u0e25\u0e30\u0e01\u0e32\u0e23\u0e0b\u0e37\u0e49\u0e2d\u0e2a\u0e34\u0e19\u0e04\u0e49\u0e32\u0e01\u0e25\u0e31\u0e1a",
|
||||
"Selling": "\u0e02\u0e32\u0e22",
|
||||
"Serial No": "\u0e2d\u0e19\u0e38\u0e01\u0e23\u0e21\u0e44\u0e21\u0e48\u0e21\u0e35",
|
||||
"UOM": "UOM"
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from __future__ import unicode_literals
|
||||
import webnotes
|
||||
|
||||
class DocType:
|
||||
def __init__(self, d, dl):
|
||||
self.doc, self.doclist = d, dl
|
||||
@@ -1,110 +0,0 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-02-22 01:27:52",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-03-07 07:03:30",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "wasim@webnotestech.com"
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"istable": 1,
|
||||
"module": "Selling",
|
||||
"name": "__common__"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"name": "__common__",
|
||||
"parent": "Sales and Purchase Return Item",
|
||||
"parentfield": "fields",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Sales and Purchase Return Item"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "item_code",
|
||||
"fieldtype": "Link",
|
||||
"label": "Item Code",
|
||||
"oldfieldname": "item_code",
|
||||
"oldfieldtype": "Link",
|
||||
"options": "Item",
|
||||
"read_only": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "description",
|
||||
"fieldtype": "Data",
|
||||
"label": "Description",
|
||||
"oldfieldname": "description",
|
||||
"oldfieldtype": "Data",
|
||||
"print_width": "300px",
|
||||
"read_only": 1,
|
||||
"width": "300px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "uom",
|
||||
"fieldtype": "Link",
|
||||
"label": "UOM",
|
||||
"oldfieldname": "uom",
|
||||
"oldfieldtype": "Link",
|
||||
"options": "UOM",
|
||||
"read_only": 1,
|
||||
"search_index": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "rate",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Rate",
|
||||
"oldfieldname": "rate",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "qty",
|
||||
"fieldtype": "Data",
|
||||
"label": "Qty",
|
||||
"oldfieldname": "qty",
|
||||
"oldfieldtype": "Data",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "returned_qty",
|
||||
"fieldtype": "Data",
|
||||
"label": "Returned Qty",
|
||||
"oldfieldname": "returned_qty",
|
||||
"oldfieldtype": "Data",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "serial_no",
|
||||
"fieldtype": "Small Text",
|
||||
"label": "Serial No"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "batch_no",
|
||||
"fieldtype": "Data",
|
||||
"label": "Batch No"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "detail_name",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Detail Name",
|
||||
"oldfieldname": "detail_name",
|
||||
"oldfieldtype": "Data",
|
||||
"read_only": 1
|
||||
}
|
||||
]
|
||||
@@ -120,12 +120,6 @@ wn.module_page["Selling"] = [
|
||||
title: wn._("Tools"),
|
||||
icon: "icon-wrench",
|
||||
items: [
|
||||
{
|
||||
"route":"Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool",
|
||||
"label":wn._("Sales Returns"),
|
||||
"description":wn._("Helper for managing return of goods (sales or purchase)"),
|
||||
doctype: "Sales and Purchase Return Tool"
|
||||
},
|
||||
{
|
||||
"route":"Form/SMS Center/SMS Center",
|
||||
"label":wn._("SMS Center"),
|
||||
|
||||
Reference in New Issue
Block a user