Nabin Hait
|
096d363087
|
[fix] fixed merge conflict
|
2013-10-18 12:50:28 +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 |
|
Nabin Hait
|
f146e8b7f5
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-16 11:19:09 +05:30 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Anand Doshi
|
8ae6520129
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
stock/doctype/stock_entry/test_stock_entry.py
|
2013-10-15 13:02:23 +05:30 |
|
Nabin Hait
|
5101098020
|
[fix] [minor] fixes in testcases
|
2013-10-15 13:00:53 +05:30 |
|
Anand Doshi
|
21abc706b0
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/test_sales_invoice.py
buying/doctype/purchase_order/test_purchase_order.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_entry/test_stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 13:00:49 +05:30 |
|
Nabin Hait
|
1c62cbe1fc
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-15 12:53:46 +05:30 |
|
Nabin Hait
|
f0feb73ded
|
[minor] bypass plugin field related operational error
|
2013-10-15 12:22:41 +05:30 |
|
Nabin Hait
|
3ceba11208
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 12:19:47 +05:30 |
|
Nabin Hait
|
f8924bcf6f
|
[fix] [minor] update serial no in sle while creating auto serial no
|
2013-10-15 12:19:25 +05:30 |
|
Anand Doshi
|
7e9048570e
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 12:18:46 +05:30 |
|
Nabin Hait
|
028a5202f6
|
[minor] fixed conflict
|
2013-10-15 11:53:03 +05:30 |
|
Nabin Hait
|
de46f1404e
|
Merge pull request #963 from akhileshdarjee/master
[fix] removed validation of conversion rate equals 1 from all transaction
|
2013-10-14 22:58:14 -07:00 |
|
Akhilesh Darjee
|
20659d1346
|
[docs] [minor] merge conflict fixed
|
2013-10-15 11:25:57 +05:30 |
|
Akhilesh Darjee
|
bfeae2da70
|
[cleanup] [minor] removed conversion rate from pos setting
|
2013-10-15 11:16:38 +05:30 |
|
Anand Doshi
|
e43ef785e4
|
Merge pull request #966 from fogueri/master
[docs] 5 day setup names and Website details added
|
2013-10-14 06:38:23 -07:00 |
|
Anand Doshi
|
3510764e7c
|
[minor] plugin architecture, first cut
|
2013-10-14 18:59:16 +05:30 |
|
Akhilesh Darjee
|
1e58ecdc74
|
[docs] updated pos and price list docs
|
2013-10-14 18:22:26 +05:30 |
|
Nabin Hait
|
570b1070a8
|
[fix] [minor] stock balance report for serialized item
|
2013-10-14 17:54:28 +05:30 |
|
Akhilesh Darjee
|
c06cbd5b71
|
[docs] [cleanup] five day setup docs cleanup
|
2013-10-14 15:55:19 +05:30 |
|
Anand Doshi
|
6bc48070a1
|
Moved Custom Server Scripts to custom_scripts/doctype_name.py
|
2013-10-14 15:48:57 +05:30 |
|
Nabin Hait
|
1a60fd8906
|
[fix] [minor] fixes in reposting of ordered, indented and planned qty
|
2013-10-14 14:27:08 +05:30 |
|
Priya
|
b5e74d7fa6
|
[docs] minor name details added
|
2013-10-14 14:20:03 +05:30 |
|
Akhilesh Darjee
|
9bb8a41af0
|
Merge pull request #1 from fogueri/master
[docs] five day setup
|
2013-10-14 01:23:59 -07:00 |
|
Akhilesh Darjee
|
1c7e5725a3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-14 13:43:11 +05:30 |
|
Akhilesh Darjee
|
74ec868968
|
[fix] [minor] added for validate in buying controller
|
2013-10-14 13:41:55 +05:30 |
|
Priya
|
287ce383be
|
[docs] website content added
|
2013-10-14 10:24:22 +05:30 |
|
Priya
|
135563991e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-14 10:15:48 +05:30 |
|
Akhilesh Darjee
|
7837827e30
|
[fix] [minor] conversion arte related fixes
|
2013-10-11 19:06:30 +05:30 |
|
Nabin Hait
|
eea2b34f4b
|
[production] update planned and produced ty
|
2013-10-11 18:31:33 +05:30 |
|
Rushabh Mehta
|
56bc5c0ea6
|
[material request] Added feature to pull items from BOM
|
2013-10-11 14:34:46 +05:30 |
|
Akhilesh Darjee
|
1797cfef63
|
[fix] removed validation of conversion rate equals 1 from all transaction
|
2013-10-11 13:34:10 +05:30 |
|
Rushabh Mehta
|
915eda9c4a
|
[minor] Added allow_rename in Employee webnotes/erpnetx#962
|
2013-10-11 10:57:13 +05:30 |
|
Nabin Hait
|
93c836c86d
|
[fix] [minor] validate warehouse user
|
2013-10-10 19:15:58 +05:30 |
|
Nabin Hait
|
2658384edd
|
[fix] [minor] repost order qty patch
|
2013-10-10 19:07:42 +05:30 |
|
Nabin Hait
|
0948b2a9d3
|
[fix] [minor] repost order qty patch
|
2013-10-10 19:04:18 +05:30 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Rushabh Mehta
|
2eec1eb9a6
|
[minor] removed prevdoc_date
|
2013-10-10 17:08:19 +05:30 |
|
Rushabh Mehta
|
f56d73c9bc
|
[minor] removed get_rate
|
2013-10-10 17:07:53 +05:30 |
|
Anand Doshi
|
97e9deb1ff
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-10 16:10:25 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Anand Doshi
|
b604eddbfd
|
[minor] [fixes] view in website and other fixes
|
2013-10-10 15:43:32 +05:30 |
|
Rushabh Mehta
|
69ad94a795
|
[minor] fixes to form layouts
|
2013-10-10 15:30:12 +05:30 |
|
Priya
|
51f4ac1592
|
[docs] minor image changes
|
2013-10-10 12:44:31 +05:30 |
|
Priya
|
5d3a6c8279
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-10 12:43:22 +05:30 |
|
Anand Doshi
|
7798934989
|
[minor] fixed globals and patch for wsgi migration
|
2013-10-10 12:03:11 +05:30 |
|
Nabin Hait
|
5f2bc144e4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-09 17:38:24 +05:30 |
|
Nabin Hait
|
30bd908833
|
[fix] [minor] setup leave approver select option in employee
|
2013-10-09 17:37:41 +05:30 |
|