This website requires JavaScript.
c354d4fd76
Merge branch 'master' into stable
2011-08-22 15:27:32 +05:30
503164ae15
Merge pull request #48 from nabinhait/master
2011-08-22 02:54:24 -07:00
ff4bf867bf
removed eval in pull_details fn
2011-08-22 15:23:24 +05:30
cddc2fa952
Permission given to material user for production material issue and back
2011-08-22 14:55:32 +05:30
7edd657b84
Merge branch 'master' into stable
2011-08-22 14:46:25 +05:30
7a39c67858
Merge pull request #47 from nabinhait/master
2011-08-22 02:13:27 -07:00
fbe3f18d24
Check serial no/bin qty integrity only if actual_qty > 0
2011-08-22 14:41:28 +05:30
9537446aa6
Permission given to material user for production material issue and back flush
2011-08-22 14:40:11 +05:30
44e719cced
Pulled and merged from master
2011-08-22 12:27:26 +05:30
28a7b2800f
Delivery Note changes 1.Net Wt, Gross Wt at packing slip level
2011-08-22 12:23:53 +05:30
2e600078ef
Merge branch 'master' into stable
2011-08-22 11:44:19 +05:30
718d2b151f
Merge branch 'stable' into live
2011-08-22 11:43:37 +05:30
291b426990
Merge pull request #46 from nabinhait/master
2011-08-18 01:57:22 -07:00
41743524a3
validate wh for serial no only in submit
2011-08-18 14:26:27 +05:30
821fe55c52
check fn actual qty with total number of serial no in store
2011-08-18 14:25:10 +05:30
a891bd445b
Merge pull request #45 from nabinhait/master
2011-08-18 00:25:00 -07:00
5fb2b70136
Fixed MTN and Sales Return cancellation issue related to serial no
2011-08-18 12:51:39 +05:30
94d158852a
Fixed MTN and Sales Return cancellation issue related to serial no
2011-08-18 12:50:46 +05:30
b1196bcd22
Make stock ledger entry only on first time saving
2011-08-18 12:49:21 +05:30
1ca982055b
Made some fields read only after saving
2011-08-18 12:48:09 +05:30
1d828f644a
permission updated in employee
2011-08-17 15:05:32 +05:30
81e36a34a6
Budget variance report based on company
2011-08-17 15:03:01 +05:30
496a65a45d
check if banner is not default
2011-08-17 12:23:53 +05:30
8eb1ec27ba
check if banner is not default
2011-08-17 12:21:18 +05:30
594821e2eb
Merge branch 'master' into stable
2011-08-17 10:57:34 +05:30
d075a6c53d
Removed cstr in return for get_server_fields()
2011-08-17 10:50:57 +05:30
501f3d5098
str removed for get_server_fields return
2011-08-17 10:29:58 +05:30
192db6a7cd
str removed for get_server_fields return
2011-08-17 10:28:46 +05:30
06c4de8ae6
removed cstr in get_server_fields return value
2011-08-16 16:38:11 +05:30
ed9b078128
removed cstr in get_server_fields return value
2011-08-16 16:32:48 +05:30
07be4c963a
Merge branch 'master' of github.com:webnotes/erpnext
2011-08-16 14:51:24 +05:30
fce442ebca
1. Patches ":" missing bug 2. Purchase Receipt ".get_bin_details(arg)f" is changed to ".get_bin_details(arg)"
2011-08-16 14:48:46 +05:30
7b1a2dc89a
Purchase Voucher bug fix '.get_bin_details(arg)f' changed to '.get_bin_details(arg)'
2011-08-16 14:38:01 +05:30
8703734087
Development is merged into Master
2011-08-16 14:33:32 +05:30
57aa74cced
Merge pull request #40 from tobrahma/master
2011-08-16 00:22:45 -07:00
2eb81014e8
Merged with upstream master
2011-08-16 12:27:48 +05:30
e8ec975bb3
BOM List modified access item instead of item_code
2011-08-16 12:21:07 +05:30
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
ccfab6b37c
Merge branch 'master' into stable
2011-08-16 11:54:03 +05:30
ab5292a008
merged live
2011-08-16 10:04:29 +05:30
d8b9bae669
merged live
2011-08-16 10:03:31 +05:30
c3ef493171
added setup wizard 0.1
2011-08-12 14:51:33 +05:30
d0ec3e6101
bom fix
2011-08-12 11:05:04 +05:30
89717292b7
fixed get_server_values to make them utf-8 friendly
2011-08-12 10:55:43 +05:30
b3453e6ed5
Merge pull request #39 from nabinhait/master
2011-08-11 03:59:40 -07:00
e35618bb21
fixed bug of reserved_qty if sales bom exists for the item
2011-08-11 15:52:21 +05:30
af43b7457c
fix to kb
2011-08-11 12:37:11 +05:30
98b3676246
fix to kb
2011-08-11 10:57:08 +05:30
c0e97b289d
fix to support ticket
2011-08-11 09:38:19 +05:30
dc2f388e58
fix to support ticket
2011-08-11 09:36:30 +05:30
76980b0e55
update billed_amt, per billed and billing status based on amount
2011-08-10 16:35:25 +05:30
8a80d61cc4
billiing status based on amount
2011-08-10 16:29:20 +05:30
82131d1099
Merge branch 'master' of github.com:webnotes/erpnext
2011-08-10 15:50:30 +05:30
a28e762835
Merge branch 'master' into stable
2011-08-10 14:20:13 +05:30
673f66f56e
error fixed in patch utils
2011-08-10 14:18:31 +05:30
b1e8be462b
error fixed in patch util
2011-08-10 14:16:43 +05:30
0f36819ae2
merged patch from master branch
2011-08-10 14:04:52 +05:30
d31de59d2e
fixed error in patch
2011-08-10 14:01:27 +05:30
8a3b46acef
Merge branch 'master' of github.com:webnotes/erpnext into stable
2011-08-10 13:44:58 +05:30
1c2be25ec0
Merge pull request #36 from anandpdoshi/master
2011-08-10 01:08:44 -07:00
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
b61abff9cd
Reload billing page patch
2011-08-10 11:58:05 +05:30
d78b8b5337
Merge branch 'master' of github.com:webnotes/erpnext
2011-08-10 11:23:31 +05:30
cfdccf3bfb
Merge branch 'master' into stable
2011-08-09 14:22:58 +05:30
7af685a9d6
Merge branch 'master' into stable
2011-08-09 11:48:58 +05:30
d0d9bdfe90
Half day validation in leave application
2011-08-08 15:13:05 +05:30
6013016ab6
Merge pull request #34 from nabinhait/master
2011-08-08 02:29:52 -07:00
3cb7b165d1
considered half day lwp in sal slip
2011-08-08 14:58:38 +05:30
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
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
ef1f75bdff
Merge pull request #32 from nabinhait/master
2011-08-04 23:19:56 -07:00
c4e579c901
reloaded answer doctype
2011-08-05 11:21:35 +05:30
bff6e2873d
removed uncompleted testcase for delivery note
2011-08-05 11:17:40 +05:30
b24ba8ef52
indentation replaced by tab
2011-08-05 11:15:07 +05:30
d8b7f8eb77
fn reordered in sales common
2011-08-05 11:13:27 +05:30
812e71894c
permission to system manager in role, dt mapper and print format
2011-08-05 11:10:30 +05:30
a819f6f8ab
rename function added in item
2011-08-05 11:09:25 +05:30
71f2bd97b6
level was not adding in add_permission()
2011-08-05 11:08:42 +05:30
4a2f8c8179
serial no removed from mandatory
2011-08-05 11:07:45 +05:30
542da5e9ee
merged patch from stable
2011-08-02 13:31:59 +05:30
8d8dfc3e8d
fixed patches
2011-08-02 13:16:12 +05:30
a0e9467dc2
merged from origin
2011-08-02 13:06:30 +05:30
393e70b631
merged from stable
2011-08-02 13:05:09 +05:30
8029ca24b5
Merge branch 'master' of github.com:webnotes/erpnext
2011-08-02 13:02:46 +05:30
809530c4b9
Merge branch 'live'
2011-08-02 12:57:07 +05:30
510dad7aa7
fixed error in period closing voucher
2011-08-02 12:54:23 +05:30
38d1223538
Removed patch to modify account id in control panel. Will write script to update that
2011-07-29 13:13:46 +05:30
c1ef503d98
Patch to transfer db_name to account_id in control panel
2011-07-29 13:01:54 +05:30
f86ee7ed9a
Merge branch 'master' of github.com:nabinhait/erpnext
2011-07-28 16:25:47 +05:30
7c285712e1
fixed error in period closing voucher
2011-07-28 16:17:32 +05:30
b824cdbbfd
update modified date of JV through bank reco
2011-07-28 16:17:32 +05:30
f88f2f4d13
Merge branch 'master' of github.com:webnotes/erpnext
2011-07-28 16:01:55 +05:30
3df2859299
update modified date of JV through bank reconciliation
2011-07-28 16:01:16 +05:30
43a3a619b3
clearance date will be copy while amending journal voucher
2011-07-28 15:38:23 +05:30
8ae9895733
Merge branch 'master' of github.com:webnotes/erpnext
2011-07-28 15:33:53 +05:30
f541b746d1
fixed conflict while merging master and live
2011-07-28 15:33:42 +05:30
5c04580453
Merge pull request #24 from tobrahma/master
2011-07-28 03:02:19 -07:00
5ca0153b51
Merge branch 'master' of github.com:webnotes/erpnext
2011-07-28 15:29:30 +05:30
4e5fcf03fc
Journal Voucher .txt file added
2011-07-28 15:29:12 +05:30
36506a20fa
merged some update from live
2011-07-28 15:18:05 +05:30
Nabin Hait
Brahma K
Rushabh Mehta
Anand Doshi