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
|
e5a1a84d8d
|
Merge pull request #1078 from akhileshdarjee/1310
[fix] [minor] send sms fixed for purchase module
|
2013-11-20 22:27:18 -08:00 |
|
Akhilesh Darjee
|
0ec4bdfcb8
|
[fix] [minor] send sms fixed for purchase module
|
2013-11-21 11:55:54 +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 |
|
Rushabh Mehta
|
04cc5155f7
|
Added Notification Control for caching notifications probably causing the freezing problem
|
2013-11-18 13:23:20 +05:30 |
|
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 |
|
Nabin Hait
|
e83069cb32
|
[fix] update future gl entries for stock
|
2013-11-14 18:40:08 +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
|
515636f24c
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-11-08 16:28:12 +05:30 |
|
Rushabh Mehta
|
7d8b189c8f
|
[cleanup] UI Fixes
|
2013-11-08 16:27:18 +05:30 |
|
Anand Doshi
|
ed1679a1c5
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-07 20:49:13 +05:30 |
|
Akhilesh Darjee
|
e3af1eaf47
|
[fix] fixed landed cost wizard for cancel_pr()
|
2013-11-06 16:59:38 +05:30 |
|
Rushabh Mehta
|
a063b4d50e
|
[cleanup] UI Fixes, minor
|
2013-11-06 11:29:47 +05:30 |
|
Anand Doshi
|
b03f870441
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-04 15:22:50 +05:30 |
|
Anand Doshi
|
3673a25176
|
[minor] fixes after item price move
|
2013-11-04 15:14:57 +05:30 |
|
Anand Doshi
|
2ced381976
|
[minor] fixes in test cases and demo
|
2013-11-04 14:37:29 +05:30 |
|
Anand Doshi
|
daaa14c079
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
setup/doctype/setup_control/setup_control.py
stock/doctype/stock_entry/stock_entry.py
utilities/demo/demo_docs/Price_List.csv
|
2013-11-04 13:14:39 +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 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Rushabh Mehta
|
bed14d7fa4
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-10-31 15:16:05 +05:30 |
|
Akhilesh Darjee
|
0b39e95011
|
[cleanup] moved for territory, price list and item price doctype from setup to stock
|
2013-10-31 12:35:52 +05:30 |
|
Anand Doshi
|
fec52b5a8f
|
[minor] fixed stock entry and demo
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
a5bd3dd207
|
[fix] [minor] update finished goods against production order
|
2013-10-28 19:59:43 +05:30 |
|
Rushabh Mehta
|
069672e197
|
[minor] cleanup start
|
2013-10-28 18:21:07 +05:30 |
|
Nabin Hait
|
bd071b9543
|
[fix] [minor] update finished goods against production order
|
2013-10-25 15:39:17 +05:30 |
|
Pratik Vyas
|
297041ed3e
|
Merge remote-tracking branch 'upstream/wsgi' into HEAD
Conflicts:
public/js/complete_setup.js
setup/doctype/setup_control/setup_control.py
|
2013-10-25 14:07:48 +05:30 |
|
Nabin Hait
|
3898777c9f
|
[minor] validation message in serial no
|
2013-10-24 17:36:02 +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 |
|
Akhilesh Darjee
|
97e55710da
|
[fix] [minor] get_items function fix
|
2013-10-23 15:22:22 +05:30 |
|
Akhilesh Darjee
|
2cdeb3bb7a
|
[fix] [minor] if difference account blank then fetch from company
|
2013-10-23 14:46:07 +05:30 |
|
Akhilesh Darjee
|
d32b6a8d32
|
[fix] production order transfer raw material to fetch all necessary data
|
2013-10-23 14:03:46 +05:30 |
|
Nabin Hait
|
953d0a955f
|
[feature] Replace Company Abbr
|
2013-10-21 12:53:10 +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 |
|
Nabin Hait
|
5566bcaa0e
|
[cleanup] purchase common
|
2013-10-18 17:01:56 +05:30 |
|
Anand Doshi
|
0bc5ae55d8
|
[minor] fixes in data import, serial no and setup wizard
|
2013-10-18 16:07:47 +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
|
2d82f26976
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-18 15:28:15 +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 |
|