Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait 2013-02-21 14:53:42 +05:30
commit c924c1ebb5
417 changed files with 3228 additions and 1987 deletions

View File

@ -20,7 +20,7 @@ import webnotes
from webnotes.utils import cstr, flt, getdate, now, nowdate
from webnotes.model import db_exists
from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist, copy_doclist
from webnotes.model.bean import getlist, copy_doclist
from webnotes import msgprint
sql = webnotes.conn.sql

View File

@ -19,7 +19,7 @@ import webnotes
from webnotes.utils import flt
from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes import msgprint
class DocType:

View File

@ -18,7 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import flt, getdate
from webnotes.model.doc import make_autoname
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
class DocType:
def __init__(self,d,dl):

View File

@ -16,7 +16,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes import msgprint
from webnotes.utils.nestedset import DocTypeNestedSet

View File

@ -19,7 +19,7 @@ import webnotes
from webnotes.utils import cint, cstr, flt, fmt_money, formatdate, getdate
from webnotes.model.doc import addchild, make_autoname
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
from setup.utils import get_company_currency

View File

@ -17,11 +17,13 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import cint, cstr, flt, get_defaults, get_first_day, get_last_day, has_common
from webnotes.utils import cint, cstr, flt, get_first_day, get_last_day, has_common
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
from webnotes import session, msgprint
import webnotes.defaults
sql = webnotes.conn.sql
from accounts.utils import get_balance_on, get_fiscal_year
@ -65,7 +67,7 @@ class DocType:
#--- from month and to month (for MIS - Comparison Report) -------
month_list = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
fiscal_start_month = sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(get_defaults()['fiscal_year']))
fiscal_start_month = sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(webnotes.defaults.get_global_value("fiscal_year")))
fiscal_start_month = fiscal_start_month and fiscal_start_month[0][0] or 1
mon = ['']
for i in range(fiscal_start_month,13): mon.append(month_list[i-1])

View File

@ -19,7 +19,7 @@ import webnotes
from webnotes.utils import flt
from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes import msgprint
class DocType:

View File

@ -20,7 +20,7 @@ import webnotes
from webnotes.utils import cstr, flt, getdate
from webnotes.model import db_exists
from webnotes.model.doc import Document
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
from webnotes.model.code import get_obj
from webnotes import msgprint

View File

@ -18,7 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
from webnotes import msgprint
sql = webnotes.conn.sql

View File

@ -17,12 +17,14 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import add_days, cint, cstr, flt, formatdate, get_defaults
from webnotes.model.wrapper import getlist
from webnotes.utils import add_days, cint, cstr, flt, formatdate
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint, _
from setup.utils import get_company_currency
import webnotes.defaults
sql = webnotes.conn.sql
from controllers.buying_controller import BuyingController
@ -32,10 +34,6 @@ class DocType(BuyingController):
self.tname = 'Purchase Invoice Item'
self.fname = 'entries'
# ************************** Trigger Functions ****************************
# Credit To
# ----------
def get_credit_to(self):
acc_head = sql("select name, credit_days from `tabAccount` where (name = %s or (master_name = %s and master_type = 'supplier')) and docstatus != 2", (cstr(self.doc.supplier) + " - " + self.get_company_abbr(),self.doc.supplier))
@ -57,9 +55,6 @@ class DocType(BuyingController):
return ret
# Get Default Cost Center and Expense Head from Item Master
# ----------------------------------------------------------
def get_default_values(self,args):
import json
args = json.loads(args)
@ -73,9 +68,6 @@ class DocType(BuyingController):
ret['cost_center'] = cost_center and cost_center[0][0] or ''
return ret
# Get Items based on PO or PR
# ----------------------------
def pull_details(self):
if self.doc.purchase_receipt_main:
self.validate_duplicate_docname('purchase_receipt')
@ -118,16 +110,9 @@ class DocType(BuyingController):
ret={'add_tax_rate' :rate and flt(rate[0][0]) or 0 }
return ret
# *************************** Server Utility Functions *****************************
# Get Company abbr
# -----------------
def get_company_abbr(self):
return sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0]
# Check whether PO or PR is already fetched
# ------------------------------------------
def validate_duplicate_docname(self,doctype):
for d in getlist(self.doclist, 'entries'):
if doctype == 'purchase_receipt' and cstr(self.doc.purchase_receipt_main) == cstr(d.purchase_receipt):
@ -138,11 +123,6 @@ class DocType(BuyingController):
msgprint(cstr(self.doc.purchase_order_main) + " purchase order details have already been pulled.")
raise Exception , " Validation Error. "
# **************************** VALIDATE ********************************
# Check for Item.is_Purchase_item = 'Yes' and Item is active
# ------------------------------------------------------------------
def check_active_purchase_items(self):
for d in getlist(self.doclist, 'entries'):
if d.item_code: # extra condn coz item_code is not mandatory in PV
@ -154,8 +134,6 @@ class DocType(BuyingController):
msgprint("Item : '%s' is not Purchase Item"%(d.item_code))
raise Exception
# Check Conversion Rate
# ----------------------
def check_conversion_rate(self):
default_currency = get_company_currency(self.doc.company)
if not default_currency:
@ -259,7 +237,7 @@ class DocType(BuyingController):
raise Exception
# import_rate
rate = flt(sql('select import_rate from `tabPurchase Order Item` where item_code=%s and parent=%s and name = %s', (d.item_code, d.purchase_order, d.po_detail))[0][0])
if abs(rate - flt(d.import_rate)) > 1 and cint(get_defaults('maintain_same_rate')):
if abs(rate - flt(d.import_rate)) > 1 and cint(webnotes.defaults.get_global_default('maintain_same_rate')):
msgprint("Import Rate for %s in the Purchase Order is %s. Rate must be same as Purchase Order Rate" % (d.item_code,rate))
raise Exception
@ -277,9 +255,6 @@ class DocType(BuyingController):
msgprint("Aging Date is mandatory for opening entry")
raise Exception
# Set against account for debit to account
#------------------------------------------
def set_against_expense_account(self):
against_acc = []
for d in getlist(self.doclist, 'entries'):
@ -287,8 +262,6 @@ class DocType(BuyingController):
against_acc.append(d.expense_account)
self.doc.against_expense_account = ','.join(against_acc)
#check in manage account if purchase order required or not.
# ====================================================================================
def po_required(self):
res = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'po_required'")
if res and res[0][0] == 'Yes':
@ -297,8 +270,6 @@ class DocType(BuyingController):
msgprint("Purchse Order No. required against item %s"%d.item_code)
raise Exception
#check in manage account if purchase receipt required or not.
# ====================================================================================
def pr_required(self):
res = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'pr_required'")
if res and res[0][0] == 'Yes':

View File

@ -25,7 +25,7 @@ test_dependencies = ["Item", "Cost Center"]
class TestPurchaseInvoice(unittest.TestCase):
def test_gl_entries(self):
wrapper = webnotes.model_wrapper(self.get_test_doclist())
wrapper = webnotes.bean(self.get_test_doclist())
# circumvent the disabled calculation call
obj = webnotes.get_obj(doc=wrapper.doc, doclist=wrapper.doclist)
@ -54,7 +54,7 @@ class TestPurchaseInvoice(unittest.TestCase):
self.assertEqual([d.debit, d.credit], expected_gl_entries.get(d.account))
def test_purchase_invoice_calculation(self):
wrapper = webnotes.model_wrapper(self.get_test_doclist())
wrapper = webnotes.bean(self.get_test_doclist())
# circumvent the disabled calculation call
obj = webnotes.get_obj(doc=wrapper.doc, doclist=wrapper.doclist)

View File

@ -18,7 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
from webnotes.model.code import get_obj
sql = webnotes.conn.sql

View File

@ -20,7 +20,7 @@ import webnotes
from webnotes.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, sendmail
from webnotes.utils import comma_and
from webnotes.model.doc import make_autoname
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import _, msgprint
@ -858,7 +858,7 @@ def manage_recurring_invoices(next_date=None):
where posting_date=%s and recurring_id=%s and docstatus=1""",
(next_date, recurring_id)):
try:
ref_wrapper = webnotes.model_wrapper('Sales Invoice', ref_invoice)
ref_wrapper = webnotes.bean('Sales Invoice', ref_invoice)
new_invoice_wrapper = make_new_invoice(ref_wrapper, next_date)
send_notification(new_invoice_wrapper)
webnotes.conn.commit()
@ -880,7 +880,7 @@ def manage_recurring_invoices(next_date=None):
raise Exception, exception_message
def make_new_invoice(ref_wrapper, posting_date):
from webnotes.model.wrapper import clone
from webnotes.model.bean import clone
from accounts.utils import get_fiscal_year
new_invoice = clone(ref_wrapper)

View File

@ -3,7 +3,7 @@ import unittest
class TestSalesInvoice(unittest.TestCase):
def make(self):
w = webnotes.model_wrapper(webnotes.copy_doclist(test_records[0]))
w = webnotes.bean(webnotes.copy_doclist(test_records[0]))
w.insert()
w.submit()
return w
@ -17,7 +17,7 @@ class TestSalesInvoice(unittest.TestCase):
from accounts.doctype.journal_voucher.test_journal_voucher \
import test_records as jv_test_records
jv = webnotes.model_wrapper(webnotes.copy_doclist(jv_test_records[0]))
jv = webnotes.bean(webnotes.copy_doclist(jv_test_records[0]))
jv.doclist[1].against_invoice = w.doc.name
jv.insert()
jv.submit()

View File

@ -19,7 +19,7 @@ import webnotes
from webnotes.utils import add_days, add_months, cint, cstr
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
sql = webnotes.conn.sql

View File

@ -1,6 +1,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import get_defaults
import webnotes.defaults
from accounts.utils import get_balance_on
@webnotes.whitelist()
@ -16,8 +17,8 @@ def get_companies():
if r["role"] in roles and r["match"]=="company"))
# if match == company is specified and companies are specified in user defaults
if match and webnotes.user.get_defaults().get("company"):
return webnotes.user.get_defaults().get("company")
if match:
return webnotes.defaults.get_user_default_as_list("company")
else:
return [r[0] for r in webnotes.conn.sql("""select name from tabCompany
where docstatus!=2""")]

View File

@ -65,7 +65,7 @@ def map_fields(field_list, source, target):
def import_vouchers(common_values, data, start_idx, import_type):
from webnotes.model.doc import Document
from webnotes.model.wrapper import ModelWrapper
from webnotes.model.bean import Bean
from accounts.utils import get_fiscal_year
from webnotes.utils.dateutils import parse_date
@ -159,7 +159,7 @@ def import_vouchers(common_values, data, start_idx, import_type):
If you entered accounts correctly, please check template once"""]
raise Exception
doclist = ModelWrapper([jv]+details)
doclist = Bean([jv]+details)
doclist.submit()
messages.append("""<p style='color: green'>[row #%s]

View File

@ -16,7 +16,9 @@
#get company
from __future__ import unicode_literals
company = filter_values.get('company') or get_defaults()['company']
import webnotes.defaults
company = filter_values.get('company') or webnotes.defaults.get_user_default('company')
# To date
if not filter_values.get('clearance_date1'):

View File

@ -16,7 +16,9 @@
#get company
from __future__ import unicode_literals
company = filter_values.get('company') or get_defaults()['company']
import webnotes.defaults
company = filter_values.get('company') or webnotes.defaults.get_user_default('company')
#get company letter head
l_head = sql("select letter_head from `tabCompany` where name='%s'" % company)

View File

@ -16,7 +16,9 @@
#get company
from __future__ import unicode_literals
company = filter_values.get('company') or get_defaults()['company']
import webnotes.defaults
company = filter_values.get('company') or webnotes.defaults.get_user_default('company')
#get company letter head
l_head = sql("select letter_head from `tabCompany` where name='%s'" % company)

View File

@ -121,7 +121,7 @@ def add_ac(args=None):
args = webnotes.form_dict
args.pop("cmd")
ac = webnotes.model_wrapper(args)
ac = webnotes.bean(args)
ac.doc.doctype = "Account"
ac.doc.old_parent = ""
ac.doc.freeze_account = "No"
@ -135,7 +135,7 @@ def add_cc(args=None):
args = webnotes.form_dict
args.pop("cmd")
cc = webnotes.model_wrapper(args)
cc = webnotes.bean(args)
cc.doc.doctype = "Cost Center"
cc.doc.old_parent = ""
cc.ignore_permissions = 1

View File

@ -1,124 +1,124 @@
[
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2010-08-08 17:09:34",
"docstatus": 0,
"modified": "2013-02-18 13:41:16",
"modified_by": "Administrator",
"modified": "2012-07-02 11:12:28"
"owner": "Administrator"
},
{
"name": "__common__",
"parent": "Purchase Request-Purchase Order",
"doctype": "Table Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "table_mapper_details"
"name": "__common__",
"parent": "Material Request-Purchase Order",
"parentfield": "table_mapper_details",
"parenttype": "DocType Mapper"
},
{
"name": "__common__",
"parent": "Purchase Request-Purchase Order",
"doctype": "Field Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "field_mapper_details"
},
{
"name": "__common__",
"to_doctype": "Purchase Order",
"module": "Buying",
"parent": "Material Request-Purchase Order",
"parentfield": "field_mapper_details",
"parenttype": "DocType Mapper"
},
{
"doctype": "DocType Mapper",
"from_doctype": "Material Request",
"module": "Buying",
"name": "__common__",
"ref_doc_submitted": 1,
"from_doctype": "Purchase Request"
"to_doctype": "Purchase Order"
},
{
"name": "Purchase Request-Purchase Order",
"doctype": "DocType Mapper"
"doctype": "DocType Mapper",
"name": "Material Request-Purchase Order"
},
{
"map": "Yes",
"match_id": 0,
"to_field": "company",
"checking_operator": "=",
"doctype": "Field Mapper Detail",
"from_field": "company",
"checking_operator": "="
},
{
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_doctype",
"doctype": "Field Mapper Detail",
"from_field": "parenttype"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_docname",
"doctype": "Field Mapper Detail",
"from_field": "parent"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_detail_docname",
"doctype": "Field Mapper Detail",
"from_field": "name"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "stock_uom",
"doctype": "Field Mapper Detail",
"from_field": "uom"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "conversion_factor",
"doctype": "Field Mapper Detail",
"from_field": "eval:flt(1)"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "stock_qty",
"doctype": "Field Mapper Detail",
"from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "qty",
"doctype": "Field Mapper Detail",
"from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "schedule_date",
"doctype": "Field Mapper Detail",
"from_field": "schedule_date"
},
{
"map": "No",
"match_id": 0,
"to_field": "transaction_date",
"to_field": "company"
},
{
"doctype": "Field Mapper Detail",
"from_field": "parenttype",
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_doctype"
},
{
"doctype": "Field Mapper Detail",
"from_field": "parent",
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_docname"
},
{
"doctype": "Field Mapper Detail",
"from_field": "name",
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_detail_docname"
},
{
"doctype": "Field Mapper Detail",
"from_field": "uom",
"map": "Yes",
"match_id": 1,
"to_field": "stock_uom"
},
{
"doctype": "Field Mapper Detail",
"from_field": "eval:flt(1)",
"map": "Yes",
"match_id": 1,
"to_field": "conversion_factor"
},
{
"doctype": "Field Mapper Detail",
"from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)",
"map": "Yes",
"match_id": 1,
"to_field": "stock_qty"
},
{
"doctype": "Field Mapper Detail",
"from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)",
"map": "Yes",
"match_id": 1,
"to_field": "qty"
},
{
"doctype": "Field Mapper Detail",
"from_field": "schedule_date",
"map": "Yes",
"match_id": 1,
"to_field": "schedule_date"
},
{
"checking_operator": ">=",
"doctype": "Field Mapper Detail",
"from_field": "transaction_date",
"checking_operator": ">="
"map": "No",
"match_id": 0,
"to_field": "transaction_date"
},
{
"reference_key": "prevdoc_docname",
"match_id": 0,
"doctype": "Table Mapper Detail",
"from_table": "Purchase Request",
"from_table": "Material Request",
"match_id": 0,
"reference_key": "prevdoc_docname",
"to_table": "Purchase Order",
"validation_logic": "docstatus = 1"
},
{
"doctype": "Table Mapper Detail",
"from_field": "indent_details",
"from_table": "Material Request Item",
"match_id": 1,
"reference_doctype_key": "prevdoc_doctype",
"to_field": "po_details",
"doctype": "Table Mapper Detail",
"from_field": "indent_details",
"from_table": "Purchase Request Item",
"to_table": "Purchase Order Item",
"validation_logic": "qty > ifnull(ordered_qty,0) and docstatus =1"
}

View File

@ -1,89 +1,89 @@
[
{
"owner": "Administrator",
"creation": "2012-08-06 20:02:53",
"docstatus": 0,
"creation": "2012-08-02 18:36:26",
"modified": "2013-02-18 13:41:13",
"modified_by": "Administrator",
"modified": "2012-08-03 12:34:09"
"owner": "Administrator"
},
{
"name": "__common__",
"parent": "Purchase Request-Supplier Quotation",
"doctype": "Table Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "table_mapper_details"
"name": "__common__",
"parent": "Material Request-Supplier Quotation",
"parentfield": "table_mapper_details",
"parenttype": "DocType Mapper"
},
{
"name": "__common__",
"parent": "Purchase Request-Supplier Quotation",
"doctype": "Field Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "field_mapper_details"
},
{
"name": "__common__",
"to_doctype": "Supplier Quotation",
"module": "Buying",
"parent": "Material Request-Supplier Quotation",
"parentfield": "field_mapper_details",
"parenttype": "DocType Mapper"
},
{
"doctype": "DocType Mapper",
"from_doctype": "Material Request",
"module": "Buying",
"name": "__common__",
"ref_doc_submitted": 1,
"from_doctype": "Purchase Request"
"to_doctype": "Supplier Quotation"
},
{
"name": "Purchase Request-Supplier Quotation",
"doctype": "DocType Mapper"
"doctype": "DocType Mapper",
"name": "Material Request-Supplier Quotation"
},
{
"map": "Yes",
"match_id": 0,
"to_field": "company",
"checking_operator": "=",
"doctype": "Field Mapper Detail",
"from_field": "company",
"checking_operator": "="
},
{
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_doctype",
"doctype": "Field Mapper Detail",
"from_field": "parenttype"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_docname",
"doctype": "Field Mapper Detail",
"from_field": "parent"
},
{
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_detail_docname",
"doctype": "Field Mapper Detail",
"from_field": "name"
},
{
"map": "No",
"match_id": 0,
"to_field": "transaction_date",
"to_field": "company"
},
{
"doctype": "Field Mapper Detail",
"from_field": "parenttype",
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_doctype"
},
{
"doctype": "Field Mapper Detail",
"from_field": "parent",
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_docname"
},
{
"doctype": "Field Mapper Detail",
"from_field": "name",
"map": "Yes",
"match_id": 1,
"to_field": "prevdoc_detail_docname"
},
{
"checking_operator": ">=",
"doctype": "Field Mapper Detail",
"from_field": "transaction_date",
"checking_operator": ">="
"map": "No",
"match_id": 0,
"to_field": "transaction_date"
},
{
"reference_key": "prevdoc_docname",
"match_id": 0,
"doctype": "Table Mapper Detail",
"from_table": "Purchase Request",
"from_table": "Material Request",
"match_id": 0,
"reference_key": "prevdoc_docname",
"to_table": "Supplier Quotation",
"validation_logic": "docstatus = 1"
},
{
"doctype": "Table Mapper Detail",
"from_field": "indent_details",
"from_table": "Material Request Item",
"match_id": 1,
"reference_doctype_key": "prevdoc_doctype",
"to_field": "quotation_items",
"doctype": "Table Mapper Detail",
"from_field": "indent_details",
"from_table": "Purchase Request Item",
"to_table": "Supplier Quotation Item",
"validation_logic": "docstatus =1"
}

View File

@ -1,91 +1,98 @@
[
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2011-05-20 10:07:55",
"docstatus": 0,
"modified": "2013-02-20 18:20:27",
"modified_by": "Administrator",
"modified": "2012-04-03 12:49:50"
"owner": "Administrator"
},
{
"name": "__common__",
"parent": "Sales Order-Purchase Request",
"doctype": "Table Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "table_mapper_details"
"name": "__common__",
"parent": "Sales Order-Material Request",
"parentfield": "table_mapper_details",
"parenttype": "DocType Mapper"
},
{
"name": "__common__",
"parent": "Sales Order-Purchase Request",
"doctype": "Field Mapper Detail",
"parenttype": "DocType Mapper",
"parentfield": "field_mapper_details"
},
{
"name": "__common__",
"to_doctype": "Purchase Request",
"module": "Buying",
"parent": "Sales Order-Material Request",
"parentfield": "field_mapper_details",
"parenttype": "DocType Mapper"
},
{
"doctype": "DocType Mapper",
"from_doctype": "Sales Order",
"module": "Buying",
"name": "__common__",
"ref_doc_submitted": 1,
"from_doctype": "Sales Order"
"to_doctype": "Material Request"
},
{
"name": "Sales Order-Purchase Request",
"doctype": "DocType Mapper"
"doctype": "DocType Mapper",
"name": "Sales Order-Material Request"
},
{
"map": "No",
"match_id": 0,
"to_field": "transaction_date",
"checking_operator": ">=",
"doctype": "Field Mapper Detail",
"from_field": "transaction_date",
"checking_operator": ">="
"map": "No",
"match_id": 0,
"to_field": "transaction_date"
},
{
"doctype": "Field Mapper Detail",
"from_field": "eval:\"Purchase\"",
"map": "Yes",
"match_id": 0,
"to_field": "company",
"to_field": "material_request_type"
},
{
"checking_operator": "=",
"doctype": "Field Mapper Detail",
"from_field": "company",
"checking_operator": "="
"map": "Yes",
"match_id": 0,
"to_field": "company"
},
{
"doctype": "Field Mapper Detail",
"from_field": "parent",
"map": "Yes",
"match_id": 1,
"to_field": "sales_order_no",
"doctype": "Field Mapper Detail",
"from_field": "parent"
"to_field": "sales_order_no"
},
{
"doctype": "Field Mapper Detail",
"from_field": "stock_uom",
"map": "Yes",
"match_id": 1,
"to_field": "uom",
"doctype": "Field Mapper Detail",
"from_field": "stock_uom"
"to_field": "uom"
},
{
"doctype": "Field Mapper Detail",
"from_field": "reserved_warehouse",
"map": "Yes",
"match_id": 1,
"to_field": "warehouse",
"doctype": "Field Mapper Detail",
"from_field": "reserved_warehouse"
"to_field": "warehouse"
},
{
"reference_key": "prevdoc_detail_docname",
"match_id": 1,
"reference_doctype_key": "prevdoc_doctype",
"to_field": "indent_details",
"doctype": "Table Mapper Detail",
"from_field": "sales_order_details",
"from_table": "Sales Order Item",
"to_table": "Purchase Request Item",
"match_id": 1,
"reference_doctype_key": "prevdoc_doctype",
"reference_key": "prevdoc_detail_docname",
"to_field": "indent_details",
"to_table": "Material Request Item",
"validation_logic": "docstatus=1"
},
{
"reference_key": "prevdoc_docname",
"match_id": 0,
"doctype": "Table Mapper Detail",
"from_table": "Sales Order",
"to_table": "Purchase Request",
"match_id": 0,
"reference_key": "prevdoc_docname",
"to_table": "Material Request",
"validation_logic": "docstatus = 1"
}
]

View File

@ -19,7 +19,7 @@ import webnotes
from webnotes.utils import add_days, cint, cstr, flt
from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint, _
@ -33,17 +33,17 @@ class DocType(BuyingController):
self.doc = doc
self.doclist = doclist
self.chk_tol_for_list = ['Purchase Request - Purchase Order', 'Purchase Order - Purchase Receipt', 'Purchase Order - Purchase Invoice']
self.chk_tol_for_list = ['Material Request - Purchase Order', 'Purchase Order - Purchase Receipt', 'Purchase Order - Purchase Invoice']
self.update_qty = {
'Purchase Request - Purchase Order': 'ordered_qty',
'Material Request - Purchase Order': 'ordered_qty',
'Purchase Order - Purchase Receipt': 'received_qty',
'Purchase Order - Purchase Invoice': 'billed_qty',
'Purchase Receipt - Purchase Invoice': 'billed_qty'
}
self.update_percent_field = {
'Purchase Request - Purchase Order': 'per_ordered',
'Material Request - Purchase Order': 'per_ordered',
'Purchase Order - Purchase Receipt': 'per_received',
'Purchase Order - Purchase Invoice': 'per_billed',
'Purchase Receipt - Purchase Invoice': 'per_billed'
@ -51,7 +51,7 @@ class DocType(BuyingController):
# used in validation for items and update_prevdoc_detail
self.doctype_dict = {
'Purchase Request': 'Purchase Request Item',
'Material Request': 'Material Request Item',
'Purchase Order': 'Purchase Order Item',
'Purchase Receipt': 'Purchase Receipt Item'
}
@ -75,7 +75,7 @@ class DocType(BuyingController):
item = sql("select lead_time_days from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())" % cstr(d.item_code) , as_dict = 1)
ltd = item and cint(item[0]['lead_time_days']) or 0
if ltd and obj.doc.transaction_date:
if d.fields.has_key('lead_time_date') or obj.doc.doctype == 'Purchase Request':
if d.fields.has_key('lead_time_date') or obj.doc.doctype == 'Material Request':
d.lead_time_date = cstr(add_days( obj.doc.transaction_date, cint(ltd)))
if not d.fields.has_key('prevdoc_docname') or (d.fields.has_key('prevdoc_docname') and not d.prevdoc_docname):
d.schedule_date = cstr( add_days( obj.doc.transaction_date, cint(ltd)))
@ -219,7 +219,7 @@ class DocType(BuyingController):
raise Exception
# Check if UOM has been modified.
if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Purchase Request':
if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Material Request':
msgprint("Please check UOM %s of Item %s which is not present in %s %s ." % (d.uom, d.item_code, d.prevdoc_doctype, d.prevdoc_docname))
raise Exception
@ -288,11 +288,11 @@ class DocType(BuyingController):
def get_qty(self,curr_doctype,ref_tab_fname,ref_tab_dn,ref_doc_tname, transaction, curr_parent_name):
# Get total Quantities of current doctype (eg. PR) except for qty of this transaction
#------------------------------
# please check as UOM changes from Purchase Request - Purchase Order ,so doing following else uom should be same .
# please check as UOM changes from Material Request - Purchase Order ,so doing following else uom should be same .
# i.e. in PO uom is NOS then in PR uom should be NOS
# but if in Purchase Request uom KG it can change in PO
# but if in Material Request uom KG it can change in PO
get_qty = (transaction == 'Purchase Request - Purchase Order') and 'qty * conversion_factor' or 'qty'
get_qty = (transaction == 'Material Request - Purchase Order') and 'qty * conversion_factor' or 'qty'
qty = sql("select sum(%s) from `tab%s` where %s = '%s' and docstatus = 1 and parent != '%s'"% ( get_qty, curr_doctype, ref_tab_fname, ref_tab_dn, curr_parent_name))
qty = qty and flt(qty[0][0]) or 0
@ -312,8 +312,8 @@ class DocType(BuyingController):
qty, max_qty, max_qty_plus_tol = flt(curr_ref_qty.split('~~~')[0]), flt(curr_ref_qty.split('~~~')[1]), flt(curr_ref_qty.split('~~~')[1])
# Qty above Tolerance should be allowed only once.
# But there is special case for Transaction 'Purchase Request-Purhcase Order' that there should be no restriction
# One can create any no. of PO against same Purchase Request!!!
# But there is special case for Transaction 'Material Request-Purhcase Order' that there should be no restriction
# One can create any no. of PO against same Material Request!!!
if qty >= max_qty and is_submit and flt(curr_qty) > 0:
reason = (curr_parent_doctype == 'Purchase Order') and 'Ordered' or (curr_parent_doctype == 'Purchase Receipt') and 'Received' or (curr_parent_doctype == 'Purchase Invoice') and 'Billed'
msgprint("Error: Item Code : '%s' of '%s' is already %s." %(item_code,ref_dn,reason))
@ -364,7 +364,7 @@ class DocType(BuyingController):
if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname:
transaction = cstr(d.prevdoc_doctype) + ' - ' + cstr(obj.doc.doctype)
curr_qty = (transaction == 'Purchase Request - Purchase Order') and flt(d.qty) * flt(d.conversion_factor) or flt(d.qty)
curr_qty = (transaction == 'Material Request - Purchase Order') and flt(d.qty) * flt(d.conversion_factor) or flt(d.qty)
self.update_ref_doctype_dict( flt(curr_qty), d.doctype, d.prevdoc_docname, d.prevdoc_doctype, 'prevdoc_detail_docname', d.prevdoc_detail_docname, transaction, d.item_code, is_submit, obj.doc.doctype, obj.doc.name)
# for payable voucher

View File

@ -9,6 +9,7 @@
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.",
"If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
"Price List",
"Select Material Request",
"Net Total*",
"Purchase Order Items Supplied",
"Taxes",
@ -19,10 +20,10 @@
"Letter Head",
"Currency & Price List",
"More Info",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.",
"Net Total (Import)",
"% Received",
"Select Print Heading",
"Select Purchase Request",
"Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"Is Subcontracted",
"Contact Person",
@ -42,7 +43,6 @@
"Contact",
"Purchase Order Items",
"Select Supplier Quotation",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.",
"Rate at which supplier's currency is converted to company's base currency",
"Currency",
"Purchase Taxes and Charges",

View File

@ -59,6 +59,7 @@
"Remarks": "\u062a\u0635\u0631\u064a\u062d\u0627\u062a",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "\u0627\u0644\u0645\u0648\u0627\u062f \u0627\u0644\u062e\u0627\u0645 \u0627\u0644\u0644\u0627\u0632\u0645\u0629 \u0627\u0644\u0635\u0627\u062f\u0631\u0629 \u0625\u0644\u0649 \u0627\u0644\u0645\u0648\u0631\u062f \u0644\u0625\u0646\u062a\u0627\u062c \u0641\u0631\u0639\u064a - \u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062a\u0639\u0627\u0642\u062f \u0639\u0644\u064a\u0647\u0627.",
"Rounded Total": "\u062a\u0642\u0631\u064a\u0628 \u0625\u062c\u0645\u0627\u0644\u064a",
"Select Material Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f",
"Select Print Heading": "\u062d\u062f\u062f \u0637\u0628\u0627\u0639\u0629 \u0627\u0644\u0639\u0646\u0648\u0627\u0646",
"Select Purchase Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0634\u0631\u0627\u0621",
"Select Supplier Quotation": "\u062d\u062f\u062f \u0645\u0632\u0648\u062f \u0627\u0642\u062a\u0628\u0627\u0633",
@ -87,6 +88,7 @@
"Total Tax*": "\u0645\u062c\u0645\u0648\u0639 \u0627\u0644\u0636\u0631\u0627\u0626\u0628 *",
"Totals": "\u0627\u0644\u0645\u062c\u0627\u0645\u064a\u0639",
"Yes": "\u0646\u0639\u0645",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0645\u0648\u0627\u062f \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0637\u0644\u0628 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633\u0627\u062a \u0645\u0632\u0648\u062f \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0645\u0632\u0648\u062f \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633\u0627\u062a \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647."
}

View File

@ -59,6 +59,7 @@
"Remarks": "Observaciones",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "Requeridos materias primas emitidas al proveedor para producir un sub - \u00edtem contratado.",
"Rounded Total": "Total redondeado",
"Select Material Request": "Seleccione Solicitud de material",
"Select Print Heading": "Seleccione Imprimir Encabezado",
"Select Purchase Request": "Seleccione Solicitud de Compra",
"Select Supplier Quotation": "Seleccione Cita Proveedor",
@ -87,6 +88,7 @@
"Total Tax*": "* Total de Impuestos",
"Totals": "Totales",
"Yes": "S\u00ed",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de solicitudes de materiales m\u00faltiples. Seleccione solicitudes de material de uno en uno y haga clic en el bot\u00f3n de abajo.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de varias Ordenes de Compra. Seleccione Ordenes de Compra uno por uno y haga clic en el bot\u00f3n de abajo.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Usted puede hacer una orden de compra de cotizaciones de proveedores m\u00faltiples. Seleccione Citas Proveedor de uno en uno y haga clic en el bot\u00f3n de abajo."
}

View File

@ -59,6 +59,7 @@
"Remarks": "Remarques",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "Mati\u00e8res premi\u00e8res n\u00e9cessaires d\u00e9livr\u00e9s au fournisseur pour la production d&#39;un \u00e9l\u00e9ment sous - traitance.",
"Rounded Total": "Totale arrondie",
"Select Material Request": "S\u00e9lectionnez Demande de Mat\u00e9riel",
"Select Print Heading": "S\u00e9lectionnez Imprimer Cap",
"Select Purchase Request": "S\u00e9lectionnez la demande d&#39;achat",
"Select Supplier Quotation": "S\u00e9lectionnez Devis Fournisseur",
@ -87,6 +88,7 @@
"Total Tax*": "* Total de la taxe",
"Totals": "Totaux",
"Yes": "Oui",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Vous pouvez faire un bon de commande de mat\u00e9riel demandes multiples. S\u00e9lectionnez demandes de mat\u00e9riel, un par un et cliquez sur le bouton ci-dessous.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Vous pouvez faire une commande \u00e0 partir de demandes d&#39;achat multiples. S\u00e9lectionnez Demande d&#39;Achat un par un et cliquez sur le bouton ci-dessous.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Vous pouvez faire une commande de citations multiples fournisseurs. S\u00e9lectionnez Citations fournisseurs un par un et cliquez sur le bouton ci-dessous."
}

View File

@ -60,6 +60,7 @@
"Remarks": "\u091f\u093f\u092a\u094d\u092a\u0923\u093f\u092f\u093e\u0901",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "\u0906\u0935\u0936\u094d\u092f\u0915 \u0915\u091a\u094d\u091a\u0947 \u090f\u0915 \u0909\u092a \u0915\u0947 \u0909\u0924\u094d\u092a\u093e\u0926\u0928 \u0915\u0947 \u0932\u093f\u090f \u0906\u092a\u0942\u0930\u094d\u0924\u093f\u0915\u0930\u094d\u0924\u093e \u0915\u094b \u091c\u093e\u0930\u0940 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 - \u0905\u0928\u0941\u092c\u0902\u0927\u093f\u0924 \u0906\u0907\u091f\u092e.",
"Rounded Total": "\u0917\u094b\u0932 \u0915\u0941\u0932",
"Select Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902",
"Select Print Heading": "\u091a\u092f\u0928 \u0936\u0940\u0930\u094d\u0937\u0915 \u092a\u094d\u0930\u093f\u0902\u091f",
"Select Purchase Request": "\u0916\u0930\u0940\u0926 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902",
"Select Supplier Quotation": "\u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0915\u094b\u091f\u0947\u0936\u0928 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902",
@ -88,6 +89,7 @@
"Total Tax*": "\u0915\u0941\u0932 \u091f\u0948\u0915\u094d\u0938 *",
"Totals": "\u092f\u094b\u0917",
"Yes": "\u0939\u093e\u0902",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0915\u094b\u091f\u0947\u0936\u0928 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u092a\u094d\u0930\u0926\u093e\u092f\u0915 \u0915\u094b\u091f\u0947\u0936\u0928 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902."
}

View File

@ -59,6 +59,7 @@
"Remarks": "Primjedbe",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "Potrebna sirovina izdane dobavlja\u010d za proizvodnju pod - ugovoreni predmet.",
"Rounded Total": "Zaobljeni Ukupno",
"Select Material Request": "Odaberite Materijal Zahtjev",
"Select Print Heading": "Odaberite Ispis Naslov",
"Select Purchase Request": "Odaberite zahtjev za kupnju",
"Select Supplier Quotation": "Odaberite Supplier ponudu",
@ -87,6 +88,7 @@
"Total Tax*": "Ukupno poreza *",
"Totals": "Ukupan rezultat",
"Yes": "Da",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje od vi\u0161e materijala zahtjeva. Odaberite materijalni zahtijevi jedan po jedan i kliknite na gumb ispod.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje iz vi\u0161e Kupiti zahtjeva. Odaberite kupnje Zahtjevi jednu po jednu i kliknite na gumb ispod.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje iz vi\u0161e dobavlja\u010dima Citati. Odaberite dobavlja\u010d Citati jedan po jedan i kliknite na gumb ispod."
}

View File

@ -59,6 +59,7 @@
"Remarks": "Opmerkingen",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "Benodigde grondstoffen uitgegeven aan de leverancier voor het produceren van een sub - gecontracteerde item.",
"Rounded Total": "Afgeronde Totaal",
"Select Material Request": "Selecteer Materiaal aanvragen",
"Select Print Heading": "Selecteer Print rubriek",
"Select Purchase Request": "Selecteer Purchase Request",
"Select Supplier Quotation": "Selecteer Leverancier Offerte",
@ -87,6 +88,7 @@
"Total Tax*": "Totaal BTW *",
"Totals": "Totalen",
"Yes": "Ja",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "U kunt een bestelling van meerdere Materiaal aanvragen. Selecteer Materiaal Verzoeken een voor een en klikt u op de knop.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "U kunt een bestelling van meerdere aankoopverzoeken. Selecteer inkoopaanvragen een voor een en klikt u op de knop.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "U kunt een bestelling van meerdere Leverancier Quotations. Selecteer Leverancier Offertes een voor een en klikt u op de knop."
}

View File

@ -59,6 +59,7 @@
"Remarks": "Observa\u00e7\u00f5es",
"Required raw materials issued to the supplier for producing a sub - contracted item.": "Mat\u00e9rias-primas necess\u00e1rias emitidos para o fornecedor para a produ\u00e7\u00e3o de um sub - item contratado.",
"Rounded Total": "Total arredondado",
"Select Material Request": "Selecione solicitar material",
"Select Print Heading": "Selecione Imprimir t\u00edtulo",
"Select Purchase Request": "Selecione Pedido de Compra",
"Select Supplier Quotation": "Selecione cota\u00e7\u00e3o Fornecedor",
@ -87,6 +88,7 @@
"Total Tax*": "* Total de impostos",
"Totals": "Totais",
"Yes": "Sim",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Voc\u00ea pode fazer um pedido de compra de materiais pedidos m\u00faltiplos. Selecione pedidos se um por um e clique no bot\u00e3o abaixo.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Voc\u00ea pode fazer uma ordem de compra de pedidos de compras m\u00faltiplas. Selecione pedidos de compra, um por um e clique no bot\u00e3o abaixo.",
"You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.": "Voc\u00ea pode fazer uma ordem de compra de Cita\u00e7\u00f5es Fornecedor m\u00faltiplos. Selecione Quotations Fornecedor, um por um e clique no bot\u00e3o abaixo."
}

View File

@ -109,7 +109,11 @@ cur_frm.fields_dict['po_details'].grid.get_field('project_name').get_query = fun
}
cur_frm.fields_dict['indent_no'].get_query = function(doc) {
return 'SELECT DISTINCT `tabPurchase Request`.`name` FROM `tabPurchase Request` WHERE `tabPurchase Request`.company = "' + doc.company + '" and `tabPurchase Request`.`docstatus` = 1 and `tabPurchase Request`.`status` != "Stopped" and ifnull(`tabPurchase Request`.`per_ordered`,0) < 99.99 and `tabPurchase Request`.%(key)s LIKE "%s" ORDER BY `tabPurchase Request`.`name` DESC LIMIT 50';
return 'SELECT DISTINCT `name` FROM `tabMaterial Request` \
WHERE material_request_type="Purchase" and company = "' + doc.company
+ '" and `docstatus` = 1 and `status` != "Stopped" \
and ifnull(`per_ordered`,0) < 99.99 and %(key)s LIKE "%s" \
ORDER BY `name` DESC LIMIT 50';
}
@ -208,7 +212,7 @@ cur_frm.pformat.indent_no = function(doc, cdt, cdn){
if(cl.length){
prevdoc_list = new Array();
for(var i=0;i<cl.length;i++){
if(cl[i].prevdoc_doctype == 'Purchase Request' && cl[i].prevdoc_docname && prevdoc_list.indexOf(cl[i].prevdoc_docname) == -1) {
if(cl[i].prevdoc_doctype == 'Material Request' && cl[i].prevdoc_docname && prevdoc_list.indexOf(cl[i].prevdoc_docname) == -1) {
prevdoc_list.push(cl[i].prevdoc_docname);
if(prevdoc_list.length ==1)
out += make_row(cl[i].prevdoc_doctype, cl[i].prevdoc_docname, cl[i].prevdoc_date,0);

View File

@ -17,9 +17,9 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, flt, get_defaults
from webnotes.utils import cstr, flt
from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
from buying.utils import get_last_purchase_details
@ -32,7 +32,6 @@ class DocType(BuyingController):
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
self.defaults = get_defaults()
self.tname = 'Purchase Order Item'
self.fname = 'po_details'
@ -76,10 +75,10 @@ class DocType(BuyingController):
def get_bin_details(self, arg = ''):
return get_obj(dt='Purchase Common').get_bin_details(arg)
# Pull Purchase Request
# Pull Material Request
def get_indent_details(self):
if self.doc.indent_no:
get_obj('DocType Mapper','Purchase Request-Purchase Order').dt_map('Purchase Request','Purchase Order',self.doc.indent_no, self.doc, self.doclist, "[['Purchase Request','Purchase Order'],['Purchase Request Item', 'Purchase Order Item']]")
get_obj('DocType Mapper','Material Request-Purchase Order').dt_map('Material Request','Purchase Order',self.doc.indent_no, self.doc, self.doclist, "[['Material Request','Purchase Order'],['Material Request Item', 'Purchase Order Item']]")
pcomm = get_obj('Purchase Common')
for d in getlist(self.doclist, 'po_details'):
if d.item_code and not d.purchase_rate:
@ -105,7 +104,7 @@ class DocType(BuyingController):
self.get_default_schedule_date()
for d in getlist(self.doclist, 'po_details'):
if d.prevdoc_detail_docname and not d.schedule_date:
d.schedule_date = webnotes.conn.get_value("Purchase Request Item",
d.schedule_date = webnotes.conn.get_value("Material Request Item",
d.prevdoc_detail_docname, "schedule_date")
def get_tc_details(self):
@ -138,19 +137,19 @@ class DocType(BuyingController):
po_qty = flt(d.qty) > flt(d.received_qty) and \
flt( flt(flt(d.qty) - flt(d.received_qty))*flt(d.conversion_factor)) or 0
# No updates in Purchase Request on Stop / Unstop
if cstr(d.prevdoc_doctype) == 'Purchase Request' and not is_stopped:
# No updates in Material Request on Stop / Unstop
if cstr(d.prevdoc_doctype) == 'Material Request' and not is_stopped:
# get qty and pending_qty of prevdoc
curr_ref_qty = pc_obj.get_qty(d.doctype, 'prevdoc_detail_docname',
d.prevdoc_detail_docname, 'Purchase Request Item',
'Purchase Request - Purchase Order', self.doc.name)
d.prevdoc_detail_docname, 'Material Request Item',
'Material Request - Purchase Order', self.doc.name)
max_qty, qty, curr_qty = flt(curr_ref_qty.split('~~~')[1]), \
flt(curr_ref_qty.split('~~~')[0]), 0
if flt(qty) + flt(po_qty) > flt(max_qty):
curr_qty = flt(max_qty) - flt(qty)
# special case as there is no restriction
# for Purchase Request - Purchase Order
# for Material Request - Purchase Order
curr_qty = curr_qty > 0 and curr_qty or 0
else:
curr_qty = flt(po_qty)
@ -232,7 +231,7 @@ class DocType(BuyingController):
# 4.Set Status as Cancelled
webnotes.conn.set(self.doc,'status','Cancelled')
# 5.Update Purchase Requests Pending Qty and accordingly it's Status
# 5.Update Material Requests Pending Qty and accordingly it's Status
pc_obj.update_prevdoc_detail(self,is_submit = 0)
# 6.Update Bin
@ -262,7 +261,6 @@ class DocType(BuyingController):
self.delete_irrelevant_raw_material()
#---------------calculate amt in Purchase Order Item Supplied-------------
self.calculate_amount(d)
def add_bom(self, d):
#----- fetching default bom from Bill of Materials instead of Item Master --
@ -315,15 +313,6 @@ class DocType(BuyingController):
d.parent = 'old_par:'+self.doc.name
d.save()
def calculate_amount(self, d):
amt = 0
for i in getlist(self.doclist,'po_raw_material_details'):
if(i.reference_name == d.name):
i.amount = flt(i.required_qty)* flt(i.rate)
amt += i.amount
d.rm_supp_cost = amt
# On Update
# ----------------------------------------------------------------------------------------------------
def on_update(self):

View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-01-29 17:54:10",
"creation": "2013-01-29 19:25:50",
"docstatus": 0,
"modified": "2013-01-29 18:16:48",
"modified": "2013-02-18 13:37:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -31,9 +31,7 @@
"parent": "Purchase Order",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
"read": 1
},
{
"doctype": "DocType",
@ -181,16 +179,16 @@
"fieldtype": "Section Break"
},
{
"description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.",
"description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.",
"doctype": "DocField",
"fieldname": "indent_no",
"fieldtype": "Link",
"hidden": 0,
"label": "Select Purchase Request",
"label": "Select Material Request",
"no_copy": 1,
"oldfieldname": "indent_no",
"oldfieldtype": "Link",
"options": "Purchase Request",
"options": "Material Request",
"print_hide": 1
},
{
@ -814,26 +812,58 @@
"no_copy": 1,
"print_hide": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 0,
"role": "Material User",
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Material User",
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 0,
"role": "Purchase Manager",
"submit": 0,
"write": 0
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Purchase User",
"permlevel": 0,
"report": 1,
"role": "Purchase Manager",
"submit": 1,
"write": 1
},
{
"doctype": "DocPerm",
"match": "supplier",
"role": "Supplier"
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Purchase Manager",
"permlevel": 0,
"report": 1,
"role": "Purchase User",
"submit": 1,
"write": 1
},
@ -842,8 +872,15 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"role": "Material User",
"submit": 0,
"write": 0
"permlevel": 1,
"role": "All",
"submit": 0
},
{
"doctype": "DocPerm",
"match": "supplier",
"permlevel": 0,
"report": 1,
"role": "Supplier"
}
]

View File

@ -2,7 +2,7 @@
"Supplier Quotation Item",
"Item Name",
"Discount %",
"Purchase Request Detail No",
"Material Request Detail No",
"Prevdoc DocType",
"Warehouse",
"UOM",
@ -12,18 +12,18 @@
"Project Name",
"Brand",
"Supplier Part Number",
"Material Request Date",
"Stock UOM",
"Received Qty",
"Buying",
"Purchase Requisition No",
"Rate ",
"Reqd By Date",
"Material Request No",
"Rate*",
"Amount*",
"Amount",
"Ref Rate ",
"Item Group",
"Purchase Request Date",
"If Supplier Part Number exists for given Item, it gets stored here",
"Item Code",
"Ref Rate*",

View File

@ -12,6 +12,9 @@
"Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629",
"Item Name": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0627\u0633\u0645",
"Item Tax Rate": "\u0627\u0644\u0628\u0646\u062f \u0636\u0631\u064a\u0628\u0629",
"Material Request Date": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0627\u0631\u064a\u062e",
"Material Request Detail No": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0644\u0627",
"Material Request No": "\u0637\u0644\u0628 \u0645\u0648\u0627\u062f \u0644\u0627",
"Page Break": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0633\u062a\u0631\u0627\u062d\u0629",
"Prevdoc DocType": "Prevdoc DOCTYPE",
"Project Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639",

View File

@ -12,6 +12,9 @@
"Item Group": "Grupo de art\u00edculos",
"Item Name": "Nombre del elemento",
"Item Tax Rate": "Art\u00edculo Tasa Impositiva",
"Material Request Date": "Material de la Fecha de Solicitud",
"Material Request Detail No": "Materiales Detalle Solicitud de No",
"Material Request No": "Material de Solicitud de No",
"Page Break": "Salto de p\u00e1gina",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Nombre del proyecto",

View File

@ -12,6 +12,9 @@
"Item Group": "Groupe d&#39;\u00e9l\u00e9ments",
"Item Name": "Nom d&#39;article",
"Item Tax Rate": "Taux d&#39;imposition article",
"Material Request Date": "Date de demande de mat\u00e9riel",
"Material Request Detail No": "D\u00e9tail Demande Support Aucun",
"Material Request No": "Demande de Support Aucun",
"Page Break": "Saut de page",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Nom du projet",

View File

@ -12,6 +12,9 @@
"Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939",
"Item Name": "\u092e\u0926 \u0915\u093e \u0928\u093e\u092e",
"Item Tax Rate": "\u0906\u0907\u091f\u092e \u0915\u0930 \u0915\u0940 \u0926\u0930",
"Material Request Date": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0924\u093f\u0925\u093f",
"Material Request Detail No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927 \u0935\u093f\u0938\u094d\u0924\u093e\u0930 \u0928\u0939\u0940\u0902",
"Material Request No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0928\u0939\u0940\u0902",
"Page Break": "\u092a\u0943\u0937\u094d\u0920\u093e\u0924\u0930",
"Prevdoc DocType": "Prevdoc doctype",
"Project Name": "\u0907\u0938 \u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e \u0915\u093e \u0928\u093e\u092e",

View File

@ -11,6 +11,9 @@
"Item Group": "Stavka Grupa",
"Item Name": "Stavka Ime",
"Item Tax Rate": "Stavka Porezna stopa",
"Material Request Date": "Materijal Zahtjev Datum",
"Material Request Detail No": "Materijal Zahtjev Detalj Ne",
"Material Request No": "Materijal Zahtjev Ne",
"Page Break": "Prijelom stranice",
"Prevdoc DocType": "Prevdoc DOCTYPE",
"Project Name": "Naziv projekta",

View File

@ -12,6 +12,9 @@
"Item Group": "Item Group",
"Item Name": "Naam van het punt",
"Item Tax Rate": "Item Belastingtarief",
"Material Request Date": "Materiaal Aanvraagdatum",
"Material Request Detail No": "Materiaal Aanvraag Detail Geen",
"Material Request No": "Materiaal aanvragen Geen",
"Page Break": "Pagina-einde",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Naam van het project",

View File

@ -12,6 +12,9 @@
"Item Group": "Grupo Item",
"Item Name": "Nome do item",
"Item Tax Rate": "Taxa de Imposto item",
"Material Request Date": "Data de Solicita\u00e7\u00e3o de material",
"Material Request Detail No": "Detalhe materiais Pedido N\u00e3o",
"Material Request No": "Pedido de material no",
"Page Break": "Quebra de p\u00e1gina",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Nome do projeto",

View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-01-30 12:49:48",
"creation": "2013-02-07 11:00:11",
"docstatus": 0,
"modified": "2013-02-07 10:49:35",
"modified": "2013-02-18 13:39:02",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -249,11 +249,11 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
"label": "Purchase Requisition No",
"label": "Material Request No",
"no_copy": 0,
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link",
"options": "Purchase Request",
"options": "Material Request",
"print_hide": 1,
"print_width": "120px",
"read_only": 1,
@ -266,7 +266,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
"label": "Purchase Request Date",
"label": "Material Request Date",
"oldfieldname": "prevdoc_date",
"oldfieldtype": "Date",
"print_hide": 1,
@ -279,7 +279,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
"label": "Purchase Request Detail No",
"label": "Material Request Detail No",
"no_copy": 0,
"oldfieldname": "prevdoc_detail_docname",
"oldfieldtype": "Data",

View File

@ -1 +0,0 @@
from __future__ import unicode_literals

View File

@ -1,41 +0,0 @@
{
"% Ordered": "\u041d\u0430\u0440\u0443\u0447\u0435\u043d\u043e%",
"% of materials ordered against this Purchase Requisition": "% \u041c\u0430\u0442\u0435\u0440\u0438\u0458\u0430\u043b\u0430 \u043d\u0430\u0440\u0435\u0434\u0438\u043e \u043f\u0440\u043e\u0442\u0438\u0432 \u043e\u0432\u0435 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0435 \u041d\u0430\u0431\u0430\u0432\u043a\u0430",
"Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template": "\u0414\u043e\u0434\u0430\u0432\u0430\u045a\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u0430 \u0438 \u0443\u0441\u043b\u043e\u0432\u0435 \u0437\u0430 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0443 \u041d\u0430\u0431\u0430\u0432\u043a\u0430. \u0422\u0430\u043a\u043e\u0452\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u0438\u043f\u0440\u0435\u043c\u0438\u0442\u0438 \u0423\u0441\u043b\u043e\u0432\u0438 \u043f\u043e\u0441\u043b\u043e\u0432\u0430\u045a\u0430 \u043c\u0430\u0441\u0442\u0435\u0440 \u0438 \u043a\u043e\u0440\u0438\u0448\u045b\u0435\u045a\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430",
"After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "\u041f\u043e\u0441\u043b\u0435 \u043e\u0442\u043a\u0430\u0437\u0438\u0432\u0430\u045a\u0430 \u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0446\u0438\u0458\u0435, \u0434\u0438\u0458\u0430\u043b\u043e\u0433 \u045b\u0435 \u0432\u0430\u0441 \u043f\u0438\u0442\u0430\u0442\u0438 \u0440\u0430\u0437\u043b\u043e\u0433 \u0437\u0430 \u043e\u0442\u043a\u0430\u0437 \u043a\u043e\u0458\u0438 \u045b\u0435 \u0431\u0438\u0442\u0438 \u043f\u0440\u0438\u043a\u0430\u0437\u0430\u043d\u0438 \u0443 \u043e\u0432\u043e\u0458 \u043e\u0431\u043b\u0430\u0441\u0442\u0438",
"Amended From": "\u0418\u0437\u043c\u0435\u045a\u0435\u043d\u0430 \u043e\u0434",
"Amendment Date": "\u0410\u043c\u0430\u043d\u0434\u043c\u0430\u043d \u0414\u0430\u0442\u0443\u043c",
"Buying": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430",
"Cancel Reason": "\u041e\u0442\u043a\u0430\u0436\u0438 \u0440\u0430\u0437\u043b\u043e\u0433",
"Cancelled": "\u041e\u0442\u043a\u0430\u0437\u0430\u043d",
"Company": "\u041a\u043e\u043c\u043f\u0430\u043d\u0438\u0458\u0430",
"Draft": "\u041d\u0430\u0446\u0440\u0442",
"File List": "\u0424\u0438\u043b\u0435 \u041b\u0438\u0441\u0442",
"Filing in Additional Information about the Purchase Requisition will help you analyze your data better.": "\u041f\u043e\u0434\u043d\u043e\u0448\u0435\u045a\u0435 \u0434\u043e\u0434\u0430\u0442\u043d\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0458\u0435 \u043e \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0438 \u041d\u0430\u0431\u0430\u0432\u043a\u0430 \u045b\u0435 \u0432\u0430\u043c \u043f\u043e\u043c\u043e\u045b\u0438 \u0434\u0430 \u0430\u043d\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u0442\u0435 \u043f\u043e\u0434\u0430\u0442\u043a\u0435 \u0431\u043e\u0459\u0435.",
"Fiscal Year": "\u0424\u0438\u0441\u043a\u0430\u043b\u043d\u0430 \u0433\u043e\u0434\u0438\u043d\u0430",
"Get Terms and Conditions": "\u0413\u0435\u0442 \u0423\u0441\u043b\u043e\u0432\u0435",
"IDT": "\u0418\u0414\u0422",
"Items": "\u0410\u0440\u0442\u0438\u043a\u043b\u0438",
"Letter Head": "\u041f\u0438\u0441\u043c\u043e \u0413\u043b\u0430\u0432\u0430",
"More Info": "\u0412\u0438\u0448\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0458\u0430",
"Name of the entity who has requested for the Purchase Requisition": "\u0418\u043c\u0435 \u0435\u043d\u0442\u0438\u0442\u0435\u0442\u0430 \u043a\u043e\u0458\u0438 \u0458\u0435 \u0442\u0440\u0430\u0436\u0438\u043e \u0437\u0430 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0443 \u041d\u0430\u0431\u0430\u0432\u043a\u0430",
"One or multiple Sales Order no which generated this Purchase Requisition": "\u0408\u0435\u0434\u0430\u043d \u0438\u043b\u0438 \u0432\u0438\u0448\u0435 \u043f\u0440\u043e\u0434\u0430\u0458\u0435 \u041d\u0430\u043b\u043e\u0433 \u043d\u0435\u043c\u0430 \u043a\u043e\u0458\u0438 \u0433\u0435\u043d\u0435\u0440\u0438\u0448\u0443 \u043e\u0432\u0443 \u043a\u0443\u043f\u043e\u0432\u0438\u043d\u0443 \u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0446\u0438\u0458\u0435",
"Pull Sales Order Items": "\u041f\u043e\u0432\u0443\u0446\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u0430\u0458\u0435 \u0441\u0442\u0430\u0432\u043a\u0435 \u043f\u043e\u0440\u0443\u045f\u0431\u0438\u043d\u0435",
"Purchase Request": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0417\u0430\u0445\u0442\u0435\u0432",
"Purchase Requisition Details": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0414\u0435\u0442\u0430\u0459\u0438 \u0440\u0435\u043a\u0432\u0438\u0437\u0438\u0446\u0438\u0458\u0435",
"Remarks": "\u041f\u0440\u0438\u043c\u0435\u0434\u0431\u0435",
"Requested By": "\u0417\u0430\u0445\u0442\u0435\u0432\u0430\u043e",
"Sales Order No": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430 \u041d\u0430\u0440\u0443\u0447\u0438\u0442\u0435 \u041d\u0435\u043c\u0430",
"Select Terms and Conditions": "\u0418\u0437\u0430\u0431\u0435\u0440\u0438\u0442\u0435 \u0423\u0441\u043b\u043e\u0432\u0435",
"Select the relevant company name if you have multiple companies": "\u0418\u0437\u0430\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0434\u0433\u043e\u0432\u0430\u0440\u0430\u0458\u0443\u045b\u0443 \u0438\u043c\u0435 \u043a\u043e\u043c\u043f\u0430\u043d\u0438\u0458\u0435, \u0430\u043a\u043e \u0438\u043c\u0430\u0442\u0435 \u0432\u0438\u0448\u0435 \u043f\u0440\u0435\u0434\u0443\u0437\u0435\u045b\u0430",
"Series": "\u0421\u0435\u0440\u0438\u0458\u0430",
"Status": "\u0421\u0442\u0430\u0442\u0443\u0441",
"Stopped": "\u0417\u0430\u0443\u0441\u0442\u0430\u0432\u0459\u0435\u043d",
"Submitted": "\u041f\u043e\u0434\u043d\u0435\u0442",
"Terms and Conditions": "\u0423\u0441\u043b\u043e\u0432\u0438",
"Terms and Conditions Content": "\u0423\u0441\u043b\u043e\u0432\u0438 \u043a\u043e\u0440\u0438\u0448\u045b\u0435\u045a\u0430 \u0441\u0430\u0434\u0440\u0436\u0430\u0458\u0430",
"The date at which current entry is corrected in the system.": "\u0414\u0430\u0442\u0443\u043c \u043d\u0430 \u043a\u043e\u0458\u0438 \u0442\u0440\u0435\u043d\u0443\u0442\u043d\u0430 \u0441\u0442\u0430\u0432\u043a\u0430 \u0458\u0435 \u0438\u0441\u043f\u0440\u0430\u0432\u0459\u0435\u043d \u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.",
"The date at which current entry is made in system.": "\u0414\u0430\u0442\u0443\u043c \u043d\u0430 \u043a\u043e\u0458\u0438 \u0458\u0435 \u0442\u0440\u0435\u043d\u0443\u0442\u043d\u0438 \u0443\u043d\u043e\u0441 \u043d\u0430\u043f\u0440\u0430\u0432\u0459\u0435\u043d \u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.",
"To manage multiple series please go to Setup > Manage Series": "\u0414\u0430 \u0431\u0438\u0441\u0442\u0435 \u0443\u043f\u0440\u0430\u0432\u0459\u0430\u043b\u0438 \u0432\u0438\u0448\u0435 \u0441\u0435\u0440\u0438\u0458\u0443 \u0438\u0434\u0438\u0442\u0435 \u043d\u0430 \u0421\u0435\u0442\u0443\u043f&gt; \u0423\u043f\u0440\u0430\u0432\u0459\u0430\u045a\u0435 \u0421\u0435\u0440\u0438\u0435\u0441",
"Transaction Date": "\u0422\u0440\u0430\u043d\u0441\u0430\u043a\u0446\u0438\u0458\u0430 \u0414\u0430\u0442\u0443\u043c"
}

View File

@ -1,41 +0,0 @@
{
"% Ordered": "% \u0b86\u0ba3\u0bc8\u0baf\u0bbf\u0b9f\u0bcd\u0b9f\u0bbe\u0bb0\u0bcd",
"% of materials ordered against this Purchase Requisition": "\u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0b9f\u0bcd\u0b95\u0bb3\u0bc8% \u0b87\u0ba8\u0bcd\u0ba4 \u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0b8e\u0ba4\u0bbf\u0bb0\u0bbe\u0b95 \u0b89\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bbf\u0b9f\u0bcd\u0b9f\u0bbe\u0bb0\u0bcd",
"Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0b87\u0ba9\u0bcd\u0ba9\u0bc1\u0bae\u0bcd \u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95. \u0ba8\u0bc0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b92\u0bb0\u0bc1 \u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0bae\u0bbe\u0bb8\u0bcd\u0b9f\u0bb0\u0bcd \u0ba4\u0baf\u0bbe\u0bb0\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bbe\u0bae\u0bcd",
"After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0baa\u0bbf\u0bb1\u0b95\u0bc1, \u0b92\u0bb0\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b9f\u0bb2\u0bcd \u0baa\u0bc6\u0b9f\u0bcd\u0b9f\u0bbf \u0b87\u0ba8\u0bcd\u0ba4 \u0ba4\u0bc1\u0bb1\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0baa\u0bbf\u0bb0\u0ba4\u0bbf\u0baa\u0bb2\u0bbf\u0ba4\u0bcd\u0ba4\u0ba4\u0bc1 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b95\u0bbe\u0bb0\u0ba3\u0bae\u0bcd \u0b95\u0bc7\u0b9f\u0bcd\u0b9f\u0bc1\u0bb5\u0bbf\u0b9f\u0bc1\u0bae\u0bcd",
"Amended From": "\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bbf\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f",
"Amendment Date": "\u0ba4\u0bbf\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bc7\u0ba4\u0bbf",
"Buying": "\u0bb5\u0bbe\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bb2\u0bcd",
"Cancel Reason": "\u0b95\u0bbe\u0bb0\u0ba3\u0bae\u0bcd \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1",
"Cancelled": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1",
"Company": "\u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0bae\u0bcd",
"Draft": "\u0b95\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bb5\u0bc0\u0b9a\u0bcd\u0b9a\u0bc1",
"File List": "\u0b95\u0bc7\u0bbe\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
"Filing in Additional Information about the Purchase Requisition will help you analyze your data better.": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0baa\u0bb1\u0bcd\u0bb1\u0bbf \u0b95\u0bc2\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0b95\u0bb5\u0bb2\u0bcd \u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bb2\u0bcd \u0ba8\u0bc0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0ba8\u0ba9\u0bcd\u0bb1\u0bbe\u0b95 \u0b89\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0ba4\u0bb0\u0bb5\u0bc1 \u0baa\u0b95\u0bc1\u0baa\u0bcd\u0baa\u0bbe\u0baf\u0bcd\u0bb5\u0bc1 \u0b89\u0ba4\u0bb5\u0bc1\u0bae\u0bcd.",
"Fiscal Year": "\u0ba8\u0bbf\u0ba4\u0bbf\u0baf\u0bbe\u0ba3\u0bcd\u0b9f\u0bc1",
"Get Terms and Conditions": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0b95\u0bbf\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1\u0bae\u0bcd",
"IDT": "IDT",
"Items": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",
"Letter Head": "\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf\u0baf\u0b9f\u0b99\u0bcd\u0b95\u0bb2\u0bcd",
"More Info": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd \u0ba4\u0b95\u0bb5\u0bb2\u0bcd",
"Name of the entity who has requested for the Purchase Requisition": "\u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0baa\u0bb1\u0bcd\u0bb1\u0bbf \u0b95\u0bc7\u0b9f\u0bcd\u0b9f\u0bc1 \u0baf\u0bbe\u0bb0\u0bcd \u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0bae\u0bcd \u0baa\u0bc6\u0baf\u0bb0\u0bcd",
"One or multiple Sales Order no which generated this Purchase Requisition": "\u0b87\u0ba8\u0bcd\u0ba4 \u0b95\u0bc6\u0bbe\u0bb3\u0bcd\u0bae\u0bc1\u0ba4\u0bb2\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0b89\u0bb0\u0bc1\u0bb5\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0b92\u0ba9\u0bcd\u0bb1\u0bc1 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0baa\u0bb2 \u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b86\u0ba3\u0bc8 \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
"Pull Sales Order Items": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0b95\u0bb3\u0bcd \u0b87\u0bb4\u0bc1\u0b95\u0bcd\u0b95",
"Purchase Request": "\u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0bb5\u0bbe\u0b99\u0bcd\u0b95",
"Purchase Requisition Details": "\u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0bb5\u0bbf\u0bb5\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bb5\u0bbe\u0b99\u0bcd\u0b95",
"Remarks": "\u0b95\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
"Requested By": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd \u0b95\u0bc7\u0bbe\u0bb0\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f",
"Sales Order No": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b86\u0ba3\u0bc8 \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
"Select Terms and Conditions": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1",
"Select the relevant company name if you have multiple companies": "\u0ba8\u0bc0\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0baa\u0bb2 \u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd \u0b9a\u0bae\u0bcd\u0baa\u0ba8\u0bcd\u0ba4\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0ba9\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0bc6\u0baf\u0bb0\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1",
"Series": "\u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd",
"Status": "\u0b85\u0ba8\u0bcd\u0ba4\u0bb8\u0bcd\u0ba4\u0bc1",
"Stopped": "\u0ba8\u0bbf\u0bb1\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf",
"Submitted": "\u0b9a\u0bae\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
"Terms and Conditions": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd",
"Terms and Conditions Content": "\u0ba8\u0bbf\u0baa\u0ba8\u0bcd\u0ba4\u0ba9\u0bc8\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd",
"The date at which current entry is corrected in the system.": "\u0ba4\u0bc7\u0ba4\u0bbf \u0b87\u0ba4\u0bc1 \u0ba4\u0bb1\u0bcd\u0baa\u0bc7\u0bbe\u0ba4\u0bc8\u0baf \u0b89\u0bb3\u0bcd\u0bb3\u0bc0\u0b9f\u0bc1 \u0bae\u0bc1\u0bb1\u0bc8 \u0b9a\u0bb0\u0bbf.",
"The date at which current entry is made in system.": "\u0ba4\u0bb1\u0bcd\u0baa\u0bc7\u0bbe\u0ba4\u0bc8\u0baf \u0b89\u0bb3\u0bcd\u0bb3\u0bc0\u0b9f\u0bc1 \u0b85\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc1\u0bb5\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0ba4\u0bbf.",
"To manage multiple series please go to Setup > Manage Series": "\u0baa\u0bb2 \u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd \u0ba8\u0bbf\u0bb0\u0bcd\u0bb5\u0b95\u0bbf\u0b95\u0bcd\u0b95 \u0b85\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bcd\u0b95&gt; \u0ba4\u0bc6\u0bbe\u0b9f\u0bb0\u0bcd \u0ba8\u0bbf\u0bb0\u0bcd\u0bb5\u0b95\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd",
"Transaction Date": "\u0baa\u0bb0\u0bbf\u0bb5\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0ba9\u0bc8 \u0ba4\u0bc7\u0ba4\u0bbf"
}

View File

@ -1 +0,0 @@
from __future__ import unicode_literals

View File

@ -1,19 +0,0 @@
{
"Brand": "\u041c\u0430\u0440\u043a\u0430",
"Buying": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430",
"Description": "\u041e\u043f\u0438\u0441",
"Item Code": "\u0428\u0438\u0444\u0440\u0430",
"Item Group": "\u0421\u0442\u0430\u0432\u043a\u0430 \u0413\u0440\u0443\u043f\u0430",
"Item Name": "\u041d\u0430\u0437\u0438\u0432",
"Lead Time Date": "\u041e\u043b\u043e\u0432\u043e \u0414\u0430\u0442\u0443\u043c \u0412\u0440\u0435\u043c\u0435",
"Min Order Qty": "\u041c\u0438\u043d\u0438\u043c\u0430\u043b\u043d\u0430 \u043a\u043e\u043b\u0438\u0447\u0438\u043d\u0430 \u0437\u0430 \u043f\u043e\u0440\u0443\u0447\u0438\u0432\u0430\u045a\u0435",
"Ordered Qty": "\u041d\u0430\u0440\u0443\u0447\u0435\u043d\u043e \u041a\u043e\u043b",
"Page Break": "\u0421\u0442\u0440\u0430\u043d\u0430 \u041f\u0430\u0443\u0437\u0430",
"Projected Qty": "\u041f\u0440\u043e\u0458\u0435\u043a\u0442\u043e\u0432\u0430\u043d\u0438 \u041a\u043e\u043b",
"Purchase Request Item": "\u041a\u0443\u043f\u043e\u0432\u0438\u043d\u0430 \u0441\u0442\u0430\u0432\u043a\u0443 \u0417\u0430\u0445\u0442\u0435\u0432",
"Quantity": "\u041a\u043e\u043b\u0438\u0447\u0438\u043d\u0430",
"Required Date": "\u041f\u043e\u0442\u0440\u0435\u0431\u0430\u043d \u0434\u0430\u0442\u0443\u043c",
"Sales Order No": "\u041f\u0440\u043e\u0434\u0430\u0458\u0430 \u041d\u0430\u0440\u0443\u0447\u0438\u0442\u0435 \u041d\u0435\u043c\u0430",
"Stock UOM": "\u0411\u0435\u0440\u0437\u0430 \u0423\u041e\u041c",
"Warehouse": "\u041c\u0430\u0433\u0430\u0446\u0438\u043d"
}

View File

@ -1,19 +0,0 @@
{
"Brand": "\u0baa\u0bbf\u0bb0\u0bbe\u0ba3\u0bcd\u0b9f\u0bcd",
"Buying": "\u0bb5\u0bbe\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bb2\u0bcd",
"Description": "\u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0bae\u0bcd",
"Item Code": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0baf\u0bc8 \u0b95\u0bc7\u0bbe\u0b9f\u0bcd",
"Item Group": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0baf\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
"Item Name": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf \u0baa\u0bc6\u0baf\u0bb0\u0bcd",
"Lead Time Date": "\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0ba4\u0bc7\u0ba4\u0bbf \u0b87\u0b9f\u0bcd\u0b9f\u0bc1",
"Min Order Qty": "Min \u0b86\u0bb0\u0bcd\u0b9f\u0bb0\u0bcd \u0b85\u0bb3\u0bb5\u0bc1",
"Ordered Qty": "\u0b89\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bbf\u0b9f\u0bcd\u0b9f\u0bbe\u0bb0\u0bcd \u0b85\u0bb3\u0bb5\u0bc1",
"Page Break": "\u0baa\u0b95\u0bcd\u0b95\u0bae\u0bcd \u0baa\u0bbf\u0bb0\u0bc7\u0b95\u0bcd",
"Projected Qty": "\u0ba4\u0bbf\u0b9f\u0bcd\u0b9f\u0bae\u0bbf\u0b9f\u0bcd\u0b9f\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0ba4\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1",
"Purchase Request Item": "\u0b95\u0bc7\u0bbe\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bc8 \u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd \u0bb5\u0bbe\u0b99\u0bcd\u0b95",
"Quantity": "\u0b85\u0bb3\u0bb5\u0bc1",
"Required Date": "\u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 \u0ba4\u0bc7\u0ba4\u0bbf",
"Sales Order No": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0b86\u0ba3\u0bc8 \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
"Stock UOM": "\u0baa\u0b99\u0bcd\u0b95\u0bc1 \u0bae\u0bc6\u0bbe\u0bb1\u0b9f\u0bcd\u0b9f\u0bc1\u0bb5 \u0baa\u0bb2\u0bcd\u0b95\u0bb2\u0bc8\u0b95\u0bb4\u0b95\u0bae\u0bcd",
"Warehouse": "\u0bb5\u0bbf\u0bb1\u0bcd\u0baa\u0ba9\u0bc8 \u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd\u0b95\u0bb3\u0bcd \u0bb5\u0bc8\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bae\u0bcd \u0b87\u0b9f\u0bae\u0bcd"
}

View File

@ -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

View File

@ -19,7 +19,7 @@ import webnotes
from webnotes.model import db_exists
from webnotes.model.doc import addchild, make_autoname
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
sql = webnotes.conn.sql

View File

@ -16,8 +16,9 @@
from __future__ import unicode_literals
import webnotes
import webnotes.defaults
from webnotes.utils import cint, get_defaults
from webnotes.utils import cint
from webnotes import msgprint, _
from webnotes.model.doc import make_autoname
@ -35,7 +36,7 @@ class DocType(TransactionBase):
self.add_communication_list()
def autoname(self):
supp_master_name = get_defaults()['supp_master_name']
supp_master_name = webnotes.defaults.get_global_default('supp_master_name')
if supp_master_name == 'Supplier Name':
if webnotes.conn.exists("Customer", self.doc.supplier_name):
@ -98,7 +99,7 @@ class DocType(TransactionBase):
def validate(self):
#validation for Naming Series mandatory field...
if get_defaults()['supp_master_name'] == 'Naming Series':
if webnotes.defaults.get_global_default('supp_master_name') == 'Naming Series':
if not self.doc.naming_series:
msgprint("Series is Mandatory.", raise_exception=1)
@ -161,7 +162,7 @@ class DocType(TransactionBase):
def on_rename(self, new, old):
#update supplier_name if not naming series
if get_defaults().get('supp_master_name') == 'Supplier Name':
if webnotes.defaults.get_global_default('supp_master_name') == 'Supplier Name':
update_fields = [
('Supplier', 'name'),
('Address', 'supplier'),

View File

@ -17,7 +17,6 @@
"Supplier Address",
"Select Print Heading",
"More Info",
"Select Purchase Request",
"Terms and Conditions HTML",
"Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"Exchange Rate",
@ -39,6 +38,7 @@
"Buying",
"Price List",
"Status",
"Select Material Request",
"Rounded Total",
"Name",
"To manage multiple series please go to Setup > Manage Series",
@ -57,7 +57,6 @@
"Totals",
"Supplier (vendor) name as entered in supplier master",
"Taxes and Charges Deducted",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.",
"Net Total*",
"The date at which current entry is made in system.",
"Currency & Price List",
@ -69,10 +68,11 @@
"Grand Total",
"Get Tax Detail",
"Supplier Quotation",
"Taxes and Charges Deducted (Import)",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.",
"Series",
"Draft",
"Yes",
"Total Tax*",
"In Words will be visible once you save the Purchase Order."
"In Words will be visible once you save the Purchase Order.",
"Taxes and Charges Deducted (Import)"
]

View File

@ -46,6 +46,7 @@
"Re-Calculate Values": "\u0625\u0639\u0627\u062f\u0629 \u062d\u0633\u0627\u0628 \u0627\u0644\u0642\u064a\u0645",
"Rounded Total": "\u062a\u0642\u0631\u064a\u0628 \u0625\u062c\u0645\u0627\u0644\u064a",
"SQTN": "SQTN",
"Select Material Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f",
"Select Print Heading": "\u062d\u062f\u062f \u0637\u0628\u0627\u0639\u0629 \u0627\u0644\u0639\u0646\u0648\u0627\u0646",
"Select Purchase Request": "\u062d\u062f\u062f \u0637\u0644\u0628 \u0634\u0631\u0627\u0621",
"Select Terms and Conditions": "\u062d\u062f\u062f \u0627\u0644\u0634\u0631\u0648\u0637 \u0648\u0627\u0644\u0623\u062d\u0643\u0627\u0645",
@ -74,5 +75,6 @@
"Total Tax*": "\u0645\u062c\u0645\u0648\u0639 \u0627\u0644\u0636\u0631\u0627\u0626\u0628 *",
"Totals": "\u0627\u0644\u0645\u062c\u0627\u0645\u064a\u0639",
"Yes": "\u0646\u0639\u0645",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0645\u0648\u0627\u062f \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0637\u0644\u0628 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u064a\u0645\u0643\u0646\u0643 \u0625\u0635\u062f\u0627\u0631 \u0623\u0645\u0631 \u0634\u0631\u0627\u0621 \u0645\u0646 \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0645\u062a\u0639\u062f\u062f\u0629. \u062d\u062f\u062f \u0637\u0644\u0628\u0627\u062a \u0627\u0644\u0634\u0631\u0627\u0621 \u0648\u0627\u062d\u062f\u0627 \u062a\u0644\u0648 \u0627\u0644\u0622\u062e\u0631 \u062b\u0645 \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0627\u0644\u0632\u0631 \u0623\u062f\u0646\u0627\u0647."
}

View File

@ -46,6 +46,7 @@
"Re-Calculate Values": "Vuelva a calcular los valores",
"Rounded Total": "Total redondeado",
"SQTN": "SQTN",
"Select Material Request": "Seleccione Solicitud de material",
"Select Print Heading": "Seleccione Imprimir Encabezado",
"Select Purchase Request": "Seleccione Solicitud de Compra",
"Select Terms and Conditions": "Seleccione T\u00e9rminos y Condiciones",
@ -74,5 +75,6 @@
"Total Tax*": "* Total de Impuestos",
"Totals": "Totales",
"Yes": "S\u00ed",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de solicitudes de materiales m\u00faltiples. Seleccione solicitudes de material de uno en uno y haga clic en el bot\u00f3n de abajo.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Usted puede hacer una orden de compra de varias Ordenes de Compra. Seleccione Ordenes de Compra uno por uno y haga clic en el bot\u00f3n de abajo."
}

View File

@ -46,6 +46,7 @@
"Re-Calculate Values": "Re-calculer les valeurs",
"Rounded Total": "Totale arrondie",
"SQTN": "SQTN",
"Select Material Request": "S\u00e9lectionnez Demande de Mat\u00e9riel",
"Select Print Heading": "S\u00e9lectionnez Imprimer Cap",
"Select Purchase Request": "S\u00e9lectionnez la demande d&#39;achat",
"Select Terms and Conditions": "S\u00e9lectionnez Termes et Conditions",
@ -74,5 +75,6 @@
"Total Tax*": "* Total de la taxe",
"Totals": "Totaux",
"Yes": "Oui",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Vous pouvez faire un bon de commande de mat\u00e9riel demandes multiples. S\u00e9lectionnez demandes de mat\u00e9riel, un par un et cliquez sur le bouton ci-dessous.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Vous pouvez faire une commande \u00e0 partir de demandes d&#39;achat multiples. S\u00e9lectionnez Demande d&#39;Achat un par un et cliquez sur le bouton ci-dessous."
}

View File

@ -47,6 +47,7 @@
"Re-Calculate Values": "\u092a\u0941\u0928\u0903 \u0917\u0923\u0928\u093e \u092e\u093e\u0928",
"Rounded Total": "\u0917\u094b\u0932 \u0915\u0941\u0932",
"SQTN": "SQTN",
"Select Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902",
"Select Print Heading": "\u091a\u092f\u0928 \u0936\u0940\u0930\u094d\u0937\u0915 \u092a\u094d\u0930\u093f\u0902\u091f",
"Select Purchase Request": "\u0916\u0930\u0940\u0926 \u0915\u0947 \u0905\u0928\u0941\u0930\u094b\u0927 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902",
"Select Terms and Conditions": "\u0928\u093f\u092f\u092e\u094b\u0902 \u0914\u0930 \u0936\u0930\u094d\u0924\u094b\u0902 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902",
@ -75,5 +76,6 @@
"Total Tax*": "\u0915\u0941\u0932 \u091f\u0948\u0915\u094d\u0938 *",
"Totals": "\u092f\u094b\u0917",
"Yes": "\u0939\u093e\u0902",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "\u0906\u092a \u0915\u0908 \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u0938\u0947 \u090f\u0915 \u0916\u0930\u0940\u0926 \u0906\u0926\u0947\u0936 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902. \u0916\u0930\u0940\u0926 \u0905\u0928\u0941\u0930\u094b\u0927 \u090f\u0915 \u0915\u0947 \u092c\u093e\u0926 \u090f\u0915 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902 \u0914\u0930 \u0928\u0940\u091a\u0947 \u0915\u0947 \u092c\u091f\u0928 \u092a\u0930 \u0915\u094d\u0932\u093f\u0915 \u0915\u0930\u0947\u0902."
}

View File

@ -46,6 +46,7 @@
"Re-Calculate Values": "Ponovno izra\u010dunati vrijednosti",
"Rounded Total": "Zaobljeni Ukupno",
"SQTN": "SQTN",
"Select Material Request": "Odaberite Materijal Zahtjev",
"Select Print Heading": "Odaberite Ispis Naslov",
"Select Purchase Request": "Odaberite zahtjev za kupnju",
"Select Terms and Conditions": "Odaberite Uvjeti i pravila",
@ -74,5 +75,6 @@
"Total Tax*": "Ukupno poreza *",
"Totals": "Ukupan rezultat",
"Yes": "Da",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje od vi\u0161e materijala zahtjeva. Odaberite materijalni zahtijevi jedan po jedan i kliknite na gumb ispod.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Mo\u017eete napraviti redoslijed kupnje iz vi\u0161e Kupiti zahtjeva. Odaberite kupnje Zahtjevi jednu po jednu i kliknite na gumb ispod."
}

View File

@ -46,6 +46,7 @@
"Re-Calculate Values": "Re-waarden berekenen",
"Rounded Total": "Afgeronde Totaal",
"SQTN": "SQTN",
"Select Material Request": "Selecteer Materiaal aanvragen",
"Select Print Heading": "Selecteer Print rubriek",
"Select Purchase Request": "Selecteer Purchase Request",
"Select Terms and Conditions": "Selecteer Algemene Voorwaarden",
@ -74,5 +75,6 @@
"Total Tax*": "Totaal BTW *",
"Totals": "Totalen",
"Yes": "Ja",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "U kunt een bestelling van meerdere Materiaal aanvragen. Selecteer Materiaal Verzoeken een voor een en klikt u op de knop.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "U kunt een bestelling van meerdere aankoopverzoeken. Selecteer inkoopaanvragen een voor een en klikt u op de knop."
}

View File

@ -46,6 +46,7 @@
"Re-Calculate Values": "Re-calcular valores",
"Rounded Total": "Total arredondado",
"SQTN": "SQTN",
"Select Material Request": "Selecione solicitar material",
"Select Print Heading": "Selecione Imprimir t\u00edtulo",
"Select Purchase Request": "Selecione Pedido de Compra",
"Select Terms and Conditions": "Selecione Termos e Condi\u00e7\u00f5es",
@ -74,5 +75,6 @@
"Total Tax*": "* Total de impostos",
"Totals": "Totais",
"Yes": "Sim",
"You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.": "Voc\u00ea pode fazer um pedido de compra de materiais pedidos m\u00faltiplos. Selecione pedidos se um por um e clique no bot\u00e3o abaixo.",
"You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.": "Voc\u00ea pode fazer uma ordem de compra de pedidos de compras m\u00faltiplas. Selecione pedidos de compra, um por um e clique no bot\u00e3o abaixo."
}

View File

@ -88,13 +88,11 @@ cur_frm.fields_dict['quotation_items'].grid.get_field('project_name').get_query
}
cur_frm.fields_dict['indent_no'].get_query = function(doc) {
return "select distinct `tabPurchase Request`.`name` from `tabPurchase Request` \
where `tabPurchase Request`.company = \"" + doc.company +
"\" and `tabPurchase Request`.`docstatus` = 1 and \
`tabPurchase Request`.`status` != \"Stopped\" and \
ifnull(`tabPurchase Request`.`per_ordered`,0) < 99.99 and \
`tabPurchase Request`.%(key)s LIKE \"%s\" \
order by `tabPurchase Request`.`name` desc limit 50";
return "select distinct `name` from `tabMaterial Request` \
where material_request_type='Purchase' and company = \"" + doc.company +
"\" and `docstatus` = 1 and `status` != \"Stopped\" and \
ifnull(`per_ordered`,0) < 99.99 and \
%(key)s LIKE \"%s\" order by `name` desc limit 50";
}
cur_frm.cscript.supplier_address = function(doc, dt, dn) {

View File

@ -52,12 +52,12 @@ class DocType(BuyingController):
def get_indent_details(self):
if self.doc.indent_no:
mapper = get_obj("DocType Mapper", "Purchase Request-Supplier Quotation")
mapper.dt_map("Purchase Request", "Supplier Quotation", self.doc.indent_no,
self.doc, self.doclist, """[['Purchase Request', 'Supplier Quotation'],
['Purchase Request Item', 'Supplier Quotation Item']]""")
mapper = get_obj("DocType Mapper", "Material Request-Supplier Quotation")
mapper.dt_map("Material Request", "Supplier Quotation", self.doc.indent_no,
self.doc, self.doclist, """[['Material Request', 'Supplier Quotation'],
['Material Request Item', 'Supplier Quotation Item']]""")
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
for d in getlist(self.doclist, self.fname):
if d.item_code and not d.purchase_rate:
d.purchase_ref_rate = d.discount_rate = d.purchase_rate = 0.0

View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-01-29 17:54:11",
"creation": "2013-01-29 19:25:54",
"docstatus": 0,
"modified": "2013-01-29 18:11:12",
"modified": "2013-02-18 13:40:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -31,9 +31,7 @@
"parent": "Supplier Quotation",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
"read": 1
},
{
"doctype": "DocType",
@ -167,16 +165,16 @@
"options": "Simple"
},
{
"description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.",
"description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.",
"doctype": "DocField",
"fieldname": "indent_no",
"fieldtype": "Link",
"hidden": 0,
"label": "Select Purchase Request",
"label": "Select Material Request",
"no_copy": 1,
"oldfieldname": "indent_no",
"oldfieldtype": "Link",
"options": "Purchase Request",
"options": "Material Request",
"print_hide": 1
},
{
@ -679,6 +677,8 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Manufacturing Manager",
"submit": 1,
"write": 1
@ -688,6 +688,8 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Purchase Manager",
"submit": 1,
"write": 1
@ -697,6 +699,8 @@
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Purchase User",
"submit": 0,
"write": 1
@ -706,6 +710,8 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Material User",
"submit": 0,
"write": 0
@ -715,8 +721,21 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Supplier",
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 0,
"role": "All",
"submit": 0,
"write": 0
}
]

View File

@ -2,7 +2,7 @@
"Supplier Quotation Item",
"Item Name",
"Discount %",
"Purchase Request Detail No",
"Material Request Detail No",
"Prevdoc DocType",
"Warehouse",
"UOM",
@ -11,17 +11,17 @@
"Project Name",
"Brand",
"Supplier Part Number",
"Purchase Request No",
"Item Code",
"Buying",
"Rate ",
"Material Request No",
"Rate*",
"Amount*",
"Amount",
"Ref Rate ",
"Item Group",
"Purchase Request Date",
"If Supplier Part Number exists for given Item, it gets stored here",
"Item Code",
"Material Request Date",
"Ref Rate*",
"Quantity",
"Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges",

View File

@ -11,6 +11,9 @@
"Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629",
"Item Name": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0627\u0633\u0645",
"Item Tax Rate": "\u0627\u0644\u0628\u0646\u062f \u0636\u0631\u064a\u0628\u0629",
"Material Request Date": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u062a\u0627\u0631\u064a\u062e",
"Material Request Detail No": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f \u0644\u0627",
"Material Request No": "\u0637\u0644\u0628 \u0645\u0648\u0627\u062f \u0644\u0627",
"Page Break": "\u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0633\u062a\u0631\u0627\u062d\u0629",
"Prevdoc DocType": "Prevdoc DOCTYPE",
"Project Name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0634\u0631\u0648\u0639",

View File

@ -11,6 +11,9 @@
"Item Group": "Grupo de art\u00edculos",
"Item Name": "Nombre del elemento",
"Item Tax Rate": "Art\u00edculo Tasa Impositiva",
"Material Request Date": "Material de la Fecha de Solicitud",
"Material Request Detail No": "Materiales Detalle Solicitud de No",
"Material Request No": "Material de Solicitud de No",
"Page Break": "Salto de p\u00e1gina",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Nombre del proyecto",

View File

@ -11,6 +11,9 @@
"Item Group": "Groupe d&#39;\u00e9l\u00e9ments",
"Item Name": "Nom d&#39;article",
"Item Tax Rate": "Taux d&#39;imposition article",
"Material Request Date": "Date de demande de mat\u00e9riel",
"Material Request Detail No": "D\u00e9tail Demande Support Aucun",
"Material Request No": "Demande de Support Aucun",
"Page Break": "Saut de page",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Nom du projet",

View File

@ -11,6 +11,9 @@
"Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939",
"Item Name": "\u092e\u0926 \u0915\u093e \u0928\u093e\u092e",
"Item Tax Rate": "\u0906\u0907\u091f\u092e \u0915\u0930 \u0915\u0940 \u0926\u0930",
"Material Request Date": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0924\u093f\u0925\u093f",
"Material Request Detail No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u0930\u094b\u0927 \u0935\u093f\u0938\u094d\u0924\u093e\u0930 \u0928\u0939\u0940\u0902",
"Material Request No": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927 \u0928\u0939\u0940\u0902",
"Page Break": "\u092a\u0943\u0937\u094d\u0920\u093e\u0924\u0930",
"Prevdoc DocType": "Prevdoc doctype",
"Project Name": "\u0907\u0938 \u092a\u0930\u093f\u092f\u094b\u091c\u0928\u093e \u0915\u093e \u0928\u093e\u092e",

View File

@ -10,6 +10,9 @@
"Item Group": "Stavka Grupa",
"Item Name": "Stavka Ime",
"Item Tax Rate": "Stavka Porezna stopa",
"Material Request Date": "Materijal Zahtjev Datum",
"Material Request Detail No": "Materijal Zahtjev Detalj Ne",
"Material Request No": "Materijal Zahtjev Ne",
"Page Break": "Prijelom stranice",
"Prevdoc DocType": "Prevdoc DOCTYPE",
"Project Name": "Naziv projekta",

View File

@ -11,6 +11,9 @@
"Item Group": "Item Group",
"Item Name": "Naam van het punt",
"Item Tax Rate": "Item Belastingtarief",
"Material Request Date": "Materiaal Aanvraagdatum",
"Material Request Detail No": "Materiaal Aanvraag Detail Geen",
"Material Request No": "Materiaal aanvragen Geen",
"Page Break": "Pagina-einde",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Naam van het project",

View File

@ -11,6 +11,9 @@
"Item Group": "Grupo Item",
"Item Name": "Nome do item",
"Item Tax Rate": "Taxa de Imposto item",
"Material Request Date": "Data de Solicita\u00e7\u00e3o de material",
"Material Request Detail No": "Detalhe materiais Pedido N\u00e3o",
"Material Request No": "Pedido de material no",
"Page Break": "Quebra de p\u00e1gina",
"Prevdoc DocType": "Prevdoc DocType",
"Project Name": "Nome do projeto",

View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-01-28 10:06:00",
"creation": "2013-01-29 19:25:55",
"docstatus": 0,
"modified": "2013-01-29 16:28:05",
"modified": "2013-02-18 13:39:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -208,11 +208,11 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
"label": "Purchase Request No",
"label": "Material Request No",
"no_copy": 0,
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link",
"options": "Purchase Request",
"options": "Material Request",
"print_hide": 1,
"print_width": "120px",
"read_only": 1,
@ -225,7 +225,7 @@
"fieldtype": "Date",
"hidden": 1,
"in_filter": 1,
"label": "Purchase Request Date",
"label": "Material Request Date",
"oldfieldname": "prevdoc_date",
"oldfieldtype": "Date",
"print_hide": 1,
@ -238,7 +238,7 @@
"fieldtype": "Data",
"hidden": 1,
"in_filter": 1,
"label": "Purchase Request Detail No",
"label": "Material Request Detail No",
"no_copy": 0,
"oldfieldname": "prevdoc_detail_docname",
"oldfieldtype": "Data",

View File

@ -7,9 +7,9 @@ wn.module_page["Buying"] = [
icon: "icon-copy",
items: [
{
label: wn._("Purchase Request"),
label: wn._("Material Request"),
description: wn._("Request for purchase."),
doctype:"Purchase Request"
doctype:"Material Request"
},
{
label: wn._("Supplier Quotation"),

View File

@ -1,9 +1,9 @@
[
"Documents",
"Material Request",
"Request for purchase.",
"Supplier",
"Template of terms or contract.",
"Purchase Request",
"Terms and Conditions",
"Purchase Returns",
"All Addresses.",

View File

@ -10,6 +10,7 @@
"Item": "\u0628\u0646\u062f",
"Item Group": "\u0627\u0644\u0628\u0646\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629",
"Masters": "\u0627\u0644\u0645\u0627\u062c\u0633\u062a\u064a\u0631",
"Material Request": "\u0637\u0644\u0628 \u0627\u0644\u0645\u0648\u0627\u062f",
"Purchase Analytics": "\u0634\u0631\u0627\u0621 \u062a\u062d\u0644\u064a\u0644\u0627\u062a",
"Purchase Order": "\u0623\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621",
"Purchase Orders given to Suppliers.": "\u0623\u0648\u0627\u0645\u0631 \u0627\u0644\u0634\u0631\u0627\u0621 \u0646\u0638\u0631\u0627 \u0644\u0644\u0645\u0648\u0631\u062f\u064a\u0646.",

View File

@ -10,6 +10,7 @@
"Item": "Art\u00edculo",
"Item Group": "Grupo de art\u00edculos",
"Masters": "Masters",
"Material Request": "Material de Solicitud",
"Purchase Analytics": "Compra Analytics",
"Purchase Order": "Orden de Compra",
"Purchase Orders given to Suppliers.": "Compra \u00f3rdenes dadas a los proveedores.",

View File

@ -10,6 +10,7 @@
"Item": "Article",
"Item Group": "Groupe d&#39;\u00e9l\u00e9ments",
"Masters": "Ma\u00eetres",
"Material Request": "Demande de mat\u00e9riel",
"Purchase Analytics": "Achat Analytics",
"Purchase Order": "Bon de commande",
"Purchase Orders given to Suppliers.": "Achetez commandes faites aux fournisseurs.",

View File

@ -10,6 +10,7 @@
"Item": "\u092e\u0926",
"Item Group": "\u0906\u0907\u091f\u092e \u0938\u092e\u0942\u0939",
"Masters": "\u0938\u094d\u0928\u093e\u0924\u0915\u094b\u0924\u094d\u0924\u0930",
"Material Request": "\u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u0905\u0928\u0941\u0930\u094b\u0927",
"Purchase Analytics": "\u0916\u0930\u0940\u0926 \u0935\u093f\u0936\u094d\u0932\u0947\u0937\u093f\u0915\u0940",
"Purchase Order": "\u0906\u0926\u0947\u0936 \u0916\u0930\u0940\u0926",
"Purchase Orders given to Suppliers.": "\u0916\u0930\u0940\u0926 \u0906\u092a\u0942\u0930\u094d\u0924\u093f\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u0947 \u0932\u093f\u090f \u0926\u093f\u090f \u0917\u090f \u0906\u0926\u0947\u0936.",

View File

@ -10,6 +10,7 @@
"Item": "Stavka",
"Item Group": "Stavka Grupa",
"Masters": "Majstori",
"Material Request": "Materijal zahtjev",
"Purchase Analytics": "Kupnja Analytics",
"Purchase Order": "Narud\u017ebenica",
"Purchase Orders given to Suppliers.": "Kupnja naloge koje je dao dobavlja\u010de.",

View File

@ -10,6 +10,7 @@
"Item": "Item",
"Item Group": "Item Group",
"Masters": "Masters",
"Material Request": "Materiaal aanvragen",
"Purchase Analytics": "Aankoop Analytics",
"Purchase Order": "Purchase Order",
"Purchase Orders given to Suppliers.": "Inkooporders aan leveranciers.",

View File

@ -10,6 +10,7 @@
"Item": "Item",
"Item Group": "Grupo Item",
"Masters": "Mestres",
"Material Request": "Pedido de material",
"Purchase Analytics": "Analytics compra",
"Purchase Order": "Ordem de Compra",
"Purchase Orders given to Suppliers.": "As ordens de compra dadas a fornecedores.",

View File

@ -21,7 +21,7 @@
"sort_by": "`tabPurchase Order`.`name`",
"page_len": 50,
"criteria_name": "Pending PO Items To Bill",
"columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
"columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Material Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
},
{
"name": "pending_po_items_to_bill",

View File

@ -21,7 +21,7 @@
"sort_by": "`tabPurchase Order`.`name`",
"page_len": 50,
"criteria_name": "Pending PO Items To Receive",
"columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
"columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Material Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
},
{
"name": "pending_po_items_to_receive",

View File

@ -37,7 +37,7 @@ def get_item_details(args):
args = webnotes._dict(args)
item_wrapper = webnotes.model_wrapper("Item", args.item_code)
item_wrapper = webnotes.bean("Item", args.item_code)
item = item_wrapper.doc
from stock.utils import validate_end_of_life
@ -98,7 +98,7 @@ def get_item_details(args):
def get_rates_as_per_price_list(args, item_doclist=None):
if not item_doclist:
item_doclist = webnotes.model_wrapper("Item", args.item_code).doclist
item_doclist = webnotes.bean("Item", args.item_code).doclist
result = item_doclist.get({"parentfield": "ref_rate_details",
"price_list_name": args.price_list_name, "ref_currency": args.price_list_currency,

View File

@ -18,7 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
sql = webnotes.conn.sql

View File

@ -9,7 +9,7 @@ erpnext.desktop.refresh = function() {
$("#icon-grid .case-wrapper").each(function(i, e) {
new_order.push($(this).attr("data-name"));
});
wn.user.set_default("_desktop_items", new_order);
wn.defaults.set_default("_desktop_items", new_order);
}
});
}

View File

@ -1,4 +1,8 @@
erpnext.updates = [
["21st February, 2013", [
"Item: Warehouse-wise Re-order Level and Quantity",
"Buying: Purchase Request renamed to Material Request"
]],
["20th February, 2013", [
"Disable Rounded Total: If disable in 'Global Defaults', Rounding related fields \
in sales cycle transactions and in corresponding print formats will not be visible"

View File

@ -26,7 +26,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
}
cur_frm.cscript.onload_post_render = function(doc,cdt,cdn){
if(doc.__islocal && doc.employee==user_defaults.employee) {
if(doc.__islocal && doc.employee==wn.defaults.get_user_default("employee")) {
cur_frm.set_value("employee", "");
cur_frm.set_value("employee_name", "")
}

View File

@ -18,7 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, flt, getdate
from webnotes.model.wrapper import getlist
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint

View File

@ -20,7 +20,7 @@ import webnotes
from webnotes.utils import add_days, getdate, now
from webnotes.model import db_exists
from webnotes.model.doc import make_autoname
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
from webnotes import msgprint
sql = webnotes.conn.sql

View File

@ -16,10 +16,11 @@
from __future__ import unicode_literals
import webnotes
import webnotes.default
from webnotes.utils import cint, cstr, date_diff, formatdate, get_defaults, getdate, now
from webnotes.utils import cint, cstr, date_diff, formatdate, getdate, now
from webnotes.model import db_exists
from webnotes.model.wrapper import copy_doclist
from webnotes.model.bean import copy_doclist
from webnotes import form, msgprint
sql = webnotes.conn.sql
@ -30,7 +31,6 @@ class DocType:
def __init__(self,d,dt):
self.doc, self.doclist = d,dt
#==========================================================================
def get_att_list(self):
lst = [['Attendance','','','Please fill columns which are Mandatory.',' Please do not modify the structure','',''],['','','','','','',''],['[Mandatory]','','[Mandatory]','[Mandatory]','[Mandatory]','[Mandatory]','[Mandatory]'],['Employee','Employee Name','Attendance Date','Status','Fiscal Year','Company','Naming Series']]
@ -46,7 +46,6 @@ class DocType:
return lst
#------------------------------------------------------------------------------
# get date list inbetween from date and to date
def date_diff_list(self):
import datetime
@ -65,10 +64,9 @@ class DocType:
return dt
#------------------------------------------------------------------------------
def get_att_data(self):
fy = get_defaults()['fiscal_year'] #get default fiscal year
comp = get_defaults()['company'] #get default company
fy = webnotes.defaults.get_global_default('fiscal_year')
comp = webnotes.defaults.get_user_default('company')
#get naming series of attendance
import webnotes.model.doctype
@ -82,7 +80,6 @@ class DocType:
return {'fy':fy,'comp':comp,'sr':sr}
#=================================================================================
def import_att_data(self):
filename = self.doc.file_list.split(',')

View File

@ -3,5 +3,6 @@
"Department": "\u0642\u0633\u0645",
"HR": "HR",
"Holiday Block List": "\u0625\u0642\u0627\u0645\u0627\u062a \u0642\u0627\u0626\u0645\u0629",
"Leave Block List": "\u062a\u0631\u0643 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631",
"Trash Reason": "\u0627\u0644\u0633\u0628\u0628 \u0627\u0644\u0642\u0645\u0627\u0645\u0629"
}

View File

@ -3,5 +3,6 @@
"Department": "Departamento",
"HR": "HR",
"Holiday Block List": "Holiday lista de bloqueo",
"Leave Block List": "Deja lista de bloqueo",
"Trash Reason": "Trash Raz\u00f3n"
}

View File

@ -3,5 +3,6 @@
"Department": "D\u00e9partement",
"HR": "RH",
"Holiday Block List": "Block List vacances",
"Leave Block List": "Laisser Block List",
"Trash Reason": "Raison Corbeille"
}

View File

@ -3,5 +3,6 @@
"Department": "\u0935\u093f\u092d\u093e\u0917",
"HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928",
"Holiday Block List": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940",
"Leave Block List": "\u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u091b\u094b\u0921\u093c \u0926\u094b",
"Trash Reason": "\u091f\u094d\u0930\u0948\u0936 \u0915\u093e\u0930\u0923"
}

View File

@ -3,5 +3,6 @@
"Department": "Odsjek",
"HR": "HR",
"Holiday Block List": "Turisti\u010dka Blok Popis",
"Leave Block List": "Ostavite Block List",
"Trash Reason": "Otpad Razlog"
}

View File

@ -3,5 +3,6 @@
"Department": "Afdeling",
"HR": "HR",
"Holiday Block List": "Holiday Block List",
"Leave Block List": "Laat Block List",
"Trash Reason": "Trash Reden"
}

View File

@ -3,5 +3,6 @@
"Department": "Departamento",
"HR": "HR",
"Holiday Block List": "Lista de Bloqueios de f\u00e9rias",
"Leave Block List": "Deixe Lista de Bloqueios",
"Trash Reason": "Raz\u00e3o lixo"
}

Some files were not shown because too many files have changed in this diff Show More