Commit Graph

46549 Commits

Author SHA1 Message Date
Nabin Hait
b1196bcd22 Make stock ledger entry only on first time saving 2011-08-18 12:49:21 +05:30
Nabin Hait
1ca982055b Made some fields read only after saving 2011-08-18 12:48:09 +05:30
Nabin Hait
1d828f644a permission updated in employee 2011-08-17 15:05:32 +05:30
Nabin Hait
81e36a34a6 Budget variance report based on company 2011-08-17 15:03:01 +05:30
Rushabh Mehta
496a65a45d check if banner is not default 2011-08-17 12:23:53 +05:30
Rushabh Mehta
8eb1ec27ba check if banner is not default 2011-08-17 12:21:18 +05:30
Nabin Hait
594821e2eb Merge branch 'master' into stable 2011-08-17 10:57:34 +05:30
Nabin Hait
d075a6c53d Removed cstr in return for get_server_fields() 2011-08-17 10:50:57 +05:30
Nabin Hait
501f3d5098 str removed for get_server_fields return 2011-08-17 10:29:58 +05:30
Nabin Hait
192db6a7cd str removed for get_server_fields return 2011-08-17 10:28:46 +05:30
Nabin Hait
06c4de8ae6 removed cstr in get_server_fields return value 2011-08-16 16:38:11 +05:30
Nabin Hait
ed9b078128 removed cstr in get_server_fields return value 2011-08-16 16:32:48 +05:30
Brahma K
07be4c963a Merge branch 'master' of github.com:webnotes/erpnext 2011-08-16 14:51:24 +05:30
Brahma K
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
Brahma K
7b1a2dc89a Purchase Voucher bug fix '.get_bin_details(arg)f' changed to '.get_bin_details(arg)' 2011-08-16 14:38:01 +05:30
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