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

704 Commits

Author SHA1 Message Date
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Anand Doshi
a8caa5edef patch to delete warehouses with docstatus = 2 2013-02-28 16:45:37 +05:30
Rushabh Mehta
ed19666e1b added Time Log 2013-02-26 16:36:41 +05:30
Nabin Hait
a4d8e6b177 reload sales invoice print formats 2013-02-26 11:15:34 +05:30
Nabin Hait
6054ae2bec delete gross profit based on search criteria 2013-02-26 10:51:24 +05:30
Anand Doshi
b60aef5595 added report button in todo page 2013-02-25 15:22:20 +05:30
Anand Doshi
7bc7aefcbb reload report before running patches 2013-02-25 13:12:37 +05:30
Anand Doshi
14ab448019 reload report before running patches 2013-02-25 13:11:38 +05:30
Rushabh Mehta
22681df120 report_name fix 2013-02-23 17:13:44 +05:30
Anand Doshi
2ea8be9989 patch to set report type of Report 2013-02-22 18:51:46 +05:30
Nabin Hait
1bebb4a24f fixed conflict 2013-02-22 18:02:15 +05:30
Nabin Hait
ad8a46c504 repost reserved qty for all for all items 2013-02-22 17:58:54 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30
Rushabh Mehta
da3a42fc51 added web clear patch 2013-02-21 14:42:34 +05:30
Anand Doshi
a341af182d reload mappers related to Material Request 2013-02-21 13:38:58 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Anand Doshi
c1db0a6220 fixes in patches 2013-02-20 16:08:21 +05:30
Nabin Hait
704d5f0f4a delete service order/quotation doctype 2013-02-19 16:23:21 +05:30
Nabin Hait
452de98a6c fixes in patch_list 2013-02-19 16:18:00 +05:30
Nabin Hait
f2d68e2fd5 display customer name instead of customer id in quotation print format 2013-02-19 15:55:11 +05:30
Rushabh Mehta
5c6216f0bd merge 2013-02-19 15:36:38 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Nabin Hait
66ea0861ff fixes in gle_floating_point_issue patch 2013-02-19 15:13:23 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Anand Doshi
78352d1e71 leave application permissions patch - removed permlevel 2 2013-02-18 17:09:11 +05:30
Rushabh Mehta
9c880da381 removed old doctypes 2013-02-18 14:28:34 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
fe62769078 reload search criteria in material request patch 2013-02-18 13:51:41 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Anand Doshi
a3acd57654 email digest patch 2013-02-16 18:45:09 +05:30
Anand Doshi
2794736d5d email digest patch 2013-02-16 18:44:40 +05:30
Anand Doshi
96bebb44b0 patch to enable calendar events and todo list in email digest if email digest is enabled 2013-02-16 15:09:34 +05:30
Anand Doshi
32faa57692 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2013-02-16 11:09:37 +05:30
Anand Doshi
0cfdeec218 added event patch in patch list 2013-02-16 11:08:55 +05:30
Rushabh Mehta
bf4ef36341 removed calendar and fix 2013-02-16 10:44:51 +05:30
Anand Doshi
9cde1bbb0e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-15 18:29:22 +05:30
Anand Doshi
33839d9b8f fix in patches 2013-02-15 18:27:12 +05:30
Rushabh Mehta
b496756696 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-14 17:35:32 +05:30
Rushabh Mehta
5eb37647cf added new calendar and renamed holiday block list 2013-02-14 17:34:51 +05:30
Anand Doshi
e74a1f2b85 fixes in outstanding amount calculation on cancellation of payment entry 2013-02-14 13:38:12 +05:30
Anand Doshi
86af352bf3 fixes in parentfield of userrole 2013-02-13 18:04:21 +05:30
Nabin Hait
362455e749 fix outstanding and floating point issue in gl entry 2013-02-13 15:50:39 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Nabin Hait
7e0b9a4212 fixes in patch 2013-02-07 10:58:15 +05:30
Nabin Hait
79b8ca8f68 fixes in patch 2013-02-07 10:55:48 +05:30
Rushabh Mehta
981577050c added company in leave application and global holiday block list 2013-02-07 09:09:14 +05:30
Anand Doshi
6270869374 fix in remove account utils folder patch 2013-02-06 15:42:41 +05:30
Anand Doshi
22807a61cd patch to remove accounts/utils folder and removed unrequired test cases related to unused tax controller 2013-02-06 15:41:32 +05:30
Nabin Hait
c2fa4956f9 fixed issue 2013-02-05 16:16:01 +05:30
Nabin Hait
7bdf27b19c new feature: validation on account negative balance 2013-02-05 15:52:46 +05:30
Rushabh Mehta
e76adfcfdd deprecate gl_mapper patch 2013-02-02 12:50:14 +05:30
Rushabh Mehta
314d7ca914 deprecate gl_mapper patch 2013-02-02 12:45:07 +05:30
Nabin Hait
c06e29ddbc removed sales order pending items report 2013-02-01 18:35:35 +05:30
Nabin Hait
c40a64a634 patch for resetting payment reconciliation values 2013-02-01 14:23:22 +05:30
Nabin Hait
259a55676b fixes in remove_gl_mapper patch 2013-02-01 12:38:15 +05:30
Nabin Hait
ce4178b180 permission reloaded for bom replace tool 2013-02-01 12:14:45 +05:30
Nabin Hait
3210cc99bd Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 10:48:52 +05:30
Nabin Hait
a0d6b3443e removed patch of jan_mar period 2013-01-29 10:48:33 +05:30
Rushabh Mehta
6abb2e67e9 added tabsessions_to_myisam 2013-01-28 17:00:59 +05:30
Rushabh Mehta
d4ae9861f4 added tabsessions_to_myisam 2013-01-28 16:56:32 +05:30
Rushabh Mehta
fe99c293a9 reset modified dates 2013-01-28 15:30:02 +05:30
Nabin Hait
163bebb670 fixed conflict 2013-01-25 17:42:25 +05:30
Nabin Hait
e37b344e54 reload print formats patch 2013-01-25 17:38:48 +05:30
Rushabh Mehta
987159f78f added patch 2013-01-25 15:12:04 +05:30
Rushabh Mehta
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Rushabh Mehta
9756c9537c moved patch 2013-01-23 19:52:04 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Nabin Hait
7c833af873 removed unwanted permission 2013-01-23 16:10:15 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Nabin Hait
a8454e2764 removed unwanted permission 2013-01-23 16:01:35 +05:30
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Anand Doshi
468bb31d88 fixes in clear web cache patch 2013-01-22 12:48:22 +05:30
Anand Doshi
683cdc0db8 sync before running clear web cache patch 2013-01-22 12:43:49 +05:30
Nabin Hait
f0881a9e92 updated fraction for USD 2013-01-22 11:21:55 +05:30
Rushabh Mehta
6dd9d4583d updated payment receipt voucher format 2013-01-21 18:44:43 +05:30
Rushabh Mehta
1a6220a332 Merge branch 'master' into edge 2013-01-21 10:33:22 +05:30
Rushabh Mehta
d9cfee58a1 added patch 2013-01-21 10:32:49 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Rushabh Mehta
3ab6c5fca9 appraisal, don't validate points for self-appraisal 2013-01-19 10:54:03 +05:30
Anand Doshi
8b940ee451 fixes after merge 2013-01-18 13:07:02 +05:30
Anand Doshi
2865571cb9 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	patches/patch_list.py
 2013-01-18 12:32:00 +05:30
Nabin Hait
a642ae14eb updated gl mapper for tds entry 2013-01-18 10:49:39 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
 2013-01-17 20:31:41 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Rushabh Mehta
f0b7972102 consolidated permission checking and added patch 2013-01-14 17:02:13 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +05:30
Rushabh Mehta
be9ef4ac89 added code to update timestamps in Task, Customer Issue and Support Ticket 2013-01-14 15:48:00 +05:30
Anand Doshi
39a3c03b62 if not a valid csv file, ignore it in stock reconciliation patch 2013-01-14 15:26:51 +05:30
Anand Doshi
b1cf2119e9 fixes in reconciliation patch 2013-01-14 15:12:44 +05:30
Anand Doshi
1649c60b0b fix in reconciliation patch 2013-01-14 14:58:55 +05:30
Anand Doshi
34ad33bfcb fix in reconciliation patch 2013-01-14 14:57:16 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
 2013-01-14 13:28:31 +05:30
Anand Doshi
279e08e523 Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-14 11:17:54 +05:30
Anand Doshi
2ab31ab2d3 updated stock reconciliation patch 2013-01-14 11:17:34 +05:30
Rushabh Mehta
7d033d09dc set default report permission based on read 2013-01-13 14:34:38 +05:30
Nabin Hait
ac53b11969 stock reco fixes with testcases 2013-01-11 19:25:46 +05:30
Rushabh Mehta
b116b3243d report permission merge 2013-01-11 15:05:03 +05:30
Anand Doshi
1b531866e0 fixes in stock reco, test case for serial no stock entry 2013-01-10 19:29:51 +05:30
Rushabh Mehta
1d2710d54d added 'report' permission 2013-01-10 17:11:48 +05:30
Nabin Hait
3e28f8f54b Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco 2013-01-09 15:23:43 +05:30
Nabin Hait
26d46556a4 first cut error fixes 2013-01-09 15:23:05 +05:30
Anand Doshi
435fd1426b Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-09 11:25:34 +05:30
Anand Doshi
6f88c6680e patch to fix existing holiday lists 2013-01-08 19:36:33 +05:30
Nabin Hait
902e8609e5 stock reco and utility function of stocks 2013-01-08 18:29:24 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +05:30
Nabin Hait
0b65700ef8 serial No Status report 2013-01-04 12:06:54 +05:30
Rushabh Mehta
7590650a73 patch_list merge 2013-01-02 16:46:01 +05:30
Rushabh Mehta
3a509befdb Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-02 16:43:18 +05:30
Rushabh Mehta
1a76f67116 fixes to valid elements 2013-01-02 16:36:30 +05:30
Anand Doshi
55bf3a3357 Merge branch 'master' into edge 2013-01-02 16:24:41 +05:30
Anand Doshi
5ee3ec18f6 deprecated stock search criteria patches 2013-01-02 16:08:27 +05:30
Rushabh Mehta
9b1ddfd9ef merge 2013-01-02 15:32:29 +05:30
Anand Doshi
22c9497833 Merge branch 'edge' of github.com:webnotes/erpnext into edge 
Conflicts:
	patches/patch_list.py
 2013-01-02 14:02:36 +05:30
Anand Doshi
946442d7a5 added new item-wise pricelist report and deprecated search criteria of Stock module 2013-01-02 13:51:29 +05:30
Rushabh Mehta
78a0c20305 new permission manager 2013-01-01 19:51:35 +05:30
Rushabh Mehta
b4c54e55a3 update print width 2012-12-28 10:35:44 +05:30
Anand Doshi
d9f44e2955 reload product settings in address title patch 2012-12-27 19:11:04 +05:30
Anand Doshi
a773e5251b reload address in address title patch 2012-12-27 18:10:45 +05:30
Anand Doshi
9ea03f371a Merged conflict 2012-12-27 18:07:29 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Anand Doshi
98d588cd7d deprecated form 16 print format 2012-12-25 18:53:25 +05:30
Anand Doshi
b7f0cbf914 fix in production order patch 2012-12-25 18:43:15 +05:30
Rushabh Mehta
7285a720a0 added patch to rebuild item group tree 2012-12-25 18:24:35 +05:30
Rushabh Mehta
f50c012808 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 15:09:58 +05:30
Rushabh Mehta
7837d80716 fixes to website, item (added table for cross listing), modules_setup and form_header 2012-12-25 15:09:14 +05:30
Nabin Hait
ed92841868 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:47:57 +05:30
Nabin Hait
68431e9cb3 restored 'use multi level bom' in production order 2012-12-24 18:47:18 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Anand Doshi
acc36be87f patch to fix deleted contact and addresses 2012-12-21 20:57:03 +05:30
Anand Doshi
2353b90e7a fixed production order patch 2012-12-20 17:08:57 +05:30
Anand Doshi
69f855ebfb changed production to manufacturing in reload doc 2012-12-20 17:06:44 +05:30
Anand Doshi
8ac9e687bd fix in patch 2012-12-20 16:53:33 +05:30
Nabin Hait
2880a55a01 production order naming series patch 2012-12-20 16:00:27 +05:30
Anand Doshi
1107d50a59 reload stock entry before running custom fields patch 2012-12-20 12:42:16 +05:30
Anand Doshi
879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production 
Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py
 2012-12-19 22:28:00 +05:30
Rushabh Mehta
40ca2c681a removed next_contact in quotation, fixed regex to convert relative links to absolute 2012-12-19 12:46:03 +05:30
Nabin Hait
1a6a94b760 stock entry cleanup 2012-12-18 18:42:02 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
bf52eb08a6 stock entry cleanup patch 2012-12-18 10:29:06 +05:30
Anand Doshi
56359f06f6 patch to clear web cache 2012-12-17 16:14:26 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Nabin Hait
3adaf607f0 bom cleanup 2012-12-14 14:25:51 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Anand Doshi
72d2a627f5 replace createLocal in Client script only 2012-12-13 19:35:32 +05:30
Nabin Hait
d5d54c24b5 fixed conflict 2012-12-13 18:39:08 +05:30
Nabin Hait
9db3b6dc71 replace createlocal 2012-12-13 18:36:49 +05:30
Rushabh Mehta
8a4ceb98c2 remove hyphen from file_list 2012-12-13 15:24:33 +05:30
Rushabh Mehta
686022f777 fixes to recent patch and removed company_control, home_control, webforms, wip_monitor 2012-12-12 15:25:51 +05:30
Rushabh Mehta
73ccac4ccb moved recent to memcache 2012-12-12 14:42:17 +05:30
Nabin Hait
c52edd1e59 production cleanup 2012-12-11 18:38:58 +05:30
Anand Doshi
d3e04c3185 fixed syntax error in patch list 2012-12-11 15:25:06 +05:30
Anand Doshi
038d7aae9b Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:22:40 +05:30
Nabin Hait
559c16fabb production cleanup patch 2012-12-11 15:18:51 +05:30
Nabin Hait
52a70832d6 Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:15:04 +05:30
Nabin Hait
bfcc16af17 rebuilt exploded bom items patch 2012-12-11 15:14:30 +05:30
Anand Doshi
c551964d5d Merge branch 'master' into production 
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
 2012-12-11 14:59:19 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
3519d7de01 fixed production cleanup patch 2012-12-10 19:37:49 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Nabin Hait
1ea0944586 rename production to manufacturing 2012-12-10 19:02:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Nabin Hait
822022082d removed BOM Control and Production Control 2012-12-10 18:13:34 +05:30
Rushabh Mehta
aaa36874bc patch fix 2012-12-06 16:49:18 +05:30
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