resolved conflict
This commit is contained in:
commit
68791fb13d
@ -1,4 +1,5 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.modules.module_manager import reload_doc
|
||||
reload_doc('stock', 'doctype', 'delivery_note_detail')
|
||||
reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise')
|
||||
|
@ -4,7 +4,7 @@ h1, h2, h3, h4 {
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
<meta charset="utf-8">
|
||||
<title>ERPNext</title>
|
||||
<meta name="author" content="">
|
||||
<script type="text/javascript">window._version_number="65"
|
||||
<script type="text/javascript">window._version_number="66"
|
||||
|
||||
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]={}}
|
||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user