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
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
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
Bárbara Perretti
3da50f0960
Fix translate stock/page/stock_home/stock_home.js
2013-10-15 18:34:18 -03:00
Bárbara Perretti
f007dd4e5f
Fix translate stock/page/stock_ageing/stock_ageing.js
2013-10-15 18:32:38 -03:00
Bárbara Perretti
b7a6b850cf
Fix translate setup.js
2013-10-15 18:20:32 -03:00
Bárbara Perretti
058e246be6
Fix translate supplier_type.js
2013-10-15 18:15:29 -03:00
Bárbara Perretti
119326826a
Fix translate setup/doctype/territory/territory.js
2013-10-15 18:14:50 -03:00
Bárbara Perretti
9d6312fac4
Fix translate customers_not_buying_since_long_time.js
2013-10-15 17:57:20 -03:00
Bárbara Perretti
7329d7f118
Fix translate selling/doctype/sales_bom/sales_bom.js
2013-10-15 17:54:25 -03:00
Bárbara Perretti
acc7061ca7
Fix translate public/js/controllers/stock_controller.js
2013-10-15 17:29:57 -03:00
Bárbara Perretti
a1a8907e78
Fix translate startup.js
2013-10-15 17:27:26 -03:00
Bárbara Perretti
7934140969
Fix translate projects/report/daily_time_log_summary/daily_time_log_summary.js
2013-10-15 17:14:28 -03:00
Bárbara Perretti
17a37bd329
Fix translate hr/doctype/job_applicant/job_applicant.js
2013-10-15 16:50:53 -03:00
Bárbara Perretti
eb65e210fd
Fix translate hr/doctype/upload_attendance/upload_attendance.js
2013-10-15 16:31:58 -03:00
Bárbara Perretti
21fc1f2652
Fix translate buying/page/purchase_analytics/purchase_analytics.js
2013-10-15 16:18:18 -03:00
Bárbara Perretti
b0e466d55c
Fix translate buying/page/buying_home/buying_home.js
2013-10-15 16:11:34 -03:00
Bárbara Perretti
54db11c323
Fix translate buying/doctype/supplier_quotation/supplier_quotation.js
2013-10-15 16:06:39 -03:00
Bárbara Perretti
32af5cd62e
Fix translate accounts/page/general_ledger/general_ledger.js
2013-10-15 15:52:57 -03:00
Bárbara Perretti
ac0e261eee
Fix translate accounts/page/financial_statements/financial_statements.js
2013-10-15 15:33:54 -03:00
Bárbara Perretti
1e7685e8ae
Fix translate accounts/page/financial_analytics/financial_analytics.js
2013-10-15 15:32:13 -03:00
Bárbara Perretti
f941e7499f
Fix translate selling/doctype/lead/lead.js
2013-10-15 15:22:53 -03:00
Bárbara Perretti
8bf1374abf
Fix translate accounts/page/accounts_home/accounts_home.js
2013-10-15 15:22:20 -03: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
