Rushabh Mehta
f3f496a8d7
[naming series] [minor] [fix]
2013-10-21 15:24:49 +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
Nabin Hait
1b0664636a
[fix] [conflict]
2013-10-18 13:07:28 +05:30
Nabin Hait
ef00af32c1
[minor] deleted sales common py
2013-10-18 13:02:57 +05:30
Nabin Hait
89ad6f2dab
[fix] [conflict]
2013-10-18 12:55:59 +05:30
Nabin Hait
d1fd1e2d89
[Cleanup] Sales Common deprecated
2013-10-18 12:50:28 +05:30
Nabin Hait
d05a3b3b5c
[Rename] Delivery Note Packing Item -> Packed Item
2013-10-18 12:50:28 +05:30
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
8f72d9f679
Merge pull request #974 from akhileshdarjee/master
...
[fix] [minor] conversion rate related fixes
2013-10-17 00:56:00 -07:00
Akhilesh Darjee
04638a5f77
[fix] [minor] onload post render also check for supplier
2013-10-17 13:19:46 +05:30
Akhilesh Darjee
acf65a7225
[fix] [minor] conversion rate related fixes
2013-10-17 13:04:26 +05:30
Rushabh Mehta
be7e8556b0
Merge pull request #972 from akhileshdarjee/master
...
[fix] [minor] conversion rater
2013-10-16 23:03:41 -07:00
Akhilesh Darjee
3add576b1e
[fix] [minor] conversion rate fix
2013-10-17 11:32:44 +05:30
Akhilesh Darjee
564c621c3e
[fix] [minor] conversion rate fix
2013-10-17 11:31:11 +05:30
Anand Doshi
940e893834
Merge pull request #971 from MaxMorais/patch-1
...
Fix UnicodeDecodeError
2013-10-16 21:48:54 -07:00
Maxwell
ccbde214c2
Fix UnicodeDecodeError
...
```python
Traceback (most recent call last):
File "install_erpnext.py", line 348, in <module>
install()
File "install_erpnext.py", line 13, in install
install_pre_requisites()
File "install_erpnext.py", line 25, in install_pre_requisites
install_using_yum()
File "install_erpnext.py", line 90, in install_using_yum
update_config_for_redhat()
File "install_erpnext.py", line 106, in update_config_for_redhat
exec_in_shell("chkconfig --level 2345 %s on" % service)
File "install_erpnext.py", line 339, in exec_in_shell
if err and any((kw in err.lower() for kw in ["traceback", "error", "exception"])):
File "install_erpnext.py", line 339, in <genexpr>
if err and any((kw in err.lower() for kw in ["traceback", "error", "exception"])):
```
2013-10-16 16:52:01 -03:00
Nabin Hait
185991d547
[fix] [minor] rounding error in purchase invoice gl entry
2013-10-16 13:08:53 +05:30
Nabin Hait
a012ffedd1
Merge branch 'master' of github.com:webnotes/erpnext
2013-10-16 11:48:39 +05:30
Nabin Hait
fc75d96abd
[fix] [minor] Purchase Invoice - Amount for Stock received but not billed
2013-10-16 11:48:15 +05:30
Nabin Hait
f146e8b7f5
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
2013-10-16 11:19:09 +05:30
Nabin Hait
c9f7c36206
Merge pull request #969 from akhileshdarjee/master
...
[fix] fixed conversion rate for mapping any documents
2013-10-15 22:04:22 -07:00
Akhilesh Darjee
61b5c59e70
[fix] fixed conversion rate for mapping any documents
2013-10-15 20:24:34 +05:30
Anand Doshi
a295bf5421
[minor] don't rollback when running all tests, fixed test cases
2013-10-15 19:52:29 +05:30
Nabin Hait
b6f37b8195
Merge branch 'master' of github.com:webnotes/erpnext
2013-10-15 16:55:54 +05:30
Nabin Hait
b338b6ed24
[fix] [minor] validate converion rate
2013-10-15 16:55:24 +05:30
Nabin Hait
a466df8735
Merge pull request #968 from akhileshdarjee/master
...
[fix] fetch difference account and cost center on selecting item in stock entry
2013-10-15 04:03:15 -07:00
Akhilesh Darjee
8f90e1c8f4
Merge branch 'master' of github.com:webnotes/erpnext
2013-10-15 16:26:38 +05:30
Akhilesh Darjee
dd6ebc1a4d
[cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting
2013-10-15 15:54:31 +05:30
Akhilesh Darjee
1dfcc7557a
[fix] fetch difference account and cost center on selecting item in stock entry
2013-10-15 13:54:39 +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
