Anand Doshi
|
20dce362d8
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
Conflicts:
webnotes/model/mapper.py
|
2013-07-10 20:55:05 +05:30 |
|
Anand Doshi
|
a000ec95d7
|
[minor] converty types for single doctypes in load_from_db, moved some functions to number_format.js for use in website
|
2013-07-10 20:48:00 +05:30 |
|
Nabin Hait
|
edc9dd596c
|
[fix] get_query where options not mentioned
|
2013-07-10 20:29:59 +05:30 |
|
Nabin Hait
|
ca4b031c57
|
Merge branch 'responsive' of git://github.com/saurabh6790/wnframework into saurabh1
|
2013-07-10 19:03:39 +05:30 |
|
Nabin Hait
|
7b1c78dbdb
|
[fix] related to mapping
|
2013-07-10 16:48:29 +05:30 |
|
Nabin Hait
|
3dc0fc8114
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-10 14:17:14 +05:30 |
|
Nabin Hait
|
bffe5fb2cf
|
[fix][hr] pull salary structure in salary slip
|
2013-07-10 14:16:59 +05:30 |
|
Saurabh
|
e0cb6f41ac
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-10 13:08:48 +05:30 |
|
Rushabh Mehta
|
c519217ea1
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-10 13:06:34 +05:30 |
|
Rushabh Mehta
|
5b254c079d
|
[minor] fix to has_permission
|
2013-07-10 13:05:32 +05:30 |
|
Anand Doshi
|
98b0353b66
|
[minor] [fix] in import, do not validate parentfield
|
2013-07-10 11:38:05 +05:30 |
|
Saurabh
|
135246ca04
|
[qwt_query] to server side
|
2013-07-09 16:40:32 +05:30 |
|
Rushabh Mehta
|
5ec86a5b42
|
[feature] Added 'Customize' and 'Import' fields in List view, [cleanups] #194, #113
|
2013-07-09 16:04:03 +05:30 |
|
Rushabh Mehta
|
bde1092e4f
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-09 14:37:17 +05:30 |
|
Rushabh Mehta
|
7a600ff29c
|
[feature] generate latest updates page from git commit log
|
2013-07-09 14:36:40 +05:30 |
|
Nabin Hait
|
db1e475ac8
|
[merge] report match condition
|
2013-07-09 12:57:01 +05:30 |
|
Rushabh Mehta
|
17db115a59
|
[doctype] restrict in_list_view
|
2013-07-09 12:10:34 +05:30 |
|
Rushabh Mehta
|
ce666c05be
|
[notifications] added match permissions #552
|
2013-07-09 11:58:10 +05:30 |
|
Akhilesh Darjee
|
dca4e59e77
|
[Report]Added permission to reports for showing data according to the user properties
|
2013-07-09 11:55:25 +05:30 |
|
Rushabh Mehta
|
dc114ffc5a
|
[email] force use of loginid as the sender
|
2013-07-09 10:28:57 +05:30 |
|
Rushabh Mehta
|
a016f19bfe
|
[lang] [fix] german
|
2013-07-09 10:20:31 +05:30 |
|
Saurabh
|
712ab696d9
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-09 10:18:14 +05:30 |
|
Saurabh
|
e487b1a37d
|
changes to handle server side queries
|
2013-07-09 10:10:43 +05:30 |
|
Anand Doshi
|
42adcb85d8
|
[bean] [run_method] call set_doclist so that if doclist is modified, it makes sure that doclist is of type DocList
|
2013-07-08 19:46:40 +05:30 |
|
Anand Doshi
|
aa9a7bdeef
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-08 18:50:55 +05:30 |
|
Anand Doshi
|
7bb7221364
|
[bean] [mandatory check]
|
2013-07-08 18:48:46 +05:30 |
|
Rushabh Mehta
|
2041a17871
|
[pull-mappers] no fields via custom button, started with quotation, material request, purchase order
|
2013-07-08 15:52:23 +05:30 |
|
Rushabh Mehta
|
8f7be86435
|
[runserverobj] fix: map arguments from 'args' or 'arg'
|
2013-07-08 11:30:10 +05:30 |
|
Rushabh Mehta
|
69318a01a0
|
[mappers] cleanup, remove dt_map, map_doclist and other such functions
|
2013-07-08 11:08:27 +05:30 |
|
Nabin Hait
|
d3f94e9db0
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-05 15:24:00 +05:30 |
|
Nabin Hait
|
939a01d5af
|
[mapper] purchase cycle
|
2013-07-05 15:23:46 +05:30 |
|
Rushabh Mehta
|
a922c25626
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-05 15:14:00 +05:30 |
|
Rushabh Mehta
|
bc83ad849c
|
[icon] added in doctype
|
2013-07-05 15:13:26 +05:30 |
|
Anand Doshi
|
0d08a98260
|
[website] [fix] call onload when using args_doctype option
|
2013-07-05 14:22:20 +05:30 |
|
Anand Doshi
|
36d570aaa3
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-05 12:57:21 +05:30 |
|
Anand Doshi
|
ad39c02e62
|
[fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files
|
2013-07-05 12:57:02 +05:30 |
|
Rushabh Mehta
|
623380ffe7
|
[form cleanup]
|
2013-07-05 12:43:59 +05:30 |
|
Nabin Hait
|
84350695f6
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-05 10:23:16 +05:30 |
|
Akhilesh Darjee
|
d850786cf7
|
[Fix]Root element from tree cannot be deleted.
|
2013-07-04 19:17:55 +05:30 |
|
Anand Doshi
|
8bd6788a49
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
|
2013-07-04 18:30:29 +05:30 |
|
Nabin Hait
|
966c783b7e
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-04 17:56:48 +05:30 |
|
Rushabh Mehta
|
b00451d97c
|
[mapper] sales order-sales invoice added condition
|
2013-07-04 17:52:03 +05:30 |
|
Anand Doshi
|
0e588aeb69
|
Merge branch 'responsive' of github.com:webnotes/wnframework into responsive
Conflicts:
public/js/legacy/widgets/form/form.js
|
2013-07-04 17:18:38 +05:30 |
|
Nabin Hait
|
960c49abba
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-04 17:04:45 +05:30 |
|
Rushabh Mehta
|
a986c2c017
|
[mapper] sales order-delivery note, added postprocess function in each doc for mapper.py
|
2013-07-04 17:03:02 +05:30 |
|
Anand Doshi
|
46c758926a
|
[fixes] in doctype, code, controller and layout
|
2013-07-04 16:47:05 +05:30 |
|
Nabin Hait
|
973fa7674e
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-04 16:30:24 +05:30 |
|
Rushabh Mehta
|
3f54d814d6
|
[mapper] added sales order > material request, added postprocess function
|
2013-07-04 16:29:02 +05:30 |
|
Nabin Hait
|
8308e8594b
|
Merge branch 'responsive' of git://github.com/webnotes/wnframework into responsive
|
2013-07-04 15:56:53 +05:30 |
|
Rushabh Mehta
|
f5880f0cad
|
[mapper] quotation-sales order for mapping in parent + child items
|
2013-07-04 15:27:04 +05:30 |
|