Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Anand Doshi 2013-05-09 15:17:33 +05:30
commit 3615123af4
15 changed files with 51 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/doctype/c_form/c_form.py
View File

@ -17,16 +17,12 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import flt, getdate
from webnotes.model.doc import make_autoname
from webnotes.model.bean import getlist
class DocType:
def __init__(self,d,dl):
self.doc, self.doclist = d,dl
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series + '.#####')
def validate(self):
"""Validate invoice that c-form is applicable
and no other c-form is received for that"""

2
accounts/doctype/cost_center/cost_center.py
View File

@ -29,7 +29,7 @@ class DocType(DocTypeNestedSet):
def autoname(self):
company_abbr = webnotes.conn.sql("select abbr from tabCompany where name=%s",
self.doc.company_name)[0][0]
self.doc.name = self.doc.cost_center_name + ' - ' + company_abbr
self.doc.name = self.doc.cost_center_name.strip() + ' - ' + company_abbr
def validate_mandatory(self):
if not self.doc.group_or_ledger:

5
accounts/doctype/journal_voucher/journal_voucher.py
View File

@ -34,11 +34,6 @@ class DocType(AccountsController):
self.credit_days_global = -1
self.is_approving_authority = -1
def autoname(self):
if not self.doc.naming_series:
webnotes.msgprint("""Naming Series is mandatory""", raise_exception=1)
self.doc.name = make_autoname(self.doc.naming_series+'.#####')
def validate(self):
if not self.doc.is_opening:
self.doc.is_opening='No'

4
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -30,7 +30,6 @@ from webnotes import _, msgprint
month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
from controllers.selling_controller import SellingController
class DocType(SellingController):
@ -40,9 +39,6 @@ class DocType(SellingController):
self.tname = 'Sales Invoice Item'
self.fname = 'entries'
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series+ '.#####')
def validate(self):
super(DocType, self).validate()
self.fetch_missing_values()

20
buying/doctype/quality_inspection/quality_inspection.py
View File

@ -17,28 +17,16 @@
from __future__ import unicode_literals
import webnotes
from webnotes.model import db_exists
from webnotes.model.doc import addchild, make_autoname
from webnotes.model.bean import copy_doclist
sql = webnotes.conn.sql
from webnotes.model.doc import addchild
class DocType:
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
# Autoname
# ---------
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series+'.#####')
def get_item_specification_details(self):
self.doclist = self.doc.clear_table(self.doclist, 'qa_specification_details')
specification = sql("select specification, value from `tabItem Quality Inspection Parameter` \
specification = webnotes.conn.sql("select specification, value from `tabItem Quality Inspection Parameter` \
where parent = '%s' order by idx" % (self.doc.item_code))
for d in specification:
child = addchild(self.doc, 'qa_specification_details', 'Quality Inspection Reading', self.doclist)
@ -48,13 +36,13 @@ class DocType:
def on_submit(self):
if self.doc.purchase_receipt_no:
sql("update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2 set t1.qa_no = '%s', t2.modified = '%s' \
webnotes.conn.sql("update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2 set t1.qa_no = '%s', t2.modified = '%s' \
where t1.parent = '%s' and t1.item_code = '%s' and t1.parent = t2.name" \
% (self.doc.name, self.doc.modified, self.doc.purchase_receipt_no, self.doc.item_code))
def on_cancel(self):
if self.doc.purchase_receipt_no:
sql("update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2 set t1.qa_no = '', t2.modified = '%s' \
webnotes.conn.sql("update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2 set t1.qa_no = '', t2.modified = '%s' \
where t1.parent = '%s' and t1.item_code = '%s' and t1.parent = t2.name" \
% (self.doc.modified, self.doc.purchase_receipt_no, self.doc.item_code))

6
buying/doctype/quality_inspection/quality_inspection.txt
View File

@ -1,13 +1,13 @@
[
{
"creation": "2013-01-10 16:34:11",
"creation": "2013-04-30 13:13:03",
"docstatus": 0,
"modified": "2013-01-22 14:57:21",
"modified": "2013-05-09 14:34:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "QAI/.######",
"autoname": "naming_series:",
"doctype": "DocType",
"is_submittable": 1,
"module": "Buying",

4
hr/doctype/attendance/attendance.py
View File

@ -18,7 +18,6 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import getdate, nowdate
from webnotes.model.doc import make_autoname
from webnotes import msgprint, _
sql = webnotes.conn.sql
@ -28,9 +27,6 @@ class DocType:
self.doc = doc
self.doclist = doclist
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series+'.#####')
def get_emp_name(self):
return {
"employee_name": webnotes.conn.get_value("Employee",

2
hr/doctype/employee/employee.py
View File

@ -36,7 +36,7 @@ class DocType:
if ret[0][0]=='Naming Series':
self.doc.name = make_autoname(self.doc.naming_series + '.####')
elif ret[0][0]=='Employee Number':
self.doc.name = make_autoname(self.doc.employee_number)
self.doc.name = self.doc.employee_number
self.doc.employee = self.doc.name

3
manufacturing/doctype/production_order/production_order.py
View File

@ -18,9 +18,6 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, flt, now, nowdate
from webnotes.model import db_exists
from webnotes.model.doc import make_autoname
from webnotes.model.bean import copy_doclist
from webnotes.model.code import get_obj
from webnotes import msgprint

7
selling/doctype/installation_note/installation_note.py
View File

@ -18,9 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, getdate
from webnotes.model import db_exists
from webnotes.model.doc import make_autoname
from webnotes.model.bean import getlist, copy_doclist
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
from stock.utils import get_valid_serial_nos
@ -37,9 +35,6 @@ class DocType(TransactionBase):
self.tname = 'Installation Note Item'
self.fname = 'installed_item_details'
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series+'.#####')
def validate(self):
self.validate_fiscal_year()
self.validate_installation_date()

18
selling/doctype/installation_note/installation_note.txt
View File

@ -1,13 +1,13 @@
[
{
"creation": "2013-01-10 16:34:18",
"creation": "2013-04-30 13:13:06",
"docstatus": 0,
"modified": "2013-01-22 14:56:02",
"modified": "2013-05-09 14:43:28",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "IN/.####",
"autoname": "naming_series:",
"doctype": "DocType",
"is_submittable": 1,
"module": "Selling",
@ -33,6 +33,7 @@
"permlevel": 0,
"read": 1,
"report": 1,
"role": "Sales User",
"submit": 1,
"write": 1
},
@ -302,15 +303,6 @@
"options": "Installation Note Item"
},
{
"doctype": "DocPerm",
"role": "System Manager"
},
{
"doctype": "DocPerm",
"role": "Sales User"
},
{
"doctype": "DocPerm",
"role": "Sales Manager"
"doctype": "DocPerm"
}
]

6
stock/doctype/stock_entry/stock_entry.py
View File

@ -57,6 +57,7 @@ class DocType(StockController):
self.validate_return_reference_doc()
self.validate_with_material_request()
self.validate_fiscal_year()
self.set_total_amount()
def on_submit(self):
self.update_serial_no(1)
@ -174,6 +175,9 @@ class DocType(StockController):
elif self.doc.purpose != "Material Transfer":
self.doc.production_order = None
def set_total_amount(self):
self.doc.total_amount = sum([flt(item.amount) for item in self.doclist.get({"parentfield": "mtn_details"})])
def make_gl_entries(self):
if not cint(webnotes.defaults.get_global_default("auto_inventory_accounting")):
return
@ -220,7 +224,7 @@ class DocType(StockController):
if not flt(d.incoming_rate):
d.incoming_rate = self.get_incoming_rate(args)
d.amount = flt(d.qty) * flt(d.incoming_rate)
d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
def get_incoming_rate(self, args):
incoming_rate = 0

28
stock/doctype/stock_entry/stock_entry.txt
View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-03-28 15:56:40",
"creation": "2013-04-09 11:43:55",
"docstatus": 0,
"modified": "2013-03-29 15:31:42",
"modified": "2013-05-09 13:31:00",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -518,6 +518,14 @@
"read_only": 0,
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "project_name",
@ -558,6 +566,14 @@
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "col5",
"fieldtype": "Column Break",
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
{
"allow_on_submit": 0,
"doctype": "DocField",
@ -576,14 +592,6 @@
"reqd": 1,
"search_index": 0
},
{
"doctype": "DocField",
"fieldname": "col5",
"fieldtype": "Column Break",
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
{
"allow_on_submit": 0,
"doctype": "DocField",

3
utilities/doctype/address/address.py
View File

@ -18,6 +18,7 @@ from __future__ import unicode_literals
import webnotes
from webnotes import msgprint
from webnotes.utils import cstr
class DocType:
def __init__(self, doc, doclist=[]):
@ -29,7 +30,7 @@ class DocType:
self.doc.address_title = self.doc.customer or self.doc.supplier or self.doc.sales_partner
if self.doc.address_title:
self.doc.name = self.doc.address_title + "-" + self.doc.address_type
self.doc.name = cstr(self.doc.address_title).strip() + "-" + cstr(self.doc.address_type).strip()
else:
webnotes.msgprint("""Address Title is mandatory.""", raise_exception=True)

21
utilities/doctype/contact/contact.py
View File

@ -16,7 +16,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr
from utilities.transaction_base import TransactionBase
@ -32,15 +32,16 @@ class DocType(TransactionBase):
webnotes.conn.set(self.doc, 'status', 'Replied')
def autoname(self):
if self.doc.customer:
self.doc.name = self.doc.first_name + (self.doc.last_name and ' ' + self.doc.last_name or '') + '-' + self.doc.customer
elif self.doc.supplier:
self.doc.name = self.doc.first_name + (self.doc.last_name and ' ' + self.doc.last_name or '') + '-' + self.doc.supplier
elif self.doc.sales_partner:
self.doc.name = self.doc.first_name + (self.doc.last_name and ' ' + self.doc.last_name or '') + '-' + self.doc.sales_partner
else:
self.doc.name = self.doc.first_name + (self.doc.last_name and ' ' + self.doc.last_name or '')
# concat first and last name
self.doc.name = " ".join(filter(None,
[cstr(self.doc.fields.get(f)).strip() for f in ["first_name", "last_name"]]))
# concat party name if reqd
for fieldname in ("customer", "supplier", "sales_partner"):
if self.doc.fields.get(fieldname):
self.doc.name = self.doc.name + "-" + cstr(self.doc.fields.get(fieldname)).strip()
break
def validate(self):
self.validate_primary_contact()