Commit Graph

5062 Commits

Author SHA1 Message Date
Anand Doshi
a10461e16c minor fix in purchase receipt 2013-03-01 16:12:50 +05:30
Anand Doshi
619dc6fcf8 send support ticket response at the end of all operations 2013-03-01 16:12:37 +05:30
Anand Doshi
9568d869f8 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 15:12:53 +05:30
Nabin Hait
541cbe3df9 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-01 14:47:49 +05:30
Anand Doshi
a6acdda094 fixes in calendar event display on desktop 2013-03-01 14:41:32 +05:30
Nabin Hait
a139dc93f0 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 14:40:59 +05:30
Nabin Hait
483731e06c fixes in attendance control panel 2013-03-01 14:40:40 +05:30
Anand Doshi
f8a01cfb93 Merge branch 'master' into edge 2013-03-01 14:13:08 +05:30
Anand Doshi
57f83ed36b show leave balance in leave balance report 2013-03-01 14:11:56 +05:30
Anand Doshi
5ec043c920 Merge branch 'master' into edge 2013-03-01 13:44:54 +05:30
Nabin Hait
13c3c8ab67 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 13:22:11 +05:30
Nabin Hait
1ead851e16 datatype validation in voucher import tool 2013-03-01 13:21:29 +05:30
Anand Doshi
db52264f83 Merge branch 'master' into edge 2013-03-01 12:58:46 +05:30
Anand Doshi
322bd08f26 allow attachment in batch 2013-03-01 12:52:34 +05:30
Nabin Hait
95a72a7a4a fixes for material request 2013-03-01 11:07:07 +05:30
Nabin Hait
5657cd775f fixes for material request 2013-03-01 11:05:57 +05:30
Nabin Hait
a9afc254bc fixes for conversion factor in old invoices 2013-03-01 10:41:41 +05:30
Anand Doshi
1bfec3a6c8 buying - update valuation rate when item row has item_code and quantity, else set valuation rate as 0 2013-02-28 19:17:46 +05:30
Anand Doshi
5b56e78580 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-28 19:16:31 +05:30
Anand Doshi
b05185ba96 hide website fields function removed 2013-02-28 18:49:17 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Nabin Hait
380f555a8c fixes in price list currency 2013-02-28 18:41:49 +05:30
Nabin Hait
bb6a8b224a Merge branch 'master' of github.com:webnotes/erpnext 2013-02-28 18:10:54 +05:30
Nabin Hait
15e7c18639 fixes in price list currency 2013-02-28 18:10:19 +05:30
Anand Doshi
3d2a9ca738 Merge branch 'master' into edge 2013-02-28 17:46:21 +05:30
Anand Doshi
4a36e479c1 fix in subcontracted validation 2013-02-28 17:41:03 +05:30
Anand Doshi
e11214373a Merge branch 'master' of github.com:webnotes/erpnext 2013-02-28 17:15:45 +05:30
Nabin Hait
86dc888648 datetime issue in stock balance repory 2013-02-28 17:09:08 +05:30
Anand Doshi
a8caa5edef patch to delete warehouses with docstatus = 2 2013-02-28 16:45:37 +05:30
Nabin Hait
a71ace0d74 fixed asynchronus issue in purchase cycle 2013-02-28 16:30:53 +05:30
Rushabh Mehta
b0486b9d33 Merge pull request #297 from billyfordon/master
Adding German translation
2013-02-27 20:52:16 -08:00
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
215fc02395 Merge branch 'master' into edge 2013-02-27 19:14:16 +05:30
Anand Doshi
5c6fc62b9e added company filter in employee leave balance report 2013-02-27 19:08:01 +05:30
Anand Doshi
46d437e2ef fix in get previous fiscal year for leave allocation 2013-02-27 18:55:37 +05:30
Anand Doshi
89e70d77ca show leave application of other employees in deparment if user has Employee role, but also show leave applications based on permissions - show unique of both 2013-02-27 18:46:21 +05:30
Anand Doshi
d4d0288540 fixed test case of purchase invoice for auto inventory accounting 2013-02-27 18:29:13 +05:30
Anand Doshi
55d9a62114 Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-02-27 18:14:28 +05:30
Nabin Hait
e5daef72bf Merge branch 'master' of github.com:webnotes/erpnext 2013-02-27 18:11:48 +05:30
Nabin Hait
5418d71fc0 sub-contracting rewrite with testcases 2013-02-27 18:11:17 +05:30
Anand Doshi
4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice 2013-02-27 18:10:30 +05:30
Rushabh Mehta
03fead184e added time log 2013-02-27 15:44:12 +05:30
Anand Doshi
9d794fccc1 fixes in jv test and purchase invoice test 2013-02-27 13:34:22 +05:30
Rushabh Mehta
0fe7dd69f5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-27 10:52:10 +05:30
Rushabh Mehta
891ff09ac1 website: fixed social icons and don't take lang from session for demo 2013-02-27 10:51:26 +05:30
Anand Doshi
82fce3ccb9 Merge branch 'master' into edge 2013-02-26 18:56:13 +05:30
Anand Doshi
a1d4b78fbe started with Auto Inventory Accounting - test case for purchase receipt 2013-02-26 18:09:47 +05:30
Rushabh Mehta
ed19666e1b added Time Log 2013-02-26 16:36:41 +05:30
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Anand Doshi
7671cdfcbf Merge branch 'master' into edge 2013-02-26 12:29:51 +05:30