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

resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2011-10-19 15:15:51 +05:30
parent 7762bdaf77 790f453490
commit 68791fb13d
4 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches/packing_slip.py
View File

@@ -1,4 +1,5 @@
def execute(): def execute():
import webnotes
from webnotes.modules.module_manager import reload_doc from webnotes.modules.module_manager import reload_doc
reload_doc('stock', 'doctype', 'delivery_note_detail') reload_doc('stock', 'doctype', 'delivery_note_detail')
reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise') reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise')

2
erpnext/startup/startup.css
View File

@@ -4,7 +4,7 @@ h1, h2, h3, h4 {
} }
body, span, div, td, input, textarea, button, select { body, span, div, td, input, textarea, button, select {
font-family: Verdana, Arial, Sans Serif; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
font-size: 12px; font-size: 12px;
} }

2
index.html
View File

@@ -3,7 +3,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>ERPNext</title> <title>ERPNext</title>
<meta name="author" content=""> <meta name="author" content="">
<script type="text/javascript">window._version_number="65" <script type="text/javascript">window._version_number="66"
wn={} wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}} wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}

BIN
versions-master.db
View File

Binary file not shown.