Commit Graph

29362 Commits

Author SHA1 Message Date
Nabin Hait
b1e8be462b error fixed in patch util 2011-08-10 14:16:43 +05:30
Nabin Hait
0f36819ae2 merged patch from master branch 2011-08-10 14:04:52 +05:30
Nabin Hait
d31de59d2e fixed error in patch 2011-08-10 14:01:27 +05:30
Nabin Hait
8a3b46acef Merge branch 'master' of github.com:webnotes/erpnext into stable 2011-08-10 13:44:58 +05:30
Nabin Hait
1c2be25ec0 Merge pull request #36 from anandpdoshi/master
Updated patch.py
2011-08-10 01:08:44 -07:00
Anand Doshi
aabf1748a2 Added patch to update account id value in description_html of item, which maps the image url to the description 2011-08-10 13:27:25 +05:30
Anand Doshi
b61abff9cd Reload billing page patch 2011-08-10 11:58:05 +05:30
Anand Doshi
d78b8b5337 Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch.py
2011-08-10 11:23:31 +05:30
Nabin Hait
cfdccf3bfb Merge branch 'master' into stable 2011-08-09 14:22:58 +05:30
Rushabh Mehta
7af685a9d6 Merge branch 'master' into stable 2011-08-09 11:48:58 +05:30
Nabin Hait
d0d9bdfe90 Half day validation in leave application 2011-08-08 15:13:05 +05:30
Nabin Hait
6013016ab6 Merge pull request #34 from nabinhait/master
considered half day lwp in sal slip
2011-08-08 02:29:52 -07:00
Nabin Hait
3cb7b165d1 considered half day lwp in sal slip 2011-08-08 14:58:38 +05:30
Nabin Hait
2c0ab73948 old_parent field is Link to parent dt now in account, cost center, item group, cust group, territory. It will fix renaming bug 2011-08-05 13:40:04 +05:30
Nabin Hait
f82b1cc4bd old_parent field in account is linked to Account now, it will fix account renaming bug 2011-08-05 13:23:14 +05:30
Nabin Hait
ef1f75bdff Merge pull request #32 from nabinhait/master
Small issues fixed
2011-08-04 23:19:56 -07:00
Nabin Hait
c4e579c901 reloaded answer doctype 2011-08-05 11:21:35 +05:30
Nabin Hait
bff6e2873d removed uncompleted testcase for delivery note 2011-08-05 11:17:40 +05:30
Nabin Hait
b24ba8ef52 indentation replaced by tab 2011-08-05 11:15:07 +05:30
Nabin Hait
d8b7f8eb77 fn reordered in sales common 2011-08-05 11:13:27 +05:30
Nabin Hait
812e71894c permission to system manager in role, dt mapper and print format 2011-08-05 11:10:30 +05:30
Nabin Hait
a819f6f8ab rename function added in item 2011-08-05 11:09:25 +05:30
Nabin Hait
71f2bd97b6 level was not adding in add_permission() 2011-08-05 11:08:42 +05:30
Nabin Hait
4a2f8c8179 serial no removed from mandatory 2011-08-05 11:07:45 +05:30
Rushabh Mehta
542da5e9ee merged patch from stable 2011-08-02 13:31:59 +05:30
Rushabh Mehta
8d8dfc3e8d fixed patches 2011-08-02 13:16:12 +05:30
Rushabh Mehta
a0e9467dc2 merged from origin 2011-08-02 13:06:30 +05:30
Rushabh Mehta
393e70b631 merged from stable 2011-08-02 13:05:09 +05:30
Anand Doshi
8029ca24b5 Merge branch 'master' of github.com:webnotes/erpnext 2011-08-02 13:02:46 +05:30
Nabin Hait
809530c4b9 Merge branch 'live' 2011-08-02 12:57:07 +05:30
Nabin Hait
510dad7aa7 fixed error in period closing voucher 2011-08-02 12:54:23 +05:30
Anand Doshi
38d1223538 Removed patch to modify account id in control panel. Will write script to update that 2011-07-29 13:13:46 +05:30
Anand Doshi
c1ef503d98 Patch to transfer db_name to account_id in control panel 2011-07-29 13:01:54 +05:30
Nabin Hait
f86ee7ed9a Merge branch 'master' of github.com:nabinhait/erpnext 2011-07-28 16:25:47 +05:30
Nabin Hait
7c285712e1 fixed error in period closing voucher 2011-07-28 16:25:11 +05:30
Nabin Hait
b824cdbbfd update modified date of JV through bank reco 2011-07-28 16:17:32 +05:30
Nabin Hait
f88f2f4d13 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-28 16:01:55 +05:30
Nabin Hait
3df2859299 update modified date of JV through bank reconciliation 2011-07-28 16:01:16 +05:30
Nabin Hait
43a3a619b3 clearance date will be copy while amending journal voucher 2011-07-28 15:38:23 +05:30
Nabin Hait
8ae9895733 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-28 15:33:53 +05:30
Nabin Hait
f541b746d1 fixed conflict while merging master and live 2011-07-28 15:33:42 +05:30
Nabin Hait
5c04580453 Merge pull request #24 from tobrahma/master
Journal Voucher .txt file added and remove a massage while generating schedule in Lease Agreement
2011-07-28 03:02:19 -07:00
Brahma K
5ca0153b51 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-28 15:29:30 +05:30
Brahma K
4e5fcf03fc Journal Voucher .txt file added 2011-07-28 15:29:12 +05:30
Nabin Hait
36506a20fa merged some update from live 2011-07-28 15:18:05 +05:30
Nabin Hait
25ffe5b9a4 modules renamed in customer_address and feed patch 2011-07-28 13:49:03 +05:30
Nabin Hait
86f3028fc1 added __init__.py file in old patches dir 2011-07-28 13:13:52 +05:30
Nabin Hait
7ce060ae22 Merge pull request #23 from tobrahma/master
Added ignored text files related Lease agreement
2011-07-28 00:30:13 -07:00
Brahma K
67b8da652c Added Lease Agreement text files 2011-07-28 12:58:14 +05:30
Nabin Hait
d1a17c8592 Merge pull request #22 from tobrahma/master
Converted Lease Agreement Reports in  Standard and created corrosponding js,py and sql files
2011-07-28 00:12:56 -07:00