Commit Graph

2921 Commits

Author SHA1 Message Date
Anand Doshi
2cfe2d4616 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-04 14:17:46 +05:30
Rushabh Mehta
4764e70d09 changed timeout to 1000ms in linkfield change event 2012-07-04 10:46:26 +02:00
Anand Doshi
8c90f12967 changed label of included in print rate to Is this Tax included in Basic Rate? 2012-07-04 13:30:13 +05:30
Anand Doshi
472c9cf074 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-04 13:19:30 +05:30
Anand Doshi
cdc011cdbd fix in section hiding / column hiding logic 2012-07-04 13:17:44 +05:30
Anand Doshi
ac475c61dc Merge branch 'master' of github.com:webnotes/erpnext 2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5 Update master 2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Anand Doshi
1b8f24b507 update in contact's permissions 2012-07-03 12:55:17 +05:30
Nabin Hait
594d63ab5d serial no fix 2012-07-03 12:24:18 +05:30
Nabin Hait
fdb1993125 fixed conflict 2012-07-03 12:14:48 +05:30
Anand Doshi
f08eeba491 Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/selling/doctype/sales_common/sales_common.py
2012-07-02 20:27:28 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Nabin Hait
9b1e9aceaf packing list cleanup and serial no status update 2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425 packing list cleanup and serial no status update 2012-07-02 16:41:11 +05:30
Nabin Hait
de293e51fc save packing list after cleanup 2012-07-02 16:24:54 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30
Anand Doshi
cec84e1ec7 logout a disabled user 2012-07-02 11:55:29 +05:30
Nabin Hait
6751261589 reload pr-po mapper patch' 2012-07-02 11:24:37 +05:30
Nabin Hait
5a376f0cdb Merge branch 'master' of github.com:webnotes/erpnext 2012-07-02 11:14:25 +05:30
Nabin Hait
84a2e546de po date should be greated than equal to pur request date 2012-07-02 11:13:48 +05:30
Anand Doshi
c4cae8d561 Merge branch 'master' into dev 2012-06-29 19:07:29 +05:30
Anand Doshi
54b7235705 formatted money in chart of accounts tree 2012-06-29 19:07:20 +05:30
Anand Doshi
365e0c5f13 Merge branch 'master' into dev 2012-06-29 19:04:10 +05:30
Anand Doshi
351352670e formatted money in chart of accounts tree 2012-06-29 19:03:59 +05:30
Anand Doshi
e9a21cbb85 show child table values in doclistview 2012-06-29 18:09:04 +05:30
Anand Doshi
ebe23b0f89 allow deletion of communication 2012-06-29 16:38:07 +05:30
Anand Doshi
1f69f92d2f supplier part number in purchase order 2012-06-29 13:25:08 +05:30
Anand Doshi
efc055241a Merge branch 'master' into dev 2012-06-29 12:25:02 +05:30
Anand Doshi
08faf5bb7f added field descriptions for packing slip 2012-06-29 12:24:35 +05:30
Anand Doshi
bd025a6cdf added field descriptions for packing slip 2012-06-29 12:23:44 +05:30
Anand Doshi
b38546489d Merge branch 'master' into dev 2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326 fix in cacheitem table 2012-06-28 20:46:46 +05:30
Anand Doshi
e301e8a6c1 Merge branch 'master' into dev
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Anand Doshi
cbf181c390 employee list -- show status 2012-06-28 18:38:38 +05:30
Anand Doshi
36f5e257ed minor fix in support ticket list view 2012-06-28 13:08:43 +05:30
Anand Doshi
fef4a71177 minor fix in communication list view 2012-06-28 13:05:39 +05:30
Anand Doshi
0afab07a1f communication listview - show pretty date 2012-06-28 12:59:33 +05:30
Nabin Hait
2c2a17f138 pull available qty in so and DN in selection of item 2012-06-27 15:14:58 +05:30
Nabin Hait
1bf92fe034 update modified time of GRN while updating QA no in GRN 2012-06-27 14:50:14 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
2012-06-27 14:13:34 +05:30
Nabin Hait
490ae41cee maintenance visit cleanup and integrated with maintenance schedule 2012-06-27 13:21:12 +05:30
Anand Doshi
bba4db1627 product listing and pages 2012-06-27 12:06:45 +05:30
Nabin Hait
b81aa88091 Lease agreement link removed from account home page 2012-06-27 12:00:24 +05:30
Nabin Hait
7ce737be3d Issue fixed in stock reconciliation 2012-06-27 11:33:05 +05:30
Nabin Hait
b8108c68e9 Issue fixed in stock reconciliation 2012-06-27 11:16:28 +05:30
Nabin Hait
5a24749456 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-27 10:12:21 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30