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

337 Commits

Author SHA1 Message Date
Nabin Hait
8f78bec5b8 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-17 12:49:36 +05:30
Nabin Hait
f826b93a75 [patch] set conversion factor in pur invoice and repost stock_received_but_not_billed patch 2013-05-17 12:19:50 +05:30
Anand Doshi
6e0e1c8fcc [patches] [fix] fixed an old patch 2013-05-16 15:46:32 +05:30
Anand Doshi
101877276e [patches] [fix] fixed an old patch 2013-05-16 15:45:06 +05:30
Anand Doshi
71c265dee8 [patches] [fix] fix in old patch 2013-05-16 15:42:56 +05:30
Anand Doshi
1d4b5b4ca6 [patches] [fix] removed blog reload 2013-05-16 15:35:08 +05:30
Anand Doshi
0eef6e9e42 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	patches/patch_list.py
 2013-05-15 21:18:27 +05:30
Anand Doshi
21f4ea36b2 [selling] [calculations] server side calculations, test cases and rounding based on currency number format 2013-05-10 18:08:32 +05:30
Nabin Hait
4e1dcfc561 [patch] repost stock for no posting date 2013-05-10 15:17:20 +05:30
Anand Doshi
3f9366bb6c Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	stock/doctype/item/item.txt
 2013-05-06 12:07:30 +05:30
Anand Doshi
0382d5a01d [patch] [fix] reload print format doctype 2013-05-02 16:42:26 +05:30
Anand Doshi
8323b6da45 [patch] [fix] reload print format doctype 2013-05-02 16:41:20 +05:30
Anand Doshi
447008b045 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	patches/april_2013/p05_update_file_data.py
 2013-05-01 14:48:16 +05:30
Anand Doshi
d7ad13a8a7 [price list] [country] specify country for a price list 2013-04-29 19:38:34 +05:30
Anand Doshi
bbc6cfac25 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2013-04-29 15:23:30 +05:30
Anand Doshi
eda17eb20a [patch] [fiel data] new patch p07_update_file_data_2 2013-04-29 15:21:30 +05:30
Nabin Hait
7b596d8d88 fixed conflict 2013-04-29 14:37:38 +05:30
Nabin Hait
345c8fbfa2 [patch] rebuild sales browser 2013-04-29 14:35:11 +05:30
Anand Doshi
e5a36a287f [patch] [file data] patch for custom fields with name file_list 2013-04-29 14:12:27 +05:30
Rushabh Mehta
cdc9e2cd6f [patch] [file data] reset permissions 2013-04-25 11:06:17 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
c54bbc039f [patch] [fix] reload Delivery Note Item before default cost center patch 2013-04-19 16:41:57 +05:30
Anand Doshi
aeef7bd910 [sales taxes and charges] renamed field cost_center_other_charges to cost_center 2013-04-19 16:21:55 +05:30
Anand Doshi
90dad5c5b5 Merge branch 'master' into edge 2013-04-19 11:43:16 +05:30
Anand Doshi
4d705590b7 [patch] [default cost center] defaults starting with colon like :Company should not be a part of database default spec 2013-04-18 16:21:42 +05:30
Nabin Hait
9a2dff6675 packing slip refactored 2013-04-17 17:21:31 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge 
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
 2013-04-16 21:32:06 +05:30
Nabin Hait
8f148249ac reload doctype mapper patch 2013-04-16 12:36:59 +05:30
Anand Doshi
93b638af4d Merge branch 'master' into edge 
Conflicts:
	patches/patch_list.py
 2013-04-10 19:47:46 +05:30
Anand Doshi
e33f827e32 [modules] [fix] patch for storing only hidden modules 2013-04-10 19:33:57 +05:30
Rushabh Mehta
0c1611219e [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:13 +05:30
Nabin Hait
1175227c08 [fixes] commented a patch as it is not needed 2013-04-10 11:48:27 +05:30
Nabin Hait
5639035268 [patch] create chart of accounts if not created 2013-04-09 14:56:30 +05:30
Nabin Hait
ead385e8a4 [patch] create chart of accounts if not created 2013-04-09 14:48:31 +05:30
Nabin Hait
29f3ecd6b1 [patch] create chart of accounts if not created 2013-04-09 14:46:12 +05:30
Nabin Hait
832320dc15 fixed conflict 2013-04-09 11:43:03 +05:30
Nabin Hait
fda2ab1054 fixed conflict 2013-04-09 11:41:20 +05:30
Nabin Hait
d35293de17 updated all role in some pages 2013-04-09 11:39:16 +05:30
Nabin Hait
fdea83ef42 fixed conflict 2013-04-08 13:08:19 +05:30
Nabin Hait
2b61f6142a fixed conflict 2013-04-08 12:44:57 +05:30
Anand Doshi
30bd65a81b [patches] [fix] reload docperm 2013-04-07 10:19:18 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Rushabh Mehta
cc86ec8642 merge 2013-04-03 16:38:20 +05:30
Nabin Hait
5c1d3c5a8b [New Script Report] added report daily time log summary 2013-04-03 15:44:19 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
5bbe063222 Merge branch 'master' into edge 2013-04-03 10:42:12 +05:30
Rushabh Mehta
c5ddb85d39 [patch] [fix] added reload print format 2013-04-03 10:06:54 +05:30
Rushabh Mehta
c0ad4a2229 [patch] [fix] added reload print format 2013-04-03 09:58:04 +05:30
Nabin Hait
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +05:30
Nabin Hait
996e469562 added country Aruba and currency AWG 2013-04-02 14:26:26 +05:30
Rushabh Mehta
5c12765313 [merge] 2013-04-02 10:51:11 +05:30
Nabin Hait
2f20a7ac96 [patch][serial no] for striped serial nos 2013-04-01 17:23:43 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Rushabh Mehta
2fe802c81e [website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..) 2013-03-28 16:26:11 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Nabin Hait
e2fe8de637 patch: update against expense_account in purchase invoice 2013-03-28 15:30:41 +05:30
Anand Doshi
e35073157c set fiscal year in stock entry and stock reconciliation 2013-03-27 17:35:23 +05:30
Anand Doshi
9f91053201 patch to set user type as System User if user has a role and if previous user type is Partner 2013-03-26 12:25:11 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
Anand Doshi
e31d64ffe1 save global defaults 2013-03-19 18:42:29 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return 
Conflicts:
	patches/patch_list.py
 2013-03-18 17:42:08 +05:30
Anand Doshi
1cf7391562 patch to fix incorrect gl entries due to payment reconciliation between 2013-03-11 and 2013-03-15 2013-03-15 13:42:31 +05:30
Anand Doshi
0a1ac4090c Merge branch 'master' into sales_purchase_return 2013-03-14 12:07:39 +05:30
Rushabh Mehta
2e2993444a removed style settings save patch 2013-03-13 22:18:20 +05:30
Anand Doshi
23d742693a Merge branch 'master' into sales_purchase_return 2013-03-13 14:01:34 +05:30
Anand Doshi
71bed3116f working on merging sales purchase return into stock entry 2013-03-13 12:57:04 +05:30
Rushabh Mehta
2eddd8ad68 removed december_2012.clear_web_cache patch 2013-03-12 21:39:56 +05:30
Anand Doshi
071cdfcb16 apply style settings patch after blog rename 2013-03-12 20:32:13 +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
Nabin Hait
f7df8b28d2 -m 2013-03-12 10:58:11 +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
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
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
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
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
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +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
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
Rushabh Mehta
981577050c added company in leave application and global holiday block list 2013-02-07 09:09:14 +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
7bdf27b19c new feature: validation on account negative balance 2013-02-05 15:52:46 +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
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
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +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
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
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
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