Nabin Hait
|
4ccb2edbfd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-11-22 18:10:46 +05:30 |
|
Anand Doshi
|
0c8fd3408c
|
[minor] [website] fix in container
|
2013-11-21 14:58:59 +05:30 |
|
Nabin Hait
|
8eb0c61649
|
[minor] merge conflict fixed
|
2013-11-21 12:28:50 +05:30 |
|
Nabin Hait
|
458b30b5d3
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-20 13:51:16 +05:30 |
|
Akhilesh Darjee
|
20f93546eb
|
[fix] [minor] all variance related reports fixed
|
2013-11-20 13:25:04 +05:30 |
|
Nabin Hait
|
46220f9fab
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-20 13:14:39 +05:30 |
|
Nabin Hait
|
ca471f41a1
|
[fix] Rename and merge rewrite
|
2013-11-20 13:14:12 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Rushabh Mehta
|
ebdddf3fb6
|
[website] [sitemap] cleanup
|
2013-11-19 14:20:52 +05:30 |
|
Akhilesh Darjee
|
5a1a22e907
|
[fix] [minor] product search to search on textbox keypress
|
2013-11-19 12:26:46 +05:30 |
|
Akhilesh Darjee
|
510a73a0de
|
[fix] [minor] product search box fixed
|
2013-11-18 15:29:36 +05:30 |
|
Anand Doshi
|
89844f803d
|
[minor] check permission for editable web page
|
2013-11-13 17:34:21 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Rushabh Mehta
|
f7b203de2d
|
[cleanup] UI Fixes
|
2013-11-03 20:37:49 +05:30 |
|
Rushabh Mehta
|
ef5845589d
|
[cleanup] [minor] finishing styles, labels, descriptions
|
2013-11-02 14:47:11 +05:30 |
|
Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Nabin Hait
|
3eb901f47d
|
[merge] merged with master
|
2013-10-24 11:21:11 +05:30 |
|
Rushabh Mehta
|
70d7c481e9
|
[naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854
|
2013-10-18 17:27:45 +05:30 |
|
Akhilesh Darjee
|
cd80d86dbb
|
[fix] [minor] renamed edit prices button from price list and item
|
2013-10-18 15:35:13 +05:30 |
|
Akhilesh Darjee
|
fcd70d04f3
|
[item price] item price made as an individual master and removed from price list
|
2013-10-18 14:24:21 +05:30 |
|
Rushabh Mehta
|
46eaa55f06
|
[editable] [minor] made item, item_group pages editable
|
2013-10-18 12:17:20 +05:30 |
|
Anand Doshi
|
6294452435
|
[minor] removed references to server.py
|
2013-10-17 20:00:52 +05:30 |
|
Bárbara Perretti
|
4b41e5f7f7
|
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
|
2013-10-16 15:09:18 -03:00 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Rushabh Mehta
|
56bc5c0ea6
|
[material request] Added feature to pull items from BOM
|
2013-10-11 14:34:46 +05:30 |
|
Anand Doshi
|
b604eddbfd
|
[minor] [fixes] view in website and other fixes
|
2013-10-10 15:43:32 +05:30 |
|
Bárbara Perretti
|
cf0f3a02d4
|
Fix translate item.js
|
2013-10-03 13:58:56 -03:00 |
|
Nabin Hait
|
625da79e9f
|
item-wise price list rate, editable report
|
2013-09-25 10:32:51 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Anand Doshi
|
e122121dc4
|
[fix] [minor] stock uom and price list currency in webshop
|
2013-09-18 17:28:06 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Anand Doshi
|
619ed5e949
|
[fix] [minor] [website]
|
2013-09-17 13:46:50 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Anand Doshi
|
155d985cd4
|
Merge branch 'master' of github.com:webnotes/erpnext into website-wip
Conflicts:
patches/patch_list.py
|
2013-09-12 17:03:21 +05:30 |
|
Akhilesh Darjee
|
b9c12eff17
|
[fix] [minor] merge conflict fixed
|
2013-09-12 14:02:37 +05:30 |
|
Nabin Hait
|
6656acff52
|
[minor] [fix] set stock uom in stock ledger entry through stock reconciliation
|
2013-09-12 11:46:09 +05:30 |
|
Anand Doshi
|
0748cb7d18
|
[website] [minor] moving to framework
|
2013-09-11 15:31:58 +05:30 |
|
Akhilesh Darjee
|
c3ec72c991
|
[fix] [minor] merge conflict fixed
|
2013-09-11 14:49:38 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Anand Doshi
|
b0d996ffb1
|
[website] [minor] moving to framework
|
2013-09-10 18:29:39 +05:30 |
|
Anand Doshi
|
330dae90cb
|
[website] [minor] moving to framework
|
2013-09-10 13:46:28 +05:30 |
|
Rushabh Mehta
|
7c2312a74c
|
[website] [minor] moving to framework
|
2013-09-10 12:51:52 +05:30 |
|
Rushabh Mehta
|
bdb846f665
|
[website] [minor] moving to framework
|
2013-09-09 17:31:19 +05:30 |
|
Rushabh Mehta
|
e865de01ee
|
[website] [minor] moving to framework
|
2013-09-09 12:32:35 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Rushabh Mehta
|
46089dbc97
|
[website] [minor] moving website helper methods to doctypes
|
2013-09-09 11:32:24 +05:30 |
|
Nabin Hait
|
a0871cfe6a
|
[fix] [minor] Fixes for uom validation of item
|
2013-09-06 16:26:07 +05:30 |
|
Nabin Hait
|
78fde78405
|
[fix] [minor] changed uom replace utility message
|
2013-09-06 14:05:47 +05:30 |
|
Nabin Hait
|
e33d0be32c
|
[fix] [minor] changed uom replace utility message
|
2013-09-06 13:23:33 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|