Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,496 Commits 3 Branches 0 Tags 1 GiB
7c833af873
Commit Graph

386 Commits

Author SHA1 Message Date
Rushabh Mehta
95018866de sitemap / rss: path fix 2012-12-06 16:47:27 +05:30
Rushabh Mehta
87192da372 website updates and leave balance bugfix 2012-12-06 16:45:00 +05:30
Nabin Hait
27184e0e05 default filters set in debtors and creditors ledger 2012-12-06 11:46:41 +05:30
Rushabh Mehta
ed29af98a9 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:06:07 +05:30
Rushabh Mehta
38f19104d8 merge 2012-12-05 16:49:58 +05:30
Nabin Hait
598dd99144 repost projected qty 2012-12-05 15:58:57 +05:30
Rushabh Mehta
ba9e034069 added patch for expense and leave 2012-12-05 15:51:17 +05:30
Nabin Hait
ec83e0abee repost ordered qty 2012-12-05 15:51:05 +05:30
Rushabh Mehta
071dc7f164 added patch for expense and leave 2012-12-05 15:45:48 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Nabin Hait
e2639197de deprecate tds patch 2012-12-05 10:18:49 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Anand Doshi
9356ac7ef5 sync communication before patch 2012-12-03 17:35:17 +05:30
Nabin Hait
4bbaddd57d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-01 16:33:35 +05:30
Anand Doshi
2f1ede1a5f changed communication module to core in patch 2012-11-30 20:39:55 +05:30
Nabin Hait
0d2fddbc06 Patch for fixing floating point issue in gl entry 2012-11-30 19:40:52 +05:30
Nabin Hait
995b5c617b Patch for fixing floating point issue in gl entry 2012-11-30 19:40:37 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Anand Doshi
746e229026 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-30 15:15:16 +05:30
Nabin Hait
3e0612db83 fixed conflict 2012-11-30 15:02:20 +05:30
Nabin Hait
9d4e5569c8 Patch for production fieldlevel changes 2012-11-30 14:37:17 +05:30
Rushabh Mehta
71d6a0ce1d cleaned up leave application 2012-11-30 12:41:46 +05:30
Rushabh Mehta
86adcaa113 fixed employee permissions, fixed bug in import_merge of timestamps 2012-11-30 12:02:00 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Nabin Hait
0af1959a63 remove basic info patch not required 2012-11-28 16:56:50 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Rushabh Mehta
af45422668 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2012-11-28 15:28:04 +05:30
Nabin Hait
ee48ef747c Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 15:26:33 +05:30
Nabin Hait
1da6e1b864 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 15:24:11 +05:30
Rushabh Mehta
40d73ed9db profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:21:04 +05:30
Rushabh Mehta
bd919caa9b profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:19:51 +05:30
Nabin Hait
dcc4ff5ca3 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 14:12:49 +05:30
Nabin Hait
d9eb526b27 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 12:40:52 +05:30
Anand Doshi
55ffa7e14d Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2012-11-27 18:56:32 +05:30
Anand Doshi
a22bd841eb patch to update cancelled BOMs 2012-11-27 18:55:17 +05:30
Rushabh Mehta
1a0c61711c refactored communication and added to Lead / Contact 2012-11-27 18:48:43 +05:30
Rushabh Mehta
33c8d0d3e2 refactored communication and added to Lead / Contact 2012-11-27 18:45:21 +05:30
Rushabh Mehta
e1a433812f refactored communication and added to Lead / Contact 2012-11-27 18:41:42 +05:30
Rushabh Mehta
80127bfb6a refactored communication and added to Lead / Contact 2012-11-27 18:41:35 +05:30
Rushabh Mehta
21df1479a7 reload_doc can now do doctypes, update patch 2012-11-26 15:18:36 +05:30
Rushabh Mehta
bf09c672cd support ticket response deprecated, moved to communication 2012-11-24 15:26:48 +05:30
Anand Doshi
b5dcaecc37 fix in remove old unbilled items report 2012-11-23 18:14:57 +05:30
Rushabh Mehta
7d665818b5 moved delivered_items_to_be_billed from stock to accounts 2012-11-23 17:56:30 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
01f689bfe5 change cancelled profiles to disabled and show in profile list 2012-11-22 19:22:38 +05:30
Rushabh Mehta
45fd518ed0 fix appraisal patch for rerun 2012-11-17 14:31:06 +05:30
Rushabh Mehta
04b9579b24 appraisal cleanup, removed un-necessary logic 2012-11-16 10:37:14 +05:30
Rushabh Mehta
84b638f49a fix to customer issue, desktop 2012-11-15 16:58:36 +05:30
Rushabh Mehta
86945fe178 fix to customer issue, desktop 2012-11-15 16:58:27 +05:30
Rushabh Mehta
85df835db2 hotfix for desktop icon + updates to assign to and patch 2012-11-15 16:36:42 +05:30
Rushabh Mehta
2a44bf8245 customer_issue: moved allocated to assigned 2012-11-15 15:11:15 +05:30
Rushabh Mehta
09a53376bb query-report patch, now report manager can save, but must give a new name if standard report 2012-11-12 12:53:44 +05:30
Rushabh Mehta
13a0e4693e added the missing patch 2012-11-12 12:12:24 +05:30
Rushabh Mehta
fced017aad renamed employee leave balance report 2012-11-12 12:07:28 +05:30
Nabin Hait
9c6ef556ca delete duplicate itemwise sales register 2012-11-06 17:41:21 +05:30
Nabin Hait
6885bb2365 delete duplicate itemwise sales register 2012-11-06 17:40:18 +05:30
Nabin Hait
03d5d6dd36 delete duplicate itemwise sales register 2012-11-06 17:39:39 +05:30
Nabin Hait
3073068506 reload stock ledger report 2012-11-06 10:42:47 +05:30
Anand Doshi
35535e9931 fix in custom field patch 2012-11-01 12:20:13 +05:30
Anand Doshi
7a617b83fb fix in insert after of custom field 2012-11-01 12:11:16 +05:30
Nabin Hait
2e99bd58bd Merge branch 'master' of github.com:webnotes/erpnext 2012-10-26 14:43:15 +05:30
Nabin Hait
981d48339a Warehouse merging feature and update_bin cleanup 2012-10-26 14:42:48 +05:30
Anand Doshi
c4bcbea927 added delete permissions for custom script and added autoname method 2012-10-26 13:23:51 +05:30
Nabin Hait
fedc772058 fix cancelled gl entries :patch 2012-10-10 15:54:46 +05:30
Nabin Hait
27b1c30735 fix cancelled gl entries :patch 2012-10-10 15:34:38 +05:30
Nabin Hait
cca0b4aab7 error fixed in financial analytics and financial statement 2012-10-05 18:33:22 +05:30
Anand Doshi
10667521da fix in setup control and patch to fix existing docstatus problem 2012-10-05 15:12:32 +05:30
Anand Doshi
ae09b37a08 fix in setup control and patch to fix existing docstatus problem 2012-10-05 15:10:40 +05:30
Nabin Hait
68b8a90ee0 removed old triaL balance report 2012-10-05 14:47:46 +05:30
Nabin Hait
ee442dc104 update account property as per root 2012-10-05 14:32:36 +05:30
Nabin Hait
671f16d312 customer addresses and contacts report (query) 2012-10-04 18:38:11 +05:30
Nabin Hait
f9037a69f8 customer addresses and contacts report (query) 2012-10-04 18:37:53 +05:30
Nabin Hait
3e32040ae0 customer addresses and contacts report (query) 2012-10-04 18:35:17 +05:30
Nabin Hait
30f7da49c8 patch list updated 2012-10-03 18:42:57 +05:30
Nabin Hait
e019aa54b0 fix wrong vouchers due to Valuation charges 2012-10-03 18:41:28 +05:30
Nabin Hait
5e66ce121b fix wrong vouchers due to Valuation charges 2012-10-03 16:58:24 +05:30
Nabin Hait
c09de35ba5 fix wrong vouchers due to Valuation charges 2012-10-03 16:34:53 +05:30
Nabin Hait
1e79441457 fix wrong vouchers due to Valuation charges 2012-10-03 16:31:45 +05:30
Nabin Hait
8a5be5b747 fix wrong vouchers due to Valuation charges 2012-10-03 16:19:28 +05:30
Nabin Hait
92e7242808 find wrong vouchers 2012-10-03 14:53:08 +05:30
Nabin Hait
f84237642e find wrong vouchers 2012-10-03 14:51:42 +05:30
Nabin Hait
1f33e46e34 find wrong vouchers 2012-10-03 14:47:41 +05:30
Nabin Hait
f3a7f347c2 find wrong vouchers 2012-10-03 14:45:45 +05:30
Nabin Hait
3af321fa59 find wrong vouchers 2012-10-03 14:41:36 +05:30
Nabin Hait
bd037ab540 find wrong vouchers 2012-10-03 13:46:45 +05:30
Nabin Hait
92dd87f0fe debit-credit tolerance increased to .005 2012-10-03 13:33:13 +05:30
Nabin Hait
3fd3b8e7fe Find wrong vouchers (temp) 2012-10-03 12:08:01 +05:30
Nabin Hait
cd2f40ffef reload purchase invoice gl mapper 2012-10-03 11:17:37 +05:30
Nabin Hait
3820096714 Update patches/september_2012/plot_patch.py 2012-10-02 16:17:00 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
 2012-10-02 14:35:20 +05:30
Anand Doshi
3245a15cb7 added future imports 2012-10-01 11:35:49 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
9e9996dbc9 fixed patch after merge 2012-09-28 12:41:18 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-09-26 12:24:28 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Nabin Hait
0275149074 resolved conflict in patch 2011-09-02 17:48:05 +05:30
Nabin Hait
8c2618c27a delete salary control panel and reload salary slip 2011-09-02 17:43:32 +05:30
Brahma K
779cfafa41 modified general ledger to add opening balance 2011-09-02 16:55:03 +05:30
Nabin Hait
c63e62e883 reload salary manager 2011-09-02 14:44:15 +05:30
Nabin Hait
883604d368 resolved conflict in patch 2011-09-02 13:14:55 +05:30
Nabin Hait
ef75761c42 rerun packing list patch 2011-09-02 13:10:23 +05:30
Brahma K
8e8c4820cb Changes in patch of feature setup and added description against each feature 2011-08-31 15:46:29 +05:30
Brahma K
3c9a6a19e8 Feature Setup changes, related patch, Production Order 'produced_qty' label change, item->ref_rate_details->currency fills with defaut 2011-08-31 12:55:41 +05:30
Nabin Hait
d3b3eb2272 reload dashboard 2011-08-31 11:33:15 +05:30
Nabin Hait
93592132b2 reload dashboard 2011-08-31 11:27:51 +05:30
Nabin Hait
7cb1c57aeb reload delivery note detail and item coustomer details 2011-08-30 17:39:38 +05:30
Nabin Hait
7282fce711 reload delivery note detail and item coustomer details 2011-08-30 17:34:14 +05:30
Rushabh Mehta
9b5852a185 merged live 2011-08-30 16:12:33 +05:30
Rushabh Mehta
910d955779 fixed patch conflict 2011-08-30 16:09:01 +05:30
Rushabh Mehta
96fde953bc profile patch fix 2011-08-29 17:54:27 +05:30
Nabin Hait
19818e2d28 updated patch_no 2011-08-29 16:23:17 +05:30
Nabin Hait
e0410da97f deleted default custom script and moved them to py file 2011-08-29 14:24:19 +05:30
Nabin Hait
1d5cab8745 is_cancelled always no in sle if voucher type = serial no 2011-08-29 13:16:52 +05:30
Nabin Hait
2c03015537 same from and to flds deleted from mapper 2011-08-25 19:41:24 +05:30
Nabin Hait
fc69354c7c updated las_patch no 2011-08-25 16:55:05 +05:30
Rushabh Mehta
9e6e7fa0ef bind an event to form refresh 2011-08-25 16:08:06 +05:30
Rushabh Mehta
33bce67234 fixes to my_company, added secrity settings to restrict by ip, timings 2011-08-25 15:15:25 +05:30
Nabin Hait
cfe8ee89fe Salary Manager Link in HR module and deleted salary slip control panel link 2011-08-25 14:02:01 +05:30
Nabin Hait
7b8f53c193 delete blank row in dn print format 2011-08-24 11:23:34 +05:30
Brahma K
b25ed70775 patch merged 2011-08-23 18:41:25 +05:30
Brahma K
c735d440a3 corrected patch errors to reload add item_customer_detail 2011-08-23 18:38:48 +05:30
Nabin Hait
a0760df889 source, target warehouse is editable for material user, manager in stock entry 2011-08-23 17:29:54 +05:30
Nabin Hait
5198262505 source, target warehouse is editable for material user, manager in stock entry 2011-08-23 17:29:15 +05:30
Nabin Hait
3eb37ce0a6 source, target warehouse is editable for material user, manager in stock entry 2011-08-23 17:21:21 +05:30
Nabin Hait
43b9924fe6 source, target warehouse is editable for material user, manager in stock entry 2011-08-23 17:19:45 +05:30
Brahma K
6716480c7b Corrected patch errors 2011-08-23 16:22:29 +05:30
Brahma K
82187cefe8 Delivery Note added with Packing Details 
1. Pack No
	2. Pack Nett Wt
	3. Pack Gross Wt
	4. Pack Weight UOM
Item is added with
	1. Customer, Code Table
	2. Nett Weight
	3. Gross Weight
	4. Weight UOM
	5. customer_code (for search in quotes etc)
Quotation is added with
	1. item search displays customer code
 2011-08-23 15:42:34 +05:30
Nabin Hait
cddc2fa952 Permission given to material user for production material issue and back 2011-08-22 14:55:32 +05:30
Nabin Hait
9537446aa6 Permission given to material user for production material issue and back flush 2011-08-22 14:40:11 +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
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
Rushabh Mehta
ab5292a008 merged live 2011-08-16 10:04:29 +05:30
Rushabh Mehta
af43b7457c fix to kb 2011-08-11 12:37:11 +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
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
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
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
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
812e71894c permission to system manager in role, dt mapper and print format 2011-08-05 11:10:30 +05:30