Commit Graph

27643 Commits

Author SHA1 Message Date
Nabin Hait
2c6db0f13b Merge branch 'master' into stable 2011-09-09 15:11:43 +05:30
Nabin Hait
d584282feb Merge pull request #87 from anandpdoshi/master
Allow system managers to change password of other users
2011-09-09 01:25:52 -07:00
Anand Doshi
389de000d9 Allow system manager to change other users password
Also, update gateway membership type if sync_with_gateway is true
2011-09-09 13:41:36 +05:30
Nabin Hait
00be94860b some file checked out from master 2011-09-09 13:13:06 +05:30
Nabin Hait
336e1dceb2 Merge branch 'master' into stable 2011-09-09 13:08:47 +05:30
Nabin Hait
3b57a52a7d Merge pull request #86 from nabinhait/master
packing list patch
2011-09-09 00:35:32 -07:00
Nabin Hait
56e02b70bd print hide print_packing_list field in DN 2011-09-09 13:04:48 +05:30
Nabin Hait
cc56b3a2ff Merge pull request #85 from nabinhait/master
sales browser, quotation etc
2011-09-09 00:29:43 -07:00
Nabin Hait
14db227234 added condition of sales and service item in quotation item code get_query 2011-09-09 12:56:33 +05:30
Nabin Hait
f234d7fc32 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-09 12:38:20 +05:30
Nabin Hait
f067969417 error fixed in sales browser control 2011-09-09 12:14:45 +05:30
Nabin Hait
8f494265ba fixed issue in reposting 2011-09-08 19:09:39 +05:30
Rushabh Mehta
cbaae20328 breakup of farmework files 2011-09-08 19:07:14 +05:30
Nabin Hait
a06c2ceaff fixed null issue in update_cp 2011-09-08 17:58:54 +05:30
Rushabh Mehta
5caedffff8 fixes to buttons etc 2011-09-08 15:45:37 +05:30
Nabin Hait
4303218771 print hide packing list related flds 2011-09-08 14:47:35 +05:30
Nabin Hait
1c3443cab6 Merge branch 'master' into stable 2011-09-08 14:46:03 +05:30
Nabin Hait
fe8554b257 Merge pull request #83 from nabinhait/master
patch
2011-09-08 02:15:26 -07:00
Nabin Hait
269115f191 print hide packing list related flds 2011-09-08 14:43:23 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
5ede3e8411 fixes to home (multiple loading) 2011-09-08 14:16:34 +05:30
Nabin Hait
d030b52394 fixed in auth control 2011-09-08 13:51:58 +05:30
Nabin Hait
926b7d12ce Merge branch 'master' into stable 2011-09-08 13:50:45 +05:30
Nabin Hait
32ff9aad9a Merge pull request #82 from nabinhait/master
auth control
2011-09-08 01:20:21 -07:00
Nabin Hait
410962d3f7 error fixed in auth control 2011-09-08 13:48:40 +05:30
Nabin Hait
4b8c84db9a removed single quote from sql query in auth_control and fixes in company renaming 2011-09-08 11:50:45 +05:30
Nabin Hait
922d034123 Merge branch 'master' into stable 2011-09-08 11:48:51 +05:30
Nabin Hait
6370c20641 Merge pull request #81 from nabinhait/master
authorization control and company
2011-09-07 23:17:42 -07:00
Nabin Hait
94afaa8697 removed single quote from sql query 2011-09-08 11:37:50 +05:30
Nabin Hait
3fe30954f2 on rename of company set company default_value 2011-09-07 19:26:12 +05:30
Nabin Hait
3465d969c0 print hide packing_list related flds in dn 2011-09-07 17:50:51 +05:30
Nabin Hait
1b53a877f4 Merge branch 'master' into stable 2011-09-07 17:47:59 +05:30
Brahma K
6ec2233366 Merge pull request #78 from tobrahma/master
Packing related fields are hidden
2011-09-07 05:17:43 -07:00
Nabin Hait
82df8fef10 Merge branch 'master' into stable 2011-09-07 17:45:33 +05:30
Nabin Hait
9f9e21f6bc Merge pull request #79 from nabinhait/master
patch
2011-09-07 05:13:33 -07:00
Nabin Hait
99f27cbdc4 reload delivery note and dn detail 2011-09-07 17:42:05 +05:30
Brahma K
1dbd2cd7eb Delivery Note: Packing relate fields are hidden in print, PO No and PO Date moved up 2011-09-07 17:37:39 +05:30
Brahma K
c38789f3cd Merge branch 'master' of github.com:webnotes/erpnext 2011-09-07 17:28:00 +05:30
Brahma K
9f1bd9e835 Flat BOM Related modifications 2011-09-07 17:18:35 +05:30
Nabin Hait
ce419c5f7c fixed escape seq error in dn 2011-09-07 17:09:15 +05:30
Nabin Hait
be2e839f4c Merge branch 'master' into stable 2011-09-07 17:07:54 +05:30
Nabin Hait
46f3404f60 Merge pull request #77 from nabinhait/master
dn error
2011-09-07 04:36:42 -07:00
Nabin Hait
11e895713e escape sequence in dn query 2011-09-07 17:06:03 +05:30
Nabin Hait
d0f5d65ea0 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-07 17:00:12 +05:30
Nabin Hait
20551b6551 fixed patch 2011-09-07 16:59:58 +05:30
Nabin Hait
99c1edc86f fixed patch 2011-09-07 16:10:25 +05:30
Nabin Hait
1477f23b4c fixed patch 2011-09-07 16:09:41 +05:30
Nabin Hait
c6b506158b fixed patch 2011-09-07 16:06:42 +05:30
Nabin Hait
332d56db38 fixed patch 2011-09-07 16:05:29 +05:30
Nabin Hait
067559ca9d fixed patch 2011-09-07 16:04:55 +05:30