nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-08 15:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates to website: removed webnotes.cms

Browse Source
This commit is contained in:
Rushabh Mehta
2012-12-07 12:44:45 +05:30
parent 571377a313
commit a494b88ad8
18 changed files with 196 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/tax_controller.py
View File

@@ -37,7 +37,7 @@ class TaxController(TransactionController):
{"parentfield": self.fmap.taxes_and_charges})
for base_tax in master_tax_list:
tax = DictObj([[field, base_tax.fields.get(field)]
tax = _dict([[field, base_tax.fields.get(field)]
for field in base_tax.fields
if field not in webnotes.model.default_fields])
tax.update({

10
controllers/transaction_controller.py
View File

@@ -17,7 +17,7 @@
from __future__ import unicode_literals
import webnotes
import webnotes.model
from webnotes import _, DictObj
from webnotes import _, _dict
from webnotes.utils import cint
import json
@@ -32,7 +32,7 @@ class TransactionController(DocListController):
@property
def precision(self):
if not hasattr(self, "_precision"):
self._precision = DictObj()
self._precision = _dict()
self._precision.main = self.meta.get_precision_map()
self._precision.item = self.meta.get_precision_map(parentfield = \
self.item_table_field)
@@ -69,7 +69,7 @@ class TransactionController(DocListController):
if not hasattr(self, "_fmap"):
if self.doc.doctype in ["Lead", "Quotation", "Sales Order", "Sales Invoice",
"Delivery Note"]:
self._fmap = webnotes.DictObj( {
self._fmap = webnotes._dict( {
"exchange_rate": "conversion_rate",
"taxes_and_charges": "other_charges",
"taxes_and_charges_master": "charge",
@@ -93,7 +93,7 @@ class TransactionController(DocListController):
"cost_center": "cost_center_other_charges",
})
else:
self._fmap = webnotes.DictObj({
self._fmap = webnotes._dict({
"exchange_rate": "conversion_rate",
"taxes_and_charges": "purchase_tax_details",
"taxes_and_charges_master": "purchase_other_charges",
@@ -120,4 +120,4 @@ class TransactionController(DocListController):
"rate": "rate"
})
return self._fmap or webnotes.DictObj()
return self._fmap or webnotes._dict()