Brahma K
|
8703734087
|
Development is merged into Master
|
2011-08-16 14:33:32 +05:30 |
|
Nabin Hait
|
57aa74cced
|
Merge pull request #40 from tobrahma/master
BOM List item_code changed to item
|
2011-08-16 00:22:45 -07:00 |
|
Brahma K
|
2eb81014e8
|
Merged with upstream master
|
2011-08-16 12:27:48 +05:30 |
|
Brahma K
|
e8ec975bb3
|
BOM List modified access item instead of item_code
|
2011-08-16 12:21:07 +05:30 |
|
Brahma K
|
b77bfdb990
|
BOM Related changes (1.Unset as Default BOM, 2.Flat BOM Repair 3.delete_doc issue)
|
2011-08-16 12:10:51 +05:30 |
|
Rushabh Mehta
|
ccfab6b37c
|
Merge branch 'master' into stable
|
2011-08-16 11:54:03 +05:30 |
|
Rushabh Mehta
|
ab5292a008
|
merged live
|
2011-08-16 10:04:29 +05:30 |
|
Rushabh Mehta
|
d8b9bae669
|
merged live
|
2011-08-16 10:03:31 +05:30 |
|
Rushabh Mehta
|
c3ef493171
|
added setup wizard 0.1
|
2011-08-12 14:51:33 +05:30 |
|
Rushabh Mehta
|
d0ec3e6101
|
bom fix
|
2011-08-12 11:05:04 +05:30 |
|
Rushabh Mehta
|
89717292b7
|
fixed get_server_values to make them utf-8 friendly
|
2011-08-12 10:55:43 +05:30 |
|
Nabin Hait
|
b3453e6ed5
|
Merge pull request #39 from nabinhait/master
Billing status based on amount and reserved qty bug fix
|
2011-08-11 03:59:40 -07:00 |
|
Nabin Hait
|
e35618bb21
|
fixed bug of reserved_qty if sales bom exists for the item
|
2011-08-11 15:52:21 +05:30 |
|
Rushabh Mehta
|
af43b7457c
|
fix to kb
|
2011-08-11 12:37:11 +05:30 |
|
Rushabh Mehta
|
98b3676246
|
fix to kb
|
2011-08-11 10:57:08 +05:30 |
|
Rushabh Mehta
|
c0e97b289d
|
fix to support ticket
|
2011-08-11 09:38:19 +05:30 |
|
Rushabh Mehta
|
dc2f388e58
|
fix to support ticket
|
2011-08-11 09:36:30 +05:30 |
|
Nabin Hait
|
76980b0e55
|
update billed_amt, per billed and billing status based on amount
|
2011-08-10 16:35:25 +05:30 |
|
Nabin Hait
|
8a80d61cc4
|
billiing status based on amount
|
2011-08-10 16:29:20 +05:30 |
|
Nabin Hait
|
82131d1099
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-10 15:50:30 +05:30 |
|
Nabin Hait
|
a28e762835
|
Merge branch 'master' into stable
|
2011-08-10 14:20:13 +05:30 |
|
Nabin Hait
|
673f66f56e
|
error fixed in patch utils
|
2011-08-10 14:18:31 +05:30 |
|
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 |
|