Commit Graph

4922 Commits

Author SHA1 Message Date
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
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
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
805fdf313c shifted item name and description fields to the left of stock reports 2013-02-26 12:23:39 +05:30
Nabin Hait
a4d8e6b177 reload sales invoice print formats 2013-02-26 11:15:34 +05:30
Nabin Hait
d09cec71da fixes in print format for recurring invoice period 2013-02-26 11:13:21 +05:30
Nabin Hait
adebebfccf updated latest_updates page 2013-02-26 11:00:44 +05:30
Nabin Hait
6054ae2bec delete gross profit based on search criteria 2013-02-26 10:51:24 +05:30
Nabin Hait
6dfa84164e fixes in new gross profit report 2013-02-25 18:57:41 +05:30
Anand Doshi
1a6c457fb5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-25 18:20:47 +05:30
Anand Doshi
258c3fb228 new gross profit report based on query report 2013-02-25 18:17:51 +05:30
Nabin Hait
bdd8fcf7d4 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-25 16:49:33 +05:30
Nabin Hait
3be594a7ed fixes in sms control 2013-02-25 16:48:44 +05:30
Anand Doshi
7f27d34f81 Material Request - Print Heading as a Link field 2013-02-25 15:38:28 +05:30
Anand Doshi
b60aef5595 added report button in todo page 2013-02-25 15:22:20 +05:30
Anand Doshi
bdf4bcc2ed Merge branch 'master' of github.com:webnotes/erpnext 2013-02-25 13:14:09 +05:30
Anand Doshi
98e78e7ccb fixes in email digest 2013-02-25 13:13:04 +05:30
Anand Doshi
7bc7aefcbb reload report before running patches 2013-02-25 13:12:37 +05:30
Anand Doshi
14ab448019 reload report before running patches 2013-02-25 13:11:38 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
22681df120 report_name fix 2013-02-23 17:13:44 +05:30
Rushabh Mehta
586ee7603f query report reload fix 2013-02-23 14:39:53 +05:30
Anand Doshi
2ea8be9989 patch to set report type of Report 2013-02-22 18:51:46 +05:30
Anand Doshi
6b3443e6e2 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 18:04:14 +05:30
Anand Doshi
05f90651f6 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 18:02:43 +05:30
Nabin Hait
1bebb4a24f fixed conflict 2013-02-22 18:02:15 +05:30
Anand Doshi
ebae9ae272 fix in financial statements 2013-02-22 18:02:06 +05:30
Nabin Hait
ad8a46c504 repost reserved qty for all for all items 2013-02-22 17:58:54 +05:30
Rushabh Mehta
defd0e15f2 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 17:55:22 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30