Anand Doshi
|
0c26f8116d
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/account/account.py
controllers/accounts_controller.py
patches/patch_list.py
selling/doctype/sales_common/sales_common.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-11-15 19:12:09 +05:30 |
|
Rushabh Mehta
|
154c8579d6
|
[index] [minor] add indexes
|
2013-11-15 16:09:45 +05:30 |
|
Rushabh Mehta
|
27336de68b
|
[minor] added missing icon
|
2013-11-15 13:55:45 +05:30 |
|
Nabin Hait
|
e505fbea54
|
[fix] [minor] stock balance report for serialized item
|
2013-11-15 13:38:23 +05:30 |
|
Rushabh Mehta
|
e34090aa2f
|
[pos] [minor] button back on toolbar and css, fixes webnotes/erpnext#1052
|
2013-11-15 11:30:23 +05:30 |
|
Nabin Hait
|
c10621a5be
|
[patch] make gl entries for submitted sales invoice where no gl entries exists
|
2013-11-15 10:32:47 +05:30 |
|
Nabin Hait
|
7373a83043
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-14 18:50:23 +05:30 |
|
Nabin Hait
|
9e5da835ec
|
[patch] make gl entries for submitted sales invoice where no gl entries exists
|
2013-11-14 18:41:09 +05:30 |
|
Nabin Hait
|
e83069cb32
|
[fix] update future gl entries for stock
|
2013-11-14 18:40:08 +05:30 |
|
Nabin Hait
|
155232e04e
|
[fix] credit limit validation
|
2013-11-14 18:37:33 +05:30 |
|
Rushabh Mehta
|
3910aa351f
|
[fixes] [ui] [minor]
|
2013-11-14 15:59:46 +05:30 |
|
Nabin Hait
|
3d39b4c0d6
|
Merge pull request #1044 from akhileshdarjee/1310
[fix] showing customer and supplier dashboard headline to users with account related roles
|
2013-11-14 02:16:44 -08:00 |
|
Rushabh Mehta
|
483473d302
|
[fixes] [ui] [minor]
|
2013-11-14 15:35:57 +05:30 |
|
Akhilesh Darjee
|
65e974096f
|
[fix] showing customer dashboard headline to users with account related roles
|
2013-11-14 14:50:43 +05:30 |
|
Nabin Hait
|
662f7d9256
|
Merge pull request #1041 from akhileshdarjee/1310
[fix] [minor] all types of variance reports fixed
|
2013-11-13 23:57:30 -08:00 |
|
Anand Doshi
|
413c931436
|
Merge branch 'documentation-website'
|
2013-11-13 17:40:57 +05:30 |
|
Anand Doshi
|
ec491dcc57
|
[minor] [patch]
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
778056ca5f
|
[minor] [patch] save style settings
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
8c09093aa1
|
[minor] [docs] fixed labels
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
89844f803d
|
[minor] check permission for editable web page
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
4a67d36735
|
[minor] removed remark field from auto material request
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
cd3914a06f
|
[minor] optimized webnotes.has_permission
|
2013-11-13 17:34:20 +05:30 |
|
Anand Doshi
|
9259f6e5ce
|
[minor] [docs] fixes in filename and title
|
2013-11-13 17:31:00 +05:30 |
|
Anand Doshi
|
5f73a980b5
|
[minor] replace 'raise e' with 'raise' for correct tracebacks
|
2013-11-13 17:31:00 +05:30 |
|
Akhilesh Darjee
|
d2d210dc68
|
[fix] [minor] variance reports fixes
|
2013-11-13 17:27:35 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Akhilesh Darjee
|
bfe264be8c
|
[fix] [minor] all types of variance reports fixed
|
2013-11-13 16:45:11 +05:30 |
|
Anand Doshi
|
09391e14ad
|
Merge pull request #1035 from MaxMorais/patch-1
[minor] by Max - fixes after translation in sales_analytics.js
|
2013-11-13 02:55:04 -08:00 |
|
Nabin Hait
|
49f2bafa0f
|
[fix] [minor] budget variance report logic + loading time
|
2013-11-13 15:32:12 +05:30 |
|
Anand Doshi
|
bcedf1ebd3
|
Merge pull request #1039 from fogueri/master
[docs] faq repacking
|
2013-11-13 01:37:43 -08:00 |
|
Priya
|
c60e08d718
|
[docs] faq repacking
|
2013-11-13 12:15:26 +05:30 |
|
Nabin Hait
|
eaa911ae50
|
Merge pull request #1034 from akhileshdarjee/1310
[fix] [minor] updated message for conversion rate
|
2013-11-12 19:10:47 -08:00 |
|
Maxwell
|
33e57ca288
|
Update sales_analytics.js
Fix a error caused after the translation.
|
2013-11-12 15:06:49 -02:00 |
|
Akhilesh Darjee
|
e1cf3453b4
|
[fix] [minor] conversion rate validation message update
|
2013-11-12 19:49:10 +05:30 |
|
Akhilesh Darjee
|
e0b32824ff
|
[fix] [minor] updated message for conversion rate
|
2013-11-12 19:27:16 +05:30 |
|
Anand Doshi
|
516d49c5e8
|
Merge pull request #1024 from dbinary/patch-1
[minor] Update install_erpnext.py
|
2013-11-12 04:16:46 -08:00 |
|
Anand Doshi
|
372df9ec35
|
Merge pull request #1030 from fogueri/master
[docs] knowledge files and faq
|
2013-11-12 04:05:12 -08:00 |
|
Priya
|
e7d3b89886
|
[docs] knowledge files and faq
|
2013-11-12 15:31:51 +05:30 |
|
Anand Doshi
|
580bc7c922
|
[minor] favicon
|
2013-11-12 11:50:00 +05:30 |
|
Nabin Hait
|
06da1a6147
|
Merge pull request #1029 from akhileshdarjee/1310
[fix] [minor] budget variance report fixed
|
2013-11-11 21:57:22 -08:00 |
|
Akhilesh Darjee
|
fbfefd3dcd
|
[fix] [minor] budget variance report fixed
|
2013-11-12 11:24:56 +05:30 |
|
Pratik Vyas
|
b0b23112be
|
update install docs
|
2013-11-11 20:52:12 +05:30 |
|
Nabin Hait
|
e587bc3024
|
Update accounts_payable.py
|
2013-11-11 18:42:22 +05:30 |
|
Rushabh Mehta
|
91db9dc4ee
|
[cleanup] [ui] minor
|
2013-11-11 18:28:45 +05:30 |
|
Nabin Hait
|
113b4c1a21
|
[fix] [minor] accounts payable ageing data
|
2013-11-11 18:25:12 +05:30 |
|
Rushabh Mehta
|
3b9e864dec
|
[ui cleanup] [minor]
|
2013-11-11 18:01:37 +05:30 |
|
Anand Doshi
|
0d62fe821d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-11-11 14:07:25 +05:30 |
|
Anand Doshi
|
ca8019bd97
|
[minor] fixes after remark field removal
|
2013-11-11 14:06:05 +05:30 |
|
Anand Doshi
|
c89b49c322
|
Merge remote-tracking branch 'origin/1310'
|
2013-11-11 13:45:19 +05:30 |
|
Nabin Hait
|
cbf2e44f0e
|
Merge pull request #1026 from akhileshdarjee/1310
[report] [fix] accounts payable fixed for get_ageing_date()
|
2013-11-10 23:24:33 -08:00 |
|