Anand Doshi
|
d47db9bccf
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
patches/october_2013/p07_rename_for_territory.py
patches/october_2013/p08_cleanup_after_item_price_module_change.py
setup/doctype/setup_control/setup_control.py
utilities/demo/demo_docs/Lead.csv
|
2013-11-04 15:34:10 +05:30 |
|
Anand Doshi
|
4bfaaf33aa
|
[minor] fix in patch
|
2013-11-04 15:31:00 +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
|
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 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|