Rushabh Mehta
c919d2579e
Merge branch 'master' of github.com:webnotes/erpnext
2012-10-03 11:57:13 +05:30
Rushabh Mehta
3009c46ba5
moved to bootstrap 2.1 and some ui fixes in todo and messages
2012-10-03 11:56:38 +05:30
Anand Doshi
a4cc383625
added 'fixed' property to background so that it does not scroll
2012-10-02 19:13:04 +05:30
Rushabh Mehta
079df382f9
login css
2012-10-02 16:54:42 +05:30
Rushabh Mehta
9d1faea10c
separated query-report and added module marker to appframe
2012-10-02 14:56:41 +05:30
Rushabh Mehta
beb3a872ce
Merge branch '1209' of github.com:webnotes/erpnext into 1209
2012-10-01 14:47:06 +05:30
Rushabh Mehta
2d700dd90d
added query report and cleaned up wn.ui.Dialog
2012-10-01 14:46:37 +05:30
Anand Doshi
fdbc730821
merged deprecate account balance
2012-10-01 11:30:00 +05:30
Rushabh Mehta
3c04193afb
form, appframe ui fixes
2012-09-28 18:47:47 +05:30
Rushabh Mehta
b0d32b7a25
form toolbar ui fixes and added themes
2012-09-28 16:11:57 +05:30
Anand Doshi
440c1eb465
deprecated account balance and fixed expiry msg
2012-09-28 16:04:10 +05:30
Anand Doshi
bbab0e4957
build.json: changed path of startup.js
2012-09-26 11:21:36 +05:30
Rushabh Mehta
707932da0c
updated paths
2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d
moved directory structure
2012-09-24 19:13:42 +05:30
Anand Doshi
ab3764257c
fixes in check required
2012-09-24 19:02:50 +05:30
Anand Doshi
5ca167bcbc
in mandatory check, call refresh_label_icon only if that function exists
2012-09-24 18:48:44 +05:30
Anand Doshi
bc243dee81
fix in general ledger report: account filter options to be filtered by company
2012-09-24 18:03:35 +05:30
Anand Doshi
1fc9ae2230
Fixes and Validations for nested doctypes
2012-09-24 14:00:59 +05:30
Rushabh Mehta
09d84b6575
Stock Ageing & release of Analytics
2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d
added sales analytics
2012-09-21 15:19:40 +05:30
Rushabh Mehta
6ca8054d55
added stock analytics
2012-09-20 19:03:14 +05:30
Anand Doshi
c63f0518d7
removed zoom from grid report
2012-09-20 12:08:47 +05:30
Anand Doshi
09d686f7f6
zoom for stock ledger report
2012-09-19 19:06:38 +05:30
Rushabh Mehta
40a3b46d61
Added code for plot zoom
2012-09-19 17:13:10 +05:30
Rushabh Mehta
7668317064
separated tooltip text in plot
2012-09-19 16:47:57 +05:30
Rushabh Mehta
4573515899
added graphs in stock ledger and general ledger
2012-09-19 16:41:19 +05:30
Rushabh Mehta
823c021e9c
added index patch and updated general_ledger
2012-09-19 12:01:01 +05:30
Rushabh Mehta
eb8673ecc6
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-18 18:52:38 +05:30
Rushabh Mehta
2ad0d424a9
Stock Ledger Report
2012-09-18 18:52:05 +05:30
Anand Doshi
081be012dc
fix in doclistview new button permissios
2012-09-18 16:25:56 +05:30
Anand Doshi
56bac90081
bug fix in doclistview
2012-09-18 16:07:22 +05:30
Anand Doshi
8c3cfe076e
get last purchase rate from item if not found from purchase order or receipt
2012-09-18 13:56:47 +05:30
Rushabh Mehta
4156523175
added flot for graphs in report_grid
2012-09-17 19:10:36 +05:30
Rushabh Mehta
f16b28b92b
moved chart_of_accounts as GridReport
2012-09-17 11:05:59 +05:30
Rushabh Mehta
40c1ac00bc
merge
2012-09-17 10:05:46 +05:30
Rushabh Mehta
4ce6b60fce
updates to general ledger, todo
2012-09-17 10:04:07 +05:30
Anand Doshi
a41f9714e9
fix in appframe make_toolbar
2012-09-15 19:55:31 +05:30
Rushabh Mehta
cfb5466d30
added export to reports using downloadify
2012-09-14 18:12:17 +05:30
Rushabh Mehta
ed856486bc
update progress bar to 100 on request closing
2012-09-14 11:51:22 +05:30
Rushabh Mehta
1c409a84cd
with original-length header for gzip response
2012-09-14 11:40:47 +05:30
Rushabh Mehta
b40e93733c
merge with master
2012-09-14 11:29:52 +05:30
Rushabh Mehta
42208085a1
removed logs in request
2012-09-14 11:28:46 +05:30
Rushabh Mehta
263e7a4bae
rebuild
2012-09-14 11:16:09 +05:30
Rushabh Mehta
043e7c4eb9
merge
2012-09-14 11:15:06 +05:30
Rushabh Mehta
c6369046a1
merge
2012-09-14 11:09:46 +05:30
Rushabh Mehta
bf65507939
added watch, check progress
2012-09-14 11:08:53 +05:30
Rushabh Mehta
36353b2c7e
updated progress bar
2012-09-14 10:46:36 +05:30
Rushabh Mehta
f8ed0583b6
updated progress bar
2012-09-14 10:44:09 +05:30
Rushabh Mehta
2be4c6f8ed
created grid report, report dump and general ledger report
2012-09-13 19:42:28 +05:30
Rushabh Mehta
95e4e1418d
created grid report, report dump and general ledger report
2012-09-13 19:40:56 +05:30
Anand Doshi
e08249f3d5
allow multisort with selectable sort order
2012-09-13 15:39:34 +05:30
Anand Doshi
99e5ac3452
multi sort for stock ledger search criteria
2012-09-13 15:24:19 +05:30
Rushabh Mehta
93e9fdfe48
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-13 12:00:54 +05:30
Rushabh Mehta
fd1c166f5b
late loading js (require) files in localStorage, brought back versions (simpler)
2012-09-13 10:21:29 +05:30
Rushabh Mehta
24ebe3ffdd
merge with master
2012-09-12 19:07:07 +05:30
Rushabh Mehta
588a98a10f
fixes to chart_of_accounts, added opening + pl condition
2012-09-12 19:00:14 +05:30
Rushabh Mehta
0fa8e33835
chart of accounts: balances calculation
2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da
Created Chart of Accounts using Slick Grid and Tree
2012-09-12 17:13:36 +05:30
Anand Doshi
ce946afb67
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
2012-09-10 14:18:17 +05:30
Nabin Hait
6c8504877b
Fixes in item wise purchase details report
2012-09-10 12:23:06 +05:30
Anand Doshi
0dab087be1
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
public/js/all-app.js
2012-09-10 11:31:18 +05:30
Nabin Hait
f28f4c7a89
section hide_unhide issue fixed
2012-09-07 11:59:05 +05:30
Anand Doshi
f03e3bb06b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882
changed date displayed in transaction listing from modified date to transaction/posting date
2012-09-03 13:32:25 +05:30
Anand Doshi
b211a41547
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-31 13:39:58 +05:30
Anand Doshi
00d3c7c67d
open communication in dialog
2012-08-31 13:25:03 +05:30
Anand Doshi
fa97e8c783
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
public/js/all-app.js
2012-08-31 12:09:02 +05:30
Anand Doshi
8981b586a1
fixed form header label issue: on change of field, label should change to Not Saved
2012-08-31 12:03:46 +05:30
Anand Doshi
8a72ec5e39
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-16 16:06:12 +05:30
Anand Doshi
126658a77d
fixes due to changes in filter logic
2012-08-16 16:05:53 +05:30
Anand Doshi
f19f13314a
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
2012-08-16 15:48:16 +05:30
Anand Doshi
a6de55e2e6
fixed selection of field names in filters, such that if two tables have the same fieldnames, it doesn't cause conflict
2012-08-16 15:45:28 +05:30
Anand Doshi
63fee973d7
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-09 11:34:47 +05:30
Anand Doshi
11a5ba64dd
fixed bug in depends_on: hidden property of a docfield should have value as 0 or 1
2012-08-09 11:30:21 +05:30
Rushabh Mehta
0f0d8850d0
merged with master (project cleanup)
2012-08-08 14:28:24 +05:30
Rushabh Mehta
aff1599fe5
cleanup to projects and tasks and now embedding gantt chart inside project
2012-08-08 14:19:33 +05:30
Rushabh Mehta
17588987a4
file upload should not be decoded
2012-08-08 10:37:02 +05:30
Rushabh Mehta
22fbea975f
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-08-08 10:07:39 +05:30
Rushabh Mehta
7dbef2549a
pre, code style fix
2012-08-08 10:06:43 +05:30
Rushabh Mehta
bf8cac53c7
pre, code style fix
2012-08-08 10:05:51 +05:30
Rushabh Mehta
02aab69427
merge
2012-08-07 16:44:36 +05:30
Anand Doshi
16ad50f641
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
Rushabh Mehta
6252c13ec8
added code style and mardown in todo
2012-08-07 12:53:49 +05:30
Rushabh Mehta
c7dbe293c3
updates to kb: unanswered questions show in desktop, questions query moved to server-side
2012-08-07 12:12:55 +05:30
Anand Doshi
b8219aa4f0
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
public/js/fields.js
2012-08-06 19:55:43 +05:30
Rushabh Mehta
aaa75496e2
added email chain on blog comment and number of comments
2012-08-06 15:22:17 +05:30
Rushabh Mehta
90115202f2
build
2012-08-06 14:30:56 +05:30
Rushabh Mehta
a49a552a37
merge
2012-08-06 14:30:31 +05:30
Rushabh Mehta
5d4a9f8554
date format bug fixed
2012-08-06 14:20:15 +05:30
Rushabh Mehta
6243f29ab3
framework updates
2012-08-06 11:15:22 +05:30
Rushabh Mehta
49dc5da0dc
refactor unicode changes and merge with master with refactored email
2012-08-03 16:02:24 +05:30
Rushabh Mehta
c0fded82e6
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-03 14:18:05 +05:30
Rushabh Mehta
0c5b438623
framework updates
2012-08-03 14:12:14 +05:30
Anand Doshi
e69c7f487f
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-02 18:53:31 +05:30
Anand Doshi
a67a74fee1
supplier quotation, project shift patch
2012-08-02 18:53:00 +05:30
Rushabh Mehta
a4fe7180f4
html generation moved from web.py to web_cache.py so it can be called from other places as a response from server.py
2012-08-02 13:07:23 +05:30
Anand Doshi
48553618b0
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-07-31 19:38:39 +05:30
Anand Doshi
dc40385d41
validate link only if value is non empty
2012-07-31 19:37:39 +05:30
Rushabh Mehta
0fa628bf86
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
public/js/report-legacy.js
2012-07-26 15:46:13 +02:00
Nabin Hait
7839ea9687
fixes in new report: same fieldname in multiple table
2012-07-23 16:05:16 +05:30
Nabin Hait
39b8ec0ed8
fixes in new report: same fieldname in multiple table
2012-07-23 15:03:57 +05:30
Nabin Hait
44c6a5bef5
dont display description on old report
2012-07-23 11:54:06 +05:30
Anand Doshi
76ec66dd65
fixes for unicode
2012-07-20 18:11:30 +05:30
Anand Doshi
1703cc89b4
fixes for unicode
2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec
added unicode_literals import at start of each file
2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
f2f5c94c41
Default Currency specification for Customer and Supplier
...
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Anand Doshi
a60266d780
fix in doclistview group by logic
2012-07-18 15:43:43 +05:30
Anand Doshi
3a281ae6c3
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/patches/patch_list.py
2012-07-17 13:21:55 +05:30
Anand Doshi
669d15a45c
fix in copy doc
2012-07-17 13:16:21 +05:30
Anand Doshi
5d4aaaa8a7
patch to remove match condition of owner on event doctype
2012-07-17 13:06:34 +05:30
Rushabh Mehta
ebf9137a94
report breadcrumbs issue
2012-07-16 16:27:23 +05:30
Rushabh Mehta
4ae82ca0c2
users pages deprecated
2012-07-16 16:20:11 +05:30
Rushabh Mehta
3c419c5e05
cur_frm.doc re-reference when is called
2012-07-16 15:44:38 +05:30
Rushabh Mehta
9e9809a44f
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e
get_field > wn.meta.get_docfield
2012-07-16 14:16:57 +05:30
Anand Doshi
f42d050eb7
Merge branch 'master' into dev
...
Conflicts:
public/js/all-app.js
2012-07-16 12:19:18 +05:30
Anand Doshi
57fefaa3de
show assign to only after save
2012-07-16 12:18:08 +05:30
Anand Doshi
bb81c198f5
Merge branch 'dev' of github.com:webnotes/erpnext into dev
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-07-13 16:48:08 +05:30
Anand Doshi
2fef0ee4e1
Merge branch 'master' into dev
2012-07-13 16:47:09 +05:30
Anand Doshi
9ec8024db7
show order type icon in sales order list view
2012-07-13 16:46:12 +05:30
Rushabh Mehta
91ba346354
profile cleanup start and new auth table for better security
2012-07-13 14:54:40 +05:30
Rushabh Mehta
d47efd57ac
check_required fix
2012-07-13 11:15:25 +05:30
Anand Doshi
c97f780940
Merge branch 'master' into dev
...
Conflicts:
erpnext/patches/patch_list.py
erpnext/startup/js/complete_setup.js
erpnext/stock/doctype/item/item.txt
public/css/all-app.css
public/js/all-app.js
public/js/all-web.js
2012-07-12 22:16:19 +05:30
Anand Doshi
d68dceb791
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-07-12 18:53:35 +05:30
Anand Doshi
51146c07c3
cleaner web cache code
2012-07-12 18:41:12 +05:30
Rushabh Mehta
357fb2640b
sales bom fixes and mandatory in table fields
2012-07-12 18:00:21 +05:30
Rushabh Mehta
4feae61b62
fixes to taxes and charges master and naming_series
2012-07-12 16:01:20 +05:30
Rushabh Mehta
5faf37f312
item group cleanup
2012-07-12 11:33:00 +05:30
Nabin Hait
179f01af17
hong kong added in country list
2012-07-12 11:03:39 +05:30
Rushabh Mehta
cf969143f2
cleaned up customer group
2012-07-12 09:54:43 +05:30
Rushabh Mehta
b9fabf8e16
sales bom cleanup
2012-07-11 19:18:50 +05:30
Anand Doshi
8c7e76ba44
RSS for blog
...
Comment addition into blog page's dom
2012-07-11 18:40:57 +05:30
Rushabh Mehta
cda9732f51
price list cleanup
2012-07-11 17:29:46 +05:30
Rushabh Mehta
3a0f191658
cleaned up fiscal_year, currency and added select-all + help in doclistview
2012-07-11 16:35:39 +05:30
Rushabh Mehta
9acf463427
budget distribution cleanup and formatting of markdown
2012-07-11 14:39:33 +05:30
Anand Doshi
1522f5d76b
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-07-11 14:27:22 +05:30
Rushabh Mehta
e57267f79a
added patch for account and cleanups to breadcrumbs and msgprint
2012-07-11 13:18:58 +05:30
Rushabh Mehta
bf96499c0e
account cleanup, added toggle_fields in cur_frm
2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29
account cleanup started
2012-07-10 18:38:59 +05:30
Rushabh Mehta
5281e350fb
cost center cleanup
2012-07-10 18:16:09 +05:30
Rushabh Mehta
1ee2a5ac12
cost center cleanup + grid css
2012-07-10 17:22:20 +05:30
Anand Doshi
e47def842d
Improvements in product page and its listing
...
Login page rendered via a template
2012-07-09 15:56:12 +05:30
Anand Doshi
d4be00b1fd
Merge branch 'master' into dev
2012-07-09 13:32:27 +05:30
Anand Doshi
368cb53cf6
css fix for sidebar statuses in list view
2012-07-09 13:32:06 +05:30
Anand Doshi
5d91e83f11
Merge branch 'master' into dev
2012-07-09 10:19:23 +05:30
Anand Doshi
7048f2a57c
on amend, retain the existing attachments
2012-07-09 10:19:03 +05:30
Anand Doshi
842c96361e
updates in form's column break logic
2012-07-06 13:03:08 +05:30
Anand Doshi
29c5d35ee5
Merge branch 'master' into dev
2012-07-06 11:27:15 +05:30
Nabin Hait
cb2e76a79c
delete row issue in grid fixed
2012-07-05 14:44:39 +05:30
Anand Doshi
2cfe2d4616
Merge branch 'master' of github.com:webnotes/erpnext into dev
2012-07-04 14:17:46 +05:30
Rushabh Mehta
4764e70d09
changed timeout to 1000ms in linkfield change event
2012-07-04 10:46:26 +02:00
Anand Doshi
cdc011cdbd
fix in section hiding / column hiding logic
2012-07-04 13:17:44 +05:30
Anand Doshi
1731786a61
Merge branch 'master' of github.com:webnotes/erpnext into cms2
2012-07-03 15:51:11 +05:30
Anand Doshi
ebe23b0f89
allow deletion of communication
2012-06-29 16:38:07 +05:30
Anand Doshi
0afab07a1f
communication listview - show pretty date
2012-06-28 12:59:33 +05:30
Anand Doshi
bba4db1627
product listing and pages
2012-06-27 12:06:45 +05:30
Anand Doshi
81fa802e09
Merge branch 'master' into dev
2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf
fixes related to --> clear locals and then sync locals when whole doclist is passed
2012-06-25 20:05:35 +05:30
Nabin Hait
8b14617dce
run view ledger report through set_route
2012-06-25 13:15:59 +05:30
Anand Doshi
72c945b7c6
template based web page loading using web.py
2012-06-22 20:01:07 +05:30
Nabin Hait
4ce8e16ded
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-22 12:16:43 +05:30
Nabin Hait
59e4dcb1b0
Error fixed in new report: sort by child table column
2012-06-22 12:16:21 +05:30
Anand Doshi
815ad3fa28
Merge branch 'master' into dev
2012-06-22 12:14:43 +05:30
Anand Doshi
ab65b54c43
fix in dialog: if an in_dialog doctype is called using url, it will open
...
in form with header and sidebar
2012-06-22 12:11:24 +05:30
Anand Doshi
9078f652c3
Merge branch 'master' into cms2
2012-06-21 11:50:44 +05:30
Anand Doshi
5d9fc72753
updates in web.py and template - page.html
2012-06-21 11:48:51 +05:30
Anand Doshi
05cbf96e84
Merge branch 'master' into dev
2012-06-21 11:20:10 +05:30
Anand Doshi
f1c287bdda
fix in file_list issue due to import data
2012-06-20 13:46:26 +05:30
Anand Doshi
be7c426e15
add parent column in filter list
2012-06-19 17:52:37 +05:30
Rushabh Mehta
40182bada3
added patch
2012-06-19 14:15:13 +05:30
Anand Doshi
f4b552ea5d
fixed: link field validate data on defocus, if autosuggest or search not used
2012-06-19 13:17:56 +05:30
Nabin Hait
90376f6ce4
reset to prev version
2012-06-19 10:31:08 +05:30
Anand Doshi
f8946b1e31
fix in buttons displayed - on change of status in lead form
2012-06-18 18:04:28 +05:30
Anand Doshi
38192029e9
SetTimeout hack - in link fields if data is typed and not selected from autocomplete, run validations and triggers
2012-06-18 15:05:20 +05:30
Rushabh Mehta
96bf0b7f53
web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates
2012-06-15 17:29:03 +05:30
Rushabh Mehta
bd7f7231f2
cms now powered by jinja2
2012-06-15 14:00:06 +05:30
Rushabh Mehta
4c56275d26
appframe is now heading
2012-06-14 11:05:09 +05:30
Anand Doshi
575545d441
added link to show list of all reports
2012-06-13 19:36:55 +05:30
Anand Doshi
61ade3d486
auto populate To email field in email_doc if the current form has a value in the field contact_email
2012-06-13 12:53:03 +05:30
Anand Doshi
bd59c461bc
removed error console
2012-06-12 16:44:29 +05:30
Anand Doshi
f71d63fda0
fix in back button after save/submit
2012-06-12 15:45:44 +05:30
Rushabh Mehta
031d51b53e
not in search, should be allowed in reports and loading place holder for reports
2012-06-11 10:38:47 +05:30
Rushabh Mehta
be7ce4744a
website color should be black
2012-06-08 14:18:21 +05:30
Anand Doshi
fa1963164c
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-08 12:57:28 +05:30
Anand Doshi
cddc0e68bf
Fix: Standard Print Format Heading to also consider value in 'Select
...
Print Heading' field.
modified build_head method, inner method of print_std method to consider
three possibilities as print heading
1. value in cur_frm.pformat
2. value in select print heading
3. doctype / doctype label
2012-06-08 12:34:57 +05:30
Nabin Hait
d491fc7a31
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-08 12:13:47 +05:30
Nabin Hait
2e3579a4eb
Item Barcode implemented
2012-06-07 19:09:17 +05:30
Anand Doshi
4dbeae1eae
escape double quotes in communication content, allow 0 as value in data/int field
2012-06-07 14:39:42 +05:30
Rushabh Mehta
a89f52041f
communication is now created when email is sent
2012-06-07 11:30:02 +05:30
Anand Doshi
f36e15e92e
fix in doclistview's order
2012-06-05 20:10:45 +05:30
Anand Doshi
dbb84a271e
Merge branch 'master' of github.com:webnotes/erpnext into comm_log
...
Conflicts:
erpnext/selling/doctype/lead/lead.js
erpnext/setup/doctype/contact_control/contact_control.js
2012-06-05 18:37:17 +05:30
Rushabh Mehta
a660dd9d49
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-04 13:21:03 +05:30
Rushabh Mehta
983c551796
gantt chart fixes
2012-06-04 13:20:42 +05:30
Anand Doshi
bfc52b99fd
Merge branch 'master' of github.com:webnotes/erpnext
2012-06-04 13:07:03 +05:30
Anand Doshi
fdc20fdf69
fix in get_base_url of dom.js
2012-06-04 13:06:38 +05:30
Rushabh Mehta
07c94ce9c0
update in Task, notification and layout
2012-06-04 12:57:23 +05:30
Anand Doshi
c5d857896e
fixes in communication doctype
2012-05-31 18:23:16 +05:30
Anand Doshi
a6708fb748
new doctype: communication
2012-05-31 14:53:55 +05:30
Rushabh Mehta
7c91e257e2
doclistview: sidebar refresh bugfix
2012-05-29 14:05:53 +05:30
Rushabh Mehta
f3c390aec3
refresh stats in doclist
2012-05-29 11:06:08 +05:30
Rushabh Mehta
92c2c8f1f6
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37
show new reports as well as old
2012-05-29 10:53:37 +05:30
Rushabh Mehta
3237d6af6f
added font 'Marck Script'
2012-05-28 10:42:32 +02:00
Rushabh Mehta
e316795196
added font 'cookie'
2012-05-26 13:50:05 +02:00
Anand Doshi
822318fec7
removed font 'Satisfy' and added font 'Oleo Script'
2012-05-26 17:01:00 +05:30
Anand Doshi
6548b50f57
added font 'Satisfy'
2012-05-26 16:50:06 +05:30
Rushabh Mehta
c75877ae88
fixed fonts
2012-05-25 17:21:32 +05:30
Rushabh Mehta
e811753f70
added fontlib
2012-05-25 17:20:28 +05:30
Anand Doshi
9327bb9585
fix in tag viewing in doclistview
2012-05-23 15:12:22 +05:30
Anand Doshi
64483e6e18
fix in report builder's print function
2012-05-23 13:41:11 +05:30
Anand Doshi
2d1bd0a3f8
fix in body_div height
2012-05-23 11:20:12 +05:30
Anand Doshi
cb909d518c
Merge branch 'shf_rename'
2012-05-21 18:44:19 +05:30
Anand Doshi
ba30cf1fa6
fix in reports2: do not add fieldtype 'table' in columns for slickgrid
2012-05-21 14:53:19 +05:30
Anand Doshi
1aae261490
delete button in doclistview
2012-05-21 14:31:03 +05:30
Anand Doshi
d643d367ca
Merge branch 'shf_rename'
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-05-18 11:52:31 +05:30
Anand Doshi
ae4fc41e61
Merge branch 'shf_rename'
2012-05-16 14:35:15 +05:30
Anand Doshi
328cd2e868
do not refresh toolbar on set value
2012-05-16 12:21:45 +05:30
Anand Doshi
d5f8b91a49
Merge branch 'shf_rename'
2012-05-16 12:21:28 +05:30
Anand Doshi
0b721b8b96
do not track wn-web.js and wn-web.css in repositor as they are built for each implementation
2012-05-15 11:39:17 +05:30
Anand Doshi
ddc4cdd8f9
include button.js in all-web.js
2012-05-15 11:35:21 +05:30
Anand Doshi
f295591168
Merge branch 'shf_rename'
2012-05-14 18:03:45 +05:30
Rushabh Mehta
6598b6276b
fixes to website settings and linking import data in setup
2012-05-14 15:02:35 +05:30
Rushabh Mehta
5997e507d9
time fix
2012-05-11 17:50:34 +05:30
Rushabh Mehta
7483ae9573
fix in button disablity leading to double click
2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae
cleaned up imports, doc
2012-05-11 15:53:37 +05:30
Rushabh Mehta
7f523ac33c
merge
2012-05-10 19:11:00 +05:30
Rushabh Mehta
ea7ba72397
data import and upload issues
2012-05-10 19:07:53 +05:30
Anand Doshi
3fa25faca2
fixes after merge with cms
2012-05-10 15:15:43 +05:30
Anand Doshi
951d8ec342
fix in issues arising due to wn.require
2012-05-10 14:19:11 +05:30
Nabin Hait
a15740a974
fixed issue
2012-05-10 12:56:40 +05:30
Anand Doshi
17fb35fa4a
erpnext installer
2012-05-10 12:39:25 +05:30
Rushabh Mehta
03262e0c12
report builder with links and width
2012-05-09 16:55:58 +05:30
Rushabh Mehta
078867c411
fixes to listview
2012-05-09 16:15:51 +05:30
Rushabh Mehta
e0f2df9506
cms fixes
2012-05-09 14:50:00 +05:30
Rushabh Mehta
3efd3ce475
cms fixes
2012-05-09 14:48:52 +05:30
Rushabh Mehta
8dc23e37bc
fix app.html
2012-05-09 14:25:16 +05:30
Rushabh Mehta
6a47204e8a
added app.html
2012-05-09 14:19:06 +05:30
Rushabh Mehta
e45042e011
merge
2012-05-09 12:22:50 +05:30
Rushabh Mehta
b9483d1809
cms updates
2012-05-09 11:42:52 +05:30
Rushabh Mehta
458ca8eddb
cms fixes
2012-05-09 10:17:08 +05:30
Rushabh Mehta
a933b632ad
templates cleaner and generation for all pages
2012-05-08 16:06:44 +05:30
Rushabh Mehta
5ab8163140
fixes to routing and activating web page
2012-05-08 12:58:32 +05:30
Rushabh Mehta
c22d9e03e7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms
2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43
new cms with public folder
2012-05-07 18:00:57 +05:30