Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,751 Commits 3 Branches 0 Tags 1 GiB
62aa5d2662
Commit Graph

744 Commits

Author SHA1 Message Date
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
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
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
f541b746d1 fixed conflict while merging master and live 2011-07-28 15:33:42 +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
31a407dc87 fixed module name in previous patch and proper path somewhere 2011-07-28 11:47:45 +05:30
Nabin Hait
d29916b7f5 file_list field hidden in bulk rename tool 2011-07-27 14:26:23 +05:30
Nabin Hait
ce55dcc2c2 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-27 13:13:19 +05:30
Nabin Hait
a74f12a982 salary slip restored 2011-07-27 13:11:39 +05:30
Brahma K
3b1ebe0b24 Patch to give permission to Accounts Manager to Lease Agreement 2011-07-27 13:04:11 +05:30
Brahma K
bcdade51e3 Added Accounts Module Def 2011-07-27 12:11:09 +05:30
Brahma K
0930762231 Added patch for Lease Agreement 2011-07-27 12:03:34 +05:30
Nabin Hait
19159f7658 index patch on hold, will go through push_patch 2011-07-26 16:14:10 +05:30
Nabin Hait
587ac5c941 fixed conflict 2011-07-26 15:46:10 +05:30
Rushabh Mehta
9b8fad2baa support ticket patch 2011-07-25 14:45:42 +05:30
Rushabh Mehta
933893f20a support ticket patch 2011-07-25 14:42:35 +05:30
Rushabh Mehta
b7186d46d2 support ticket patch 2011-07-25 14:37:48 +05:30
Rushabh Mehta
391aa028e6 cleanups to support email (dirty) 2011-07-25 14:07:50 +05:30
nabinhait
de9826cba1 Reload Rename and Bulk Rename Tool and link in setup module 2011-07-20 18:02:59 +05:30
nabinhait
23760e755d export_to_files function removed from index_patch, it was only for local 2011-07-20 10:46:21 +05:30
nabinhait
1458af0691 Index patch released and doctype updated based on index 2011-07-20 10:31:19 +05:30
nabinhait
e6526369f3 Accounts Payable report improved: some query written outside the for-loop 
Supplier: supplier_status field has been deleted, not used by anyone except janak
index patch modified
 2011-07-19 18:09:26 +05:30
Rushabh Mehta
61790801bb patch to update new billing page 2011-07-17 10:52:47 +05:30
Ravi Dey
9dd0c0b7a1 Salary Slip docfield update 2011-07-13 18:08:38 +05:30
nabinhait
54b0e7d8f7 test_field will be deleted from customer 2011-07-13 16:40:03 +05:30
Nabin Hait
e079a6eb26 reload stock entry 2011-07-10 14:15:52 +05:30
Nabin Hait
2acac4b9d2 function name corrected in stock entry 'get current stock' button 2011-07-10 13:52:05 +05:30
Nabin Hait
025d0620fe Merge branch 'master' of github.com:webnotes/erpnext 2011-07-10 13:50:00 +05:30
Nabin Hait
fe11736995 patch for indexing 2011-07-10 12:01:19 +05:30
Ravi Dey
8491384946 latter_head docfield delete 2011-07-08 13:46:09 +05:30
Ravi Dey
fac96e19f5 leave_application letter head fix 2011-07-08 13:38:16 +05:30
nabinhait
63cf2b91e7 reload series detail 2011-07-08 13:30:46 +05:30
Anand Doshi
52b1d5aac8 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch.py
 2011-07-07 18:41:12 +05:30
Anand Doshi
56ab7e4bb3 Added patch to remove feed entries starting with "New" 2011-07-07 18:37:58 +05:30
Ravi Dey
cfc5dff4b4 reload doc 2011-07-07 16:48:54 +05:30
Ravi Dey
8982272645 profile settings fix 2011-07-07 15:52:35 +05:30
Ravi Dey
7a6211d67c profile settings fix 2011-07-07 15:49:24 +05:30
nabinhait
eb31540259 role added in module home 2011-07-06 13:03:31 +05:30
nabinhait
22f7edda94 double feed deleted 2011-07-06 12:45:02 +05:30
nabinhait
fccbb0948a fixed error in patches 2011-07-06 12:23:27 +05:30
nabinhait
d54ec52983 fixed error in patches 2011-07-06 12:20:21 +05:30
nabinhait
4c38fbb211 fixed error in patches 2011-07-06 10:36:53 +05:30
nabinhait
33ed7091b8 fixed error in patches 2011-07-06 10:33:31 +05:30
nabinhait
01389822a6 fixed error in patches 2011-07-06 10:30:19 +05:30
nabinhait
6727a9cbb6 fixed error in patches 2011-07-06 10:27:35 +05:30
nabinhait
5773efdc02 fixed error in patches 2011-07-06 10:23:03 +05:30
nabinhait
4bb8bf4b75 clear sessions of all users after running patch of erpnext restructure 2011-07-06 10:11:11 +05:30
nabinhait
5deab24401 fixed conflict while merging with webnotes repo 2011-07-06 09:23:02 +05:30
nabinhait
7f339e0a6d removed landed cost wizard link 2011-07-05 15:43:17 +05:30
nabinhait
1bd56b1c08 removed get_tips() from js file 2011-07-05 14:41:36 +05:30
nabinhait
c297df5b16 Removed Tips Common from each js file 2011-07-05 10:54:05 +05:30
Ravi Dey
c1886b5b13 removed reqd from property setter doc field 2011-07-04 16:53:42 +05:30
nabinhait
ca552d86fb fixed dependency issues 2011-07-04 14:40:51 +05:30
nabinhait
41534b355e fixed dependency issues 2011-07-04 14:27:33 +05:30
nabinhait
b2041c4799 fixed dependency issues 2011-07-04 13:51:08 +05:30
nabinhait
301e3c3cdd fixed dependency issues 2011-07-04 13:47:28 +05:30
nabinhait
951f6d7806 fixed dependency issues 2011-07-04 13:46:32 +05:30
nabinhait
059a0517f7 fixed dependency issues 2011-07-04 13:44:05 +05:30
nabinhait
5de1b7ec4b fixed dependency issues 2011-07-04 13:41:42 +05:30
nabinhait
0d7056b8d2 fixed dependency issues 2011-07-04 13:29:01 +05:30
nabinhait
3eb03b2635 fixed dependency issues 2011-07-04 13:21:49 +05:30
nabinhait
68c6e00b52 removed check_approving_authority fn and Approval Structure dt bcoz it was not using anywhere 2011-07-04 13:18:15 +05:30
nabinhait
9ce064d2b6 fixed issues 2011-07-04 13:10:42 +05:30
nabinhait
bcfd01489b fixed issues 2011-07-04 13:08:39 +05:30
nabinhait
cbbcdb58cf fixed issues 2011-07-04 12:49:56 +05:30
nabinhait
ece5f93616 fixed issues 2011-07-04 12:49:22 +05:30
nabinhait
d7e69f9412 fixed issues 2011-07-04 12:46:38 +05:30
nabinhait
d72a201711 fixed issues 2011-07-04 12:39:52 +05:30
nabinhait
476e686ba6 fixed issues 2011-07-04 12:39:20 +05:30
nabinhait
8b941c1284 fixed issues 2011-07-04 12:37:33 +05:30
nabinhait
be557f0f9f fixed issues 2011-07-04 12:34:49 +05:30
nabinhait
a518a526ac fixed issues 2011-07-04 12:33:37 +05:30
nabinhait
d6660c0a06 fixed issues 2011-07-04 12:32:41 +05:30
nabinhait
82567b01ec fixed issues 2011-07-04 12:31:16 +05:30
nabinhait
cc04b7913a fixed issues 2011-07-04 12:30:18 +05:30
nabinhait
46be449f9c fixed issues 2011-07-04 12:29:24 +05:30
nabinhait
cb41791af8 fixed issues 2011-07-04 12:26:15 +05:30
nabinhait
cea316ef94 fixed issues 2011-07-04 12:23:28 +05:30
nabinhait
d90bba9346 delete mapper b4 doctype 2011-07-04 12:22:03 +05:30
nabinhait
b0c3bfc454 delete mapper b4 doctype 2011-07-04 12:18:24 +05:30
nabinhait
d4403c3ec8 utilities module exported and company, rename tool txt updated 2011-07-01 19:26:59 +05:30
nabinhait
a42f54a602 deleted 2 more reports 2011-07-01 16:54:01 +05:30
nabinhait
dfb34deca0 fixed proper module 2011-07-01 16:49:15 +05:30
nabinhait
a56fc00ea3 resoved conflict in patch, company and renaming tools 2011-07-01 16:32:03 +05:30
nabinhait
963f36b969 all txt files updated due to module renaming/merging 2011-07-01 15:47:42 +05:30
Ravi Dey
627d01bd4b reload company txt 2011-07-01 14:05:43 +05:30
Ravi Dey
94a332a8ab Rename Tool updates 2011-07-01 13:50:34 +05:30
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30
Rushabh Mehta
c71eeb6c71 patch fix 2011-06-30 08:28:36 +05:30
Ravi Dey
79c2865048 link:company fix 2011-06-29 18:55:19 +05:30
Ravi Dey
c674e43885 company reload_doc delete docfield trashcompany button 2011-06-29 18:15:12 +05:30
Ravi Dey
27c5b4075f company reload doc 2011-06-29 18:05:18 +05:30
Ravi Dey
d75aef0a5d fix 2011-06-28 19:43:23 +05:30
Ravi Dey
4c65119c6e Journal Voucher Company Currency Fix 2011-06-28 19:36:18 +05:30
nabinhait
b393000fc7 no copy for naming_series fld 2011-06-28 16:50:38 +05:30
nabinhait
78f5bf6498 fixed conflict 2011-06-28 16:21:58 +05:30
nabinhait
690c697fab fixed delivery/billing status issue and patched for old records 2011-06-28 14:42:07 +05:30
Anand Doshi
b74eec8e93 Removed sales_register1 and sales_register2 folders as they are not required anymore 2011-06-28 13:42:08 +05:30
Ravi Dey
8d3f4b6fd8 removed permission match:owner from Employee DocType 2011-06-27 12:48:56 +05:30
Ravi Dey
48671df12c HR Module tabDocField company patch 2011-06-27 12:03:36 +05:30
Ravi Dey
74c9c4d476 Added Company in HR Module 2011-06-27 11:26:39 +05:30
Ravi Dey
89bd9d38a3 relaod doc 2011-06-24 16:22:48 +05:30
Ravi Dey
7177133af4 reload 2011-06-24 16:15:37 +05:30
Ravi Dey
35c4d575bc reload 2011-06-24 16:07:34 +05:30
Ravi Dey
26c160f951 reload 2011-06-24 15:53:51 +05:30
Ravi Dey
0793600ea7 reload_doc support ticket 2011-06-24 15:30:27 +05:30
Ravi Dey
0b6c565c15 Sales Order - delivery_status & billing_status Options updated 2011-06-24 14:44:21 +05:30
Rushabh Mehta
3e03743250 setup fixes 2011-06-23 22:47:04 +05:30
Ravi Dey
560ee3d18d removed address from tabaccounts 2011-06-23 13:03:24 +05:30
nabinhait
aeee6bae4a last update 2011-06-22 18:25:29 +05:30
Rushabh Mehta
64b6c2c80d added rename tool 2011-06-22 16:38:11 +05:30
Anand Doshi
f14abfb0c7 Added patch to add Module Def 'Home' where it does not exist 2011-06-22 12:24:40 +05:30
Anand Doshi
b9f7e39bb4 Modified patch.py - added patch to add module def 'Home' 2011-06-22 12:11:47 +05:30
nabinhait
33dee78388 search flds changed in quotation 2011-06-21 17:17:39 +05:30
nabinhait
5559ed9269 subject changed in payable voucher 2011-06-21 17:04:22 +05:30
nabinhait
8b849fedfe no_copy for percentage fields in so, dn, po, pr 2011-06-21 15:09:55 +05:30
nabinhait
58f01021b9 no_copy for percentage fields in so, dn, po, pr 2011-06-21 15:05:43 +05:30
nabinhait
6150e65f71 reload itemwise sales/purchase register: added new columns 2011-06-20 16:34:48 +05:30
nabinhait
4b59beace1 reload itemwise sales/purchase register: added new columns 2011-06-20 14:07:04 +05:30
nabinhait
f7d8000374 filter and search fields added in support ticket: raised_by, subject 2011-06-20 13:51:26 +05:30
nabinhait
746d29bf92 corrected jv docstatus 2011-06-16 12:41:39 +05:30
nabinhait
5f4ea817e9 synced child table docstatus with parent 2011-06-15 15:17:57 +05:30
nabinhait
2262f2a18f updated status based on docstatus 2011-06-15 14:40:29 +05:30
nabinhait
e72212152d updated status based on docstatus 2011-06-15 14:39:31 +05:30
nabinhait
ca8f19beb7 fixed next patch no for last patch' 2011-06-15 13:15:09 +05:30
nabinhait
75e67cfcdb in_words fld added in form 16a 2011-06-15 13:13:27 +05:30
nabinhait
c43ece79a8 recovered docstatus 2011-06-15 11:55:32 +05:30
nabinhait
b7789a5044 updated update_feed method in init file of home 2011-06-14 17:33:12 +05:30
nabinhait
e0250fbab6 Merge branch 'master' of git@github.com:webnotes/erpnext 2011-06-14 15:05:20 +05:30
Rushabh Mehta
13f61552dc patch to remove my_company and event_updates 2011-06-09 17:32:32 +05:30
Pratik Vyas
c1e6e4c752 Sourced wnframework-modules from Google Code as erpnext 2011-06-08 14:37:15 +05:30