Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,598 Commits 3 Branches 0 Tags 1 GiB
3f9366bb6c
Commit Graph

590 Commits

Author SHA1 Message Date
Anand Doshi
071cdfcb16 apply style settings patch after blog rename 2013-03-12 20:32:13 +05:30
Anand Doshi
2e6806ee6a fixes in blog comments 2013-03-12 20:04:30 +05:30
Anand Doshi
6590316586 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 18:30:56 +05:30
Anand Doshi
6e62940f70 do not reload blog post before rename 2013-03-12 18:28:07 +05:30
Nabin Hait
4fad874356 reload monthly attendance details report 2013-03-12 18:27:25 +05:30
Anand Doshi
c9d229ec9e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 11:06:06 +05:30
Nabin Hait
f7df8b28d2 -m 2013-03-12 10:58:11 +05:30
Anand Doshi
9e4b1e6913 patch fix: published on should be date of creation 2013-03-12 10:44:35 +05:30
Nabin Hait
29ece5f95b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-11 16:41:09 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
Rushabh Mehta
f8cc1a6db6 march.p03 patch fix 2013-03-11 14:36:12 +05:30
Rushabh Mehta
c81cf721a8 march.p03 patch fix 2013-03-11 14:35:25 +05:30
Rushabh Mehta
292479b02d march.p03 patch fix 2013-03-11 14:34:05 +05:30
Rushabh Mehta
b8ec3e7ecb renamed blog to blog_post and refresh issues 2013-03-11 14:29:09 +05:30
Anand Doshi
fd6d2e0d2f added patch to reload docfield and report 2013-03-08 14:27:20 +05:30
Anand Doshi
9e04766ed4 removed report reload patch from patch list 2013-03-07 21:22:57 +05:30
Rushabh Mehta
e73b5e23b9 added patch to update custom css 2013-03-07 18:54:37 +05:30
Anand Doshi
77a6ddaf03 reload report doctype 2013-03-07 13:49:34 +05:30
Nabin Hait
87b9cd5ba1 use get_global_default instead of control panel 2013-03-06 13:15:08 +05:30
Rushabh Mehta
c9e32e6c8d fixed patches for new sync 2013-03-06 11:30:09 +05:30
Rushabh Mehta
0d7c162d2e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-06 11:21:29 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
Anand Doshi
ffd190ff3c fix in patch list 2013-03-05 17:10:33 +05:30
Nabin Hait
a0accd9f67 fixed conflict 2013-03-05 15:58:04 +05:30
Nabin Hait
dae20d87dc refactored upload attendace tool 2013-03-05 15:52:07 +05:30
Rushabh Mehta
5640a69e78 updated sync 2013-03-05 14:12:34 +05:30
Anand Doshi
9bba9ed4d2 fixes in cform 2013-03-04 17:48:31 +05:30
Rushabh Mehta
986d48b424 timesheet patch update 2013-03-04 16:29:48 +05:30
Rushabh Mehta
3e712f212a timesheet patch update 2013-03-04 16:21:54 +05:30
Rushabh Mehta
040e599e99 fixed to timesheet patch 2013-03-04 15:47:42 +05:30
Rushabh Mehta
5423c96bef fixed to timesheet patch 2013-03-04 15:45:46 +05:30
Rushabh Mehta
f934a240ba refactored get_value and added backlink check in 'cancel' 2013-03-04 15:34:45 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
fee642d547 completed Time Log / Time Log Batch 2013-03-01 18:24:52 +05:30
Nabin Hait
95a72a7a4a fixes for material request 2013-03-01 11:07:07 +05:30
Nabin Hait
5657cd775f fixes for material request 2013-03-01 11:05:57 +05:30
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