Commit Graph

5727 Commits

Author SHA1 Message Date
Nabin Hait
6198c28fd3 validation for stock and nonstock items in purchase cycle 2013-04-26 17:29:05 +05:30
Nabin Hait
d58d1b5a18 validation for stock and nonstock items in purchase cycle 2013-04-26 17:25:44 +05:30
Anand Doshi
edc5f2edd0 [sales invoice] [fetching] fetch pos values and customer address contact values 2013-04-26 17:21:49 +05:30
Nabin Hait
6124247765 [bom] set fetched values at server side 2013-04-26 16:29:06 +05:30
Nabin Hait
04c1f94b4e [DN][usability] copy cost center in each row 2013-04-26 16:27:51 +05:30
Nabin Hait
205f7ce620 validation for stock and nonstock items in purchase cycle 2013-04-26 13:35:06 +05:30
Nabin Hait
794c098e55 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-26 10:49:52 +05:30
Rushabh Mehta
cdc9e2cd6f [patch] [file data] reset permissions 2013-04-25 11:06:17 +05:30
Rushabh Mehta
b7193461bc Merge branch 'master' into edge 2013-04-25 10:57:19 +05:30
Rushabh Mehta
d9ad2e0271 [master database] [patched] updated patched master.sql.gz 2013-04-25 10:31:36 +05:30
Anand Doshi
1ae95518f1 Merge branch 'master' into edge 2013-04-24 18:54:11 +05:30
Anand Doshi
181bcd015d [bom] [fixes] fixes in bom 2013-04-24 18:52:41 +05:30
Nabin Hait
5c2cb74e7a [script report] sales register migrated into new script report 2013-04-24 15:46:09 +05:30
Anand Doshi
ded4848a5e Merge branch 'master' into edge 2013-04-24 15:35:38 +05:30
Anand Doshi
c95c973829 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-24 15:33:39 +05:30
Anand Doshi
77bb4cef39 [naming series] [fixes] consider custom fields with fieldname naming_series 2013-04-24 15:32:39 +05:30
Anand Doshi
d54a4741a9 Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-24 12:02:54 +05:30
Anand Doshi
a5d19955d1 Merge branch 'master' of github.com:webnotes/erpnext into webshop
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-24 11:48:28 +05:30
Anand Doshi
8a0dcf1f36 Merge branch 'master' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/patch_list.py
2013-04-24 11:40:28 +05:30
Nabin Hait
59a6cd6c44 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-23 17:50:22 +05:30
Nabin Hait
627a08b7db [report] total added in daily time log summary report 2013-04-23 17:49:24 +05:30
Anand Doshi
deb31432dd Merge branch 'master' into edge 2013-04-23 17:08:34 +05:30
Anand Doshi
10f09092aa [backup manager] [fixes] show erroneous files in error email message 2013-04-23 17:07:52 +05:30
Anand Doshi
a63b9e7762 Merge branch 'master' into edge 2013-04-23 16:29:33 +05:30
Nabin Hait
cb9c480967 [report] total added in daily time log summary report 2013-04-23 16:08:13 +05:30
Nabin Hait
b2972dca98 [script report] accounts payable migrated to new style 2013-04-23 15:53:33 +05:30
Nabin Hait
5494b181ac Merge branch 'master' of github.com:webnotes/erpnext 2013-04-23 15:37:13 +05:30
Nabin Hait
ebd514442a [script report] accounts payable migrated to new style 2013-04-23 15:36:26 +05:30
Anand Doshi
3e8c696de7 Merge branch 'master' into edge 2013-04-23 14:24:00 +05:30
Anand Doshi
ed7cf1bced [backup manager] [fixes] fixes in dropbox and google drive 2013-04-23 14:23:03 +05:30
Anand Doshi
a536eef393 Merge branch 'master' into edge 2013-04-23 13:10:55 +05:30
Anand Doshi
94dab56a1f Merge branch 'master' of github.com:webnotes/erpnext 2013-04-23 13:08:00 +05:30
Anand Doshi
76d7ec51fb [backup manager] [fixes] fix in dropbox folder path 2013-04-23 13:05:40 +05:30
Nabin Hait
98025ac32c Merge branch 'master' of github.com:webnotes/erpnext 2013-04-23 12:54:54 +05:30
Nabin Hait
0a480f4efd fixes in item: organized code 2013-04-23 12:54:07 +05:30
Anand Doshi
dc0f2d2422 Merge branch 'master' into edge
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-23 12:42:18 +05:30
Anand Doshi
890265928b [backup manager] [error handling] on error, send complete traceback as email 2013-04-23 12:30:38 +05:30
Anand Doshi
6f83e77010 [leave application] [employee query] fixes 2013-04-23 12:24:31 +05:30
Nabin Hait
81c6a3beef stock uom mandatory for item 2013-04-23 11:39:54 +05:30
Anand Doshi
f2785c9e61 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 18:59:48 +05:30
Anand Doshi
a7b8f35539 [leave application] [employee query] allow employee lookup for which the current user is leave approver or thhe employee has no leave approvers mentioned or the user is the employee 2013-04-22 18:59:04 +05:30
Nabin Hait
b59a15e65f Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 15:16:04 +05:30
Nabin Hait
d16cae113a [salary structure] added a validation 2013-04-22 15:15:47 +05:30
Nabin Hait
a305406267 [salary structure] added a validation 2013-04-22 14:30:30 +05:30
Anand Doshi
b41bb5de2a Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 14:25:47 +05:30
Anand Doshi
978dc8b74d [patches] [fix] fix in update_account_property_patch 2013-04-22 14:25:06 +05:30
Nabin Hait
2f829ecbdf field label changed in salary structure 2013-04-22 14:10:36 +05:30
Rushabh Mehta
e2fe4cd317 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-22 14:04:07 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
6b66811aec Merge branch 'master' into edge 2013-04-22 13:59:59 +05:30