Commit Graph

172 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ravi Dey
c1886b5b13 removed reqd from property setter doc field 2011-07-04 16:53:42 +05:30
nabinhait
a56fc00ea3 resoved conflict in patch, company and renaming tools 2011-07-01 16:32:03 +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