Commit Graph

18214 Commits

Author SHA1 Message Date
Anand Doshi
8c3cfe076e get last purchase rate from item if not found from purchase order or receipt 2012-09-18 13:56:47 +05:30
Nabin Hait
9a90c89b3f removed duplicate function from sales invoice 2012-09-18 13:37:27 +05:30
Nabin Hait
214d62a09a Merge branch 'master' of github.com:webnotes/erpnext 2012-09-18 11:19:59 +05:30
Nabin Hait
82efcc780b reset standard transaction series in cleanup_data 2012-09-18 11:19:34 +05:30
Anand Doshi
6b52d77c76 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-17 21:24:39 +05:30
Rushabh Mehta
4156523175 added flot for graphs in report_grid 2012-09-17 19:10:36 +05:30
Anand Doshi
8263419691 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:35:40 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Rushabh Mehta
f16b28b92b moved chart_of_accounts as GridReport 2012-09-17 11:05:59 +05:30
Rushabh Mehta
40c1ac00bc merge 2012-09-17 10:05:46 +05:30
Rushabh Mehta
4ce6b60fce updates to general ledger, todo 2012-09-17 10:04:07 +05:30
Anand Doshi
d86e282eda show only those bank/cash balances which have non-zero value 2012-09-15 22:42:45 +05:30
Anand Doshi
609b25bcdb refactor email digest 2012-09-15 22:11:23 +05:30
Rushabh Mehta
cfb5466d30 added export to reports using downloadify 2012-09-14 18:12:17 +05:30
Rushabh Mehta
b40e93733c merge with master 2012-09-14 11:29:52 +05:30
Nabin Hait
ebc3b6a68d stock ledger added 2012-09-14 11:25:57 +05:30
Rushabh Mehta
c6369046a1 merge 2012-09-14 11:09:46 +05:30
Rushabh Mehta
bf65507939 added watch, check progress 2012-09-14 11:08:53 +05:30
Nabin Hait
9d3f8b9f59 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-14 10:18:09 +05:30
Nabin Hait
266ee64dc7 rebuild account tree before reposting acocunt balance 2012-09-14 10:17:46 +05:30
Rushabh Mehta
2be4c6f8ed created grid report, report dump and general ledger report 2012-09-13 19:42:28 +05:30
Rushabh Mehta
95e4e1418d created grid report, report dump and general ledger report 2012-09-13 19:40:56 +05:30
Anand Doshi
e08249f3d5 allow multisort with selectable sort order 2012-09-13 15:39:34 +05:30
Anand Doshi
99e5ac3452 multi sort for stock ledger search criteria 2012-09-13 15:24:19 +05:30
Rushabh Mehta
93e9fdfe48 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-13 12:00:54 +05:30
Rushabh Mehta
4a91f29d0f updates to gzip, chart of accounts 2012-09-13 11:59:32 +05:30
Rushabh Mehta
fd1c166f5b late loading js (require) files in localStorage, brought back versions (simpler) 2012-09-13 10:21:29 +05:30
Rushabh Mehta
24ebe3ffdd merge with master 2012-09-12 19:07:07 +05:30
Rushabh Mehta
588a98a10f fixes to chart_of_accounts, added opening + pl condition 2012-09-12 19:00:14 +05:30
Rushabh Mehta
aeb5c0fe70 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-12 18:15:26 +05:30
Rushabh Mehta
0fa8e33835 chart of accounts: balances calculation 2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da Created Chart of Accounts using Slick Grid and Tree 2012-09-12 17:13:36 +05:30
Nabin Hait
b146353db2 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 16:15:09 +05:30
Nabin Hait
5337ce8d02 period closing voucher issue fixed 2012-09-12 16:14:23 +05:30
Anand Doshi
d29e06852d Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-12 15:33:50 +05:30
Nabin Hait
303c78ce0e Merge branch 'master' of github.com:webnotes/erpnext 2012-09-12 15:27:24 +05:30
Nabin Hait
6a6cf5e573 parent account mandatory validation 2012-09-12 15:26:56 +05:30
Anand Doshi
af5e5c9f3a Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 14:56:28 +05:30
Anand Doshi
d14dc83b88 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-12 14:55:20 +05:30
Anand Doshi
94dd7ef879 show employee name in employee link field in attendance form 2012-09-12 14:53:44 +05:30
Nabin Hait
8fdaa4dd66 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-12 14:43:09 +05:30
Nabin Hait
eff2907911 error fixed in period closing entry 2012-09-12 14:42:25 +05:30
Anand Doshi
ae64c46671 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 15:46:52 +05:30
Anand Doshi
ff6754ccf4 fix in bin query 2012-09-10 15:46:38 +05:30
Anand Doshi
3b3a42303d Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 15:14:16 +05:30
Anand Doshi
0a55a35452 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-10 15:13:45 +05:30
Anand Doshi
bb2bb03bcc fix in bin reorder item condition 2012-09-10 15:13:22 +05:30
Anand Doshi
4de55b6f6b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 14:44:03 +05:30
Nabin Hait
94390d2c3f Merge branch 'master' of github.com:webnotes/erpnext 2012-09-10 14:37:28 +05:30
Nabin Hait
eb9f6eda02 order type fix in quote/SO 2012-09-10 14:36:49 +05:30
Anand Doshi
ce946afb67 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	public/js/all-app.js
2012-09-10 14:18:17 +05:30
Anand Doshi
9d389461bb Merge branch 'master' of github.com:webnotes/erpnext 2012-09-10 14:13:57 +05:30
Anand Doshi
bf8f343da7 check match conditions for companies list in chart of accounts/cost center 2012-09-10 14:13:01 +05:30
Nabin Hait
6c8504877b Fixes in item wise purchase details report 2012-09-10 12:23:06 +05:30
Anand Doshi
21e8447e6c Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 12:04:30 +05:30
Anand Doshi
20d82800f3 add delete permission to communication 2012-09-10 12:03:31 +05:30
Anand Doshi
1971ca9ecb renamed Report to report 2012-09-10 11:40:06 +05:30
Anand Doshi
10f4ae814c renamed Report name to small case name 2012-09-10 11:34:51 +05:30
Anand Doshi
88411eddb8 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-10 11:32:17 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
2012-09-10 11:31:18 +05:30
Anand Doshi
38ab4ae3ac add stock report permission for accounts manager 2012-09-10 11:23:51 +05:30
Anand Doshi
d7774d0ab0 fix in email digest 2012-09-07 14:43:39 +05:30
Rushabh Mehta
93af75a160 added unicode literals in patch 2012-09-07 10:57:14 +02:00
Nabin Hait
ea4e6b0f0c reload stock ledger report 2012-09-07 12:15:29 +05:30
Nabin Hait
56419e0d79 Stock ledger report new version 2012-09-07 12:11:41 +05:30
Nabin Hait
f28f4c7a89 section hide_unhide issue fixed 2012-09-07 11:59:05 +05:30
Rushabh Mehta
62aa086e80 todo: assignment notification fix 2012-09-07 10:05:13 +05:30
Rushabh Mehta
38cc3d6534 todo: do not send message to if assigned to self 2012-09-07 09:54:19 +05:30
Anand Doshi
e67bcc38b4 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 17:51:05 +05:30
Anand Doshi
f480dc9d2e fix in opportunity to quotation fetch 2012-09-06 17:50:44 +05:30
Anand Doshi
3d498ccfb1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:56:07 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
76ef96f24f begin transaction after commit in support ticket 2012-09-06 07:53:37 +05:30
Rushabh Mehta
0a0be777a0 website dropdown update 2012-09-05 13:48:45 +05:30
Anand Doshi
4ae7328a6c Merge branch 'master' of github.com:webnotes/erpnext 2012-09-05 13:27:27 +05:30
Anand Doshi
518090f38e autocommit for repost stock due to wrong packing list patch 2012-09-05 13:26:53 +05:30
Nabin Hait
d948e9b15c reload doc before auto nification 2012-09-05 12:59:07 +05:30
Rushabh Mehta
a9302b01d1 added dropdowns to website toolbar 2012-09-05 12:32:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
eb3089e6e3 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 16:57:04 +05:30
Anand Doshi
b4ea4adeec Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/setup/doctype/price_list/price_list.py
2012-08-31 16:56:44 +05:30
Anand Doshi
c53a0ffe34 by default, communication content is of type 'Text' instead of 'Text Editor' 2012-08-31 16:54:59 +05:30
Anand Doshi
41cd5a68f4 autocommit for price list update 2012-08-31 13:57:22 +05:30
Anand Doshi
b211a41547 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 13:39:58 +05:30
Anand Doshi
29abc389eb run communication list if a new communication is added 2012-08-31 13:39:18 +05:30
Anand Doshi
00d3c7c67d open communication in dialog 2012-08-31 13:25:03 +05:30
Anand Doshi
fa97e8c783 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
	erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
	public/js/all-app.js
2012-08-31 12:09:02 +05:30
Nabin Hait
245f920772 removed cash flow statement 2012-08-31 11:01:21 +05:30
Anand Doshi
62a3881837 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-30 18:17:20 +05:30
Nabin Hait
26da576f1e patch list updated 2012-08-29 12:09:35 +05:30
Nabin Hait
fff16c337d fixes in over billing validation 2012-08-29 12:07:32 +05:30
Nabin Hait
9c043b2f51 Billed amount in SO and DN based on export amount and patch for it 2012-08-29 11:46:12 +05:30
Nabin Hait
12e1a5f983 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-28 10:50:45 +05:30
Nabin Hait
f826eecfc7 fixes in bom: updating cost 2012-08-28 10:50:18 +05:30
Anand Doshi
ebcb8b3fac fix in change password of profile settings page 2012-08-27 15:49:27 +05:30
Anand Doshi
9ee4adb27a send newsletter as owner 2012-08-24 15:18:48 +05:30
Anand Doshi
ad86d0f474 show message after sending test email 2012-08-24 14:47:30 +05:30
Anand Doshi
c6800106fb added newsletter listing 2012-08-24 14:47:10 +05:30
Anand Doshi
3f8277b6bb added newsletter link in support home page. also hide naming series after save 2012-08-24 14:23:27 +05:30
Anand Doshi
9fdc4abced added newsletter feature 2012-08-24 14:13:42 +05:30
Anand Doshi
998d39f71b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7 edit / add nodes allowed in sales browser, only if user has valid permissions 2012-08-24 12:15:44 +05:30
Anand Doshi
d0fcdf6ec1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-23 18:34:46 +05:30
Anand Doshi
763e4c93bc added permission checking to show add child, edit and view ledger links
in chart of accounts
2012-08-23 18:34:04 +05:30
Anand Doshi
5513775326 fix in number of comments 2012-08-23 17:17:46 +05:30
Anand Doshi
005ab30644 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-23 17:17:24 +05:30
Anand Doshi
7e657d79fd global date format for blog comments 2012-08-23 17:15:13 +05:30
Anand Doshi
d297b88f60 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/patches/patch_list.py
2012-08-23 15:26:38 +05:30
Anand Doshi
6db2ac51e6 changed blog comments date format to global date format i.e. 1 January 2012 2012-08-23 15:24:21 +05:30
Anand Doshi
297f37da03 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-22 14:59:14 +05:30
Anand Doshi
688b712bda Merge branch 'master' of github.com:webnotes/erpnext 2012-08-22 14:58:03 +05:30
Anand Doshi
73c6542e6c minor fix in communication.js 2012-08-22 14:57:35 +05:30
Nabin Hait
fd3f24f4be customer name should come in recurring invoice print format instead of customer id 2012-08-20 11:43:55 +05:30
Anand Doshi
25dd92dbdb coerce markdown2.UnicodeWithAttrs to unicode in blog comments 2012-08-17 23:36:11 +05:30
Anand Doshi
5fc48f566f Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
daba7c40a6 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-17 11:00:42 +05:30
Nabin Hait
0170b2b4bc default purchase taxes and charges master will be automatically fetched in pur transactions 2012-08-17 11:00:15 +05:30
Anand Doshi
7b20428976 merged master 2012-08-16 17:10:39 +05:30
Anand Doshi
1467a059ed Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-16 17:09:37 +05:30
Anand Doshi
37b1b88710 fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login 2012-08-16 17:09:13 +05:30
Nabin Hait
7e555e9f78 Update erpnext/accounts/doctype/cost_center/cost_center.py 2012-08-14 16:42:30 +05:30
Nabin Hait
f039c8b58f get_query for invoice in c-form 2012-08-14 15:38:17 +05:30
Anand Doshi
0851b4b397 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-14 14:56:09 +05:30
Anand Doshi
46f8b50c8c added Expense Claim Type link in HR Home page 2012-08-14 14:53:38 +05:30
Nabin Hait
22aa31ead2 updated profile permission 2012-08-13 13:15:36 +05:30
Rushabh Mehta
c3de42c892 bugfix: blog 2012-08-13 11:31:27 +05:30
Rushabh Mehta
fa0e252d4b blog comments fix, markdown and not sent multiple times 2012-08-13 11:09:21 +05:30
Anand Doshi
6547375a2b Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/buying/doctype/purchase_common/purchase_common.js
2012-08-10 15:42:50 +05:30
Anand Doshi
544b0f64d1 cascade project name to other items, if selected in one item during purchase cycle 2012-08-10 15:37:54 +05:30
Anand Doshi
241437995f Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/setup/doctype/company/company.txt
2012-08-10 12:58:48 +05:30
Anand Doshi
f08cbe185d Merge branch 'master' of github.com:webnotes/erpnext 2012-08-10 12:48:46 +05:30
Anand Doshi
6810979dab Company Form: do not hide 'Default Settings' section break for a new company, as it contains a mandatory field 'Default Currency' 2012-08-10 12:38:48 +05:30
Nabin Hait
4d0cba8249 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-09 16:24:47 +05:30
Nabin Hait
cd4918736a error fixed in account browser 2012-08-09 16:24:20 +05:30
Anand Doshi
8456eabed8 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-09 12:17:44 +05:30
Anand Doshi
c6cf4a2630 do not display mouse as a clickable pointer when hovering on description in todo list 2012-08-09 12:16:03 +05:30
Anand Doshi
63fee973d7 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-09 11:34:47 +05:30
Anand Doshi
c4df355edc removed msgprint in get_pos_details of sales invoice 2012-08-09 11:33:56 +05:30
Rushabh Mehta
899fe5d3f0 links enabled in todo 2012-08-08 15:30:19 +05:30
Rushabh Mehta
02f459abcf Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-08 14:29:55 +05:30
Rushabh Mehta
0f0d8850d0 merged with master (project cleanup) 2012-08-08 14:28:24 +05:30
Rushabh Mehta
a8733daf80 fix to project_list 2012-08-08 14:26:53 +05:30
Rushabh Mehta
aff1599fe5 cleanup to projects and tasks and now embedding gantt chart inside project 2012-08-08 14:19:33 +05:30
Rushabh Mehta
2937e7e842 task cleanup: moved allocated_to -> assigned_to, autoname is now task (istead of tic) 2012-08-08 12:54:47 +05:30
Anand Doshi
a5c7bd34d0 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-08 10:54:56 +05:30
Anand Doshi
0cedc1cc9c removed reply_to while sending email in email digest 2012-08-08 10:54:11 +05:30
Rushabh Mehta
17588987a4 file upload should not be decoded 2012-08-08 10:37:02 +05:30
Rushabh Mehta
22fbea975f Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-08 10:07:39 +05:30
Rushabh Mehta
bf8cac53c7 pre, code style fix 2012-08-08 10:05:51 +05:30
Rushabh Mehta
bc26218889 added jQuery.Gantt 2012-08-08 10:02:55 +05:30
Rushabh Mehta
47ba1d144a Merge branch 'master' of github.com:webnotes/erpnext 2012-08-07 16:38:00 +05:30
Rushabh Mehta
586c6f3cbe calendar: links to ref document 2012-08-07 16:36:40 +05:30
Rushabh Mehta
c2ef064ebb todo page background bugfix 2012-08-07 16:36:10 +05:30
Rushabh Mehta
df196c12a9 projects: milestones have events, tasks have events with better description 2012-08-07 16:35:27 +05:30
Anand Doshi
7b64b96676 renamed report folder 2012-08-07 15:30:40 +05:30
Anand Doshi
ebcb3c02d0 fixes in supplier quotations report patch 2012-08-07 15:24:46 +05:30
Anand Doshi
26dc1b776a fix in report: supplier quotations after merge with unicode 2012-08-07 15:17:53 +05:30
Anand Doshi
4e2feb2b28 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-07 15:14:07 +05:30
Anand Doshi
883285f503 fix in supplier quotations patch 2012-08-07 15:13:48 +05:30
Anand Doshi
e81c07ff4d appended unicode literals import after merge 2012-08-07 15:08:52 +05:30
Anand Doshi
16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
Anand Doshi
f6624257ad Merge branch 'master' of github.com:webnotes/erpnext 2012-08-07 15:06:17 +05:30
Anand Doshi
e30d5f833e New Report: Supplier Quotations 2012-08-07 15:05:42 +05:30
Rushabh Mehta
6252c13ec8 added code style and mardown in todo 2012-08-07 12:53:49 +05:30
Rushabh Mehta
e6ecb06001 added markdown reference page 2012-08-07 12:48:41 +05:30
Rushabh Mehta
c7dbe293c3 updates to kb: unanswered questions show in desktop, questions query moved to server-side 2012-08-07 12:12:55 +05:30
Nabin Hait
e343393d73 add/drop index if index key not exists / exists 2012-08-07 10:53:52 +05:30
Anand Doshi
a742d32c96 added unicode literals import to supplier quotation patch 2012-08-06 20:03:49 +05:30
Anand Doshi
0d0efcfd14 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-06 19:56:03 +05:30
Anand Doshi
b8219aa4f0 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	public/js/all-app.js
	public/js/fields.js
2012-08-06 19:55:43 +05:30
Anand Doshi
8ce2ac3f0e supplier quotation release patch 2012-08-06 19:53:31 +05:30
Anand Doshi
65078d8a2e Merge branch 'master' of github.com:webnotes/erpnext 2012-08-06 18:34:26 +05:30
Anand Doshi
3e92c00dd9 removed stock uom related fields from supplier quotation item, as there is no need to track stock uom details in a suppleir quoation 2012-08-06 18:29:46 +05:30
Anand Doshi
793ec9f857 removed method get_uom_details from Supplier Quotation, as there is no need to track Stock UOM in a quotation 2012-08-06 18:29:03 +05:30
Anand Doshi
6ea82c07fe added button, method in Purchase Request form to make Supplier Quotation 2012-08-06 18:27:58 +05:30
Anand Doshi
72f5a05ac0 added fields 'Supplier Quotation' and 'Supplier Quotation Item' in Purchase Order Item to track parent 2012-08-06 18:27:11 +05:30
Anand Doshi
b6029d2d13 added button, method in Purchase Order to fetch Supplier Quotation Items 2012-08-06 18:26:07 +05:30
Anand Doshi
da85a8363f call set missing values on load and contact section toggle on refresh of purchase order form 2012-08-06 18:24:56 +05:30
Anand Doshi
280e0ce263 added function to hide/unhide contact section of a buying form 2012-08-06 18:23:45 +05:30
Anand Doshi
41c4d19279 added button to make Purchase Order from Supplier Quotation 2012-08-06 18:22:59 +05:30
Anand Doshi
26e5f3dec0 DocType Mappers: Purchase Request-Supplier Quotation and Supplier Quotation-Purchase Order 2012-08-06 18:20:08 +05:30
Rushabh Mehta
aaa75496e2 added email chain on blog comment and number of comments 2012-08-06 15:22:17 +05:30
Rushabh Mehta
24fabf3b73 cleaned up source from lead 2012-08-06 15:21:35 +05:30
Rushabh Mehta
a146db2b58 build 2012-08-06 14:31:53 +05:30
Nabin Hait
ed8049ec19 fixes in patch: considered over delivery in reserved qty calculation 2012-08-06 14:31:45 +05:30
Rushabh Mehta
a49a552a37 merge 2012-08-06 14:30:31 +05:30
Rushabh Mehta
48f5f40ae2 moved recurring to daily from every time 2012-08-06 14:19:11 +05:30
Anand Doshi
a4f6529801 in item's update page name, if item name is null, create page name with only the name 2012-08-06 13:42:19 +05:30
Anand Doshi
1c2b192be6 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
2012-08-06 13:36:19 +05:30
Nabin Hait
337fef0859 call item on_update from UOM Replace Utility 2012-08-06 13:33:32 +05:30
Anand Doshi
e64d900322 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
2012-08-06 13:23:16 +05:30
Nabin Hait
fd03762445 call item on_update from UOM Replace Utility 2012-08-06 13:18:32 +05:30
Rushabh Mehta
f83159edbe Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-06 10:17:38 +05:30
Anand Doshi
326f88cce6 fixed patch: repost stock due to wrong packing list 2012-08-03 19:19:23 +05:30
Anand Doshi
fea3b64dd0 fixed patch: repost stock due to wrong packing list 2012-08-03 19:14:42 +05:30
Anand Doshi
df902d1a0c patch: repost stock due to wrong packing list entries - optimized query using index and subqueries 2012-08-03 19:11:11 +05:30
Anand Doshi
786444e6bf changed document_type of 'Communication' to 'Master' to enable importing 2012-08-03 16:15:39 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Anand Doshi
b7cc66384d Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 14:19:36 +05:30
Anand Doshi
3d549775e1 mark 'Supplier Quotation' as a beta feature 2012-08-03 14:19:05 +05:30
Rushabh Mehta
c0fded82e6 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 14:18:05 +05:30
Rushabh Mehta
52006ca83d bugfix in scheduler 2012-08-03 14:15:25 +05:30
Rushabh Mehta
e5984873e6 added standard mail footer and function to get monthly bulk mail limit 2012-08-03 14:15:07 +05:30
Rushabh Mehta
ba54cf6eef added 'Email Send' feature in blog to send blog by mail to all subscribers 2012-08-03 14:14:02 +05:30
Rushabh Mehta
5f21cc03e6 created files for blog subscription to be embedded in blog and blog_page 2012-08-03 14:13:30 +05:30
Rushabh Mehta
4b3b25e1d6 aded 'add_subscriber' method to be called from website 2012-08-03 14:10:59 +05:30
Rushabh Mehta
384b61749e added 'blog_subscriber' and 'unsubscribed' fields 2012-08-03 14:09:32 +05:30
Nabin Hait
175771c699 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 08:40:14 +05:30
Nabin Hait
8292691470 stock repost patch 2012-08-03 08:39:17 +05:30
Anand Doshi
e69c7f487f Merge branch 'master' of github.com:webnotes/erpnext 2012-08-02 18:53:31 +05:30
Anand Doshi
a67a74fee1 supplier quotation, project shift patch 2012-08-02 18:53:00 +05:30
Rushabh Mehta
f0018b5e05 added unsubscribed fields in Lead and Contact and cleaned up sendmail function 2012-08-02 18:03:12 +05:30
Rushabh Mehta
a4fe7180f4 html generation moved from web.py to web_cache.py so it can be called from other places as a response from server.py 2012-08-02 13:07:23 +05:30
Nabin Hait
dd9d4bbdea repost stock patch due to wrong packing list 2012-08-02 10:56:40 +05:30
Anand Doshi
cf546d547d fix in quotation item's get query 2012-08-01 12:05:13 +05:30
Anand Doshi
96efd2ba9b fix in quotation item's get query 2012-08-01 12:00:30 +05:30
Anand Doshi
33987a0ad2 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-31 19:18:44 +05:30
Anand Doshi
5c42d5d2cf Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 19:15:31 +05:30
Anand Doshi
c7d5fc4952 fix in recent blog list link 2012-07-31 19:15:01 +05:30
Anand Doshi
59d37c4bcb Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/hr/doctype/expense_claim/expense_claim.js
	erpnext/patches/patch_list.py
2012-07-31 17:30:49 +05:30
Nabin Hait
f9360ce562 filter on actual qty in stock level report 2012-07-31 17:27:11 +05:30
Nabin Hait
d614a6ea38 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 14:12:41 +05:30
Nabin Hait
8d97290c06 updated bin permission 2012-07-31 14:12:23 +05:30
Anand Doshi
fd684ec247 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 13:58:16 +05:30
Anand Doshi
29c8b3b487 bug fix: strip serial no field before validation to check truthy value 2012-07-31 13:57:06 +05:30
Nabin Hait
d8959bfecd Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 12:08:00 +05:30
Nabin Hait
76697a5c3b added filter on item group and brand 2012-07-31 12:07:40 +05:30
Anand Doshi
0029ac9f3c Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 11:46:57 +05:30
Anand Doshi
054cf3907f removed validate approver code 2012-07-31 11:46:41 +05:30
Nabin Hait
9b5fc1f833 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-31 11:27:14 +05:30
Nabin Hait
87b6d656df sanctioned amt auto set equals to claimed amt 2012-07-31 11:23:44 +05:30
Anand Doshi
ccee92e5c0 fixes in header decoding in receiving support ticket email 2012-07-31 10:56:24 +05:30
Anand Doshi
3e7a143539 fixes in header decoding in receiving support ticket email 2012-07-31 10:54:56 +05:30
Anand Doshi
396628e7ea Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
2012-07-27 14:45:24 +05:30
Anand Doshi
85632b71c9 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-27 14:40:19 +05:30
Anand Doshi
b3a4c09e07 added guest read permission to blog 2012-07-27 14:39:27 +05:30
Anand Doshi
66f90687e9 import unicode_literals where missing 2012-07-27 14:29:29 +05:30
Nabin Hait
4572182939 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-27 10:54:43 +05:30
Nabin Hait
f5b3a44da1 SO and DN mandatory only for stock item if made mandatory in global defaults 2012-07-27 10:54:18 +05:30
Nabin Hait
3d72da568d SO and DN mandatory only for stock item if made mandatory in global defaults 2012-07-27 10:51:51 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
2012-07-26 15:46:13 +02:00
Anand Doshi
adc6c7c02b moved add comment button outside comments div 2012-07-26 19:11:44 +05:30
Anand Doshi
80b8393338 fixes in email validation for recurring invoice 2012-07-26 19:01:16 +05:30
Anand Doshi
e87482ac86 Fixed: Lead Lost Reason message 2012-07-26 12:48:26 +05:30
Rushabh Mehta
39c0aa70ba Redirect to new manual page 2012-07-26 12:39:07 +05:30
Nabin Hait
74b30c15ea Update erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py 2012-07-25 18:14:46 +05:30
Nabin Hait
e8ff96565c validate notification_email_ids in recurring invoice and if user is administrator set email id from profile 2012-07-24 10:59:31 +05:30
Anand Doshi
9b8fca9d75 new patches for unicode release 2012-07-23 13:10:33 +05:30
Anand Doshi
6a223fe77e fixes in receive email 2012-07-23 12:51:50 +05:30
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
7118086658 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-23 11:28:10 +05:30
Anand Doshi
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
76ec66dd65 fixes for unicode 2012-07-20 18:11:30 +05:30
Nabin Hait
454e268109 Recurring Invoice repititive mail sending issue fixed 2012-07-20 17:17:32 +05:30
Nabin Hait
93e82b8742 error fixed in landed cost wizard 2012-07-20 10:40:14 +05:30
Anand Doshi
1703cc89b4 fixes for unicode 2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Nabin Hait
bbc2d44241 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-19 09:15:49 +05:30
Nabin Hait
cea01c7212 item code get query in customer issue 2012-07-19 09:15:12 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
6efc49af46 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 20:15:01 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Nabin Hait
28115f3373 repost stock due to incorrect packing list 2012-07-18 18:29:05 +05:30
Nabin Hait
2e72b6ae2c Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 18:13:04 +05:30
Nabin Hait
ddb9f948ee repost stock due to incorrect packing list 2012-07-18 18:12:34 +05:30
Anand Doshi
a60266d780 fix in doclistview group by logic 2012-07-18 15:43:43 +05:30
Nabin Hait
18b9eccdfa packing list issue fixed 2012-07-18 13:31:08 +05:30
Nabin Hait
41c922d200 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a packing list issue fixed 2012-07-18 13:19:01 +05:30
Anand Doshi
04fd09c639 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-17 13:33:57 +05:30
Anand Doshi
4612e696b0 mark stock entry as is_submittable 2012-07-17 13:33:41 +05:30
Anand Doshi
3a281ae6c3 Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/patches/patch_list.py
2012-07-17 13:21:55 +05:30
Anand Doshi
26ca2c8c77 fix in syntax of owner match patch 2012-07-17 13:08:46 +05:30
Anand Doshi
5d4aaaa8a7 patch to remove match condition of owner on event doctype 2012-07-17 13:06:34 +05:30
Nabin Hait
8b091cd864 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:35:10 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Anand Doshi
2f192a6167 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:33:22 +05:30
Anand Doshi
8499773db8 fix in last sales and quote rate in quotation 2012-07-16 16:33:10 +05:30
Rushabh Mehta
4ae82ca0c2 users pages deprecated 2012-07-16 16:20:11 +05:30
Rushabh Mehta
527c5b6da5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:45:18 +05:30
Rushabh Mehta
3c419c5e05 cur_frm.doc re-reference when is called 2012-07-16 15:44:38 +05:30
Nabin Hait
65535da220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:38:41 +05:30
Nabin Hait
49e170153e Include in print rate validation added 2012-07-16 15:38:11 +05:30
Anand Doshi
e7c54a4714 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:16:27 +05:30
Anand Doshi
7f2385cee9 Merge branch 'master' into dev 2012-07-16 15:15:34 +05:30
Anand Doshi
59fa430be3 fixes in quotation item code get query 2012-07-16 15:15:24 +05:30
Rushabh Mehta
9e9809a44f Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Nabin Hait
8f5cd388cc Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 12:50:25 +05:30
Nabin Hait
388e09834c Check duplicate SO entry for same po no and customer 2012-07-16 12:49:52 +05:30
Anand Doshi
bb81c198f5 Merge branch 'dev' of github.com:webnotes/erpnext into dev
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-07-13 16:48:08 +05:30
Anand Doshi
2fef0ee4e1 Merge branch 'master' into dev 2012-07-13 16:47:09 +05:30
Anand Doshi
9ec8024db7 show order type icon in sales order list view 2012-07-13 16:46:12 +05:30
Rushabh Mehta
2d7cb22f1f added auth_table patch file: 2012-07-13 15:07:07 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Nabin Hait
981446c7cc Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-13 11:19:27 +05:30
Rushabh Mehta
d47efd57ac check_required fix 2012-07-13 11:15:25 +05:30
Nabin Hait
0c9a262de4 fixed conflict 2012-07-13 10:39:45 +05:30
Nabin Hait
91223d325b fixed conflict 2012-07-13 10:35:44 +05:30
Anand Doshi
158e7751a8 Merge branch 'master' into dev 2012-07-13 08:53:17 +05:30
Anand Doshi
255d58b3a0 fixes in error logging and refresh cache issues 2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e Merge branch 'master' into dev 2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00 fixes in cms2 patch 2012-07-13 08:24:16 +05:30
Anand Doshi
1d2826d69d Merge branch 'master' into dev 2012-07-13 08:15:34 +05:30
Anand Doshi
665f6048f1 do not delete web cache in refresh cache 2012-07-13 08:15:03 +05:30
Anand Doshi
72a824f483 do not delete web cache in refresh cache 2012-07-13 08:14:32 +05:30
Anand Doshi
91f731641c Merge branch 'master' into dev 2012-07-13 02:16:54 +05:30
Anand Doshi
4cf55c5a04 fixes in blog caching 2012-07-13 02:16:22 +05:30
Anand Doshi
46ac229edc Merge branch 'master' into dev 2012-07-13 01:45:33 +05:30
Anand Doshi
53bd49d46c fixes in blog cache logic 2012-07-13 01:45:19 +05:30
Anand Doshi
d738a2106d Merge branch 'master' into dev 2012-07-13 01:32:36 +05:30
Anand Doshi
51eb8a18ba fix in blog caching 2012-07-13 01:32:23 +05:30
Anand Doshi
0842fad927 Merge branch 'master' into dev 2012-07-13 01:22:32 +05:30
Anand Doshi
970988664a clear cache if home page 2012-07-13 01:22:19 +05:30
Anand Doshi
aa3ab5ec59 Merge branch 'master' into dev 2012-07-13 01:15:08 +05:30
Anand Doshi
200c443b72 fixes in blog list 2012-07-13 01:14:52 +05:30
Anand Doshi
8b8478178c Merge branch 'master' into dev 2012-07-13 00:47:17 +05:30
Anand Doshi
f01059fd3e fixes in blog list 2012-07-13 00:46:59 +05:30
Anand Doshi
4a56e996f1 Merge branch 'master' into dev 2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25 log error on saving doclist in cms2 patch 2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad update in cms2 patch: delete html files 2012-07-12 22:06:27 +05:30
Anand Doshi
3d53e86755 fixes in log comment and web page saving 2012-07-12 20:12:40 +05:30
Anand Doshi
c4eb9bf838 cms2 patch updates 2012-07-12 19:15:52 +05:30
Anand Doshi
1a51cc9ad0 fixes in cms2 updates 2012-07-12 19:03:58 +05:30
Anand Doshi
d68dceb791 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-12 18:53:35 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
357fb2640b sales bom fixes and mandatory in table fields 2012-07-12 18:00:21 +05:30
Nabin Hait
51f8a6d0d5 select employee based on joining and relieving date in salary maanger 2012-07-12 16:25:13 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Nabin Hait
179f01af17 hong kong added in country list 2012-07-12 11:03:39 +05:30
Nabin Hait
e9c19369a9 salary slip will not submitted through salary manager if Send email checked and invalid email id 2012-07-12 10:33:45 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Anand Doshi
8790188fc8 fixes in web cache record insert for exceptional pages like 404, login-page, index etc. 2012-07-11 20:04:32 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Anand Doshi
be59e7cc10 fixes in web cache 2012-07-11 19:12:01 +05:30
Anand Doshi
f7765a899b Show Brand as ERPNext if brand not specified 2012-07-11 19:05:27 +05:30
Anand Doshi
51fc20be5b fixes in index page logic 2012-07-11 18:56:13 +05:30
Nabin Hait
4b8b19a281 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-11 18:41:20 +05:30
Anand Doshi
8c7e76ba44 RSS for blog
Comment addition into blog page's dom
2012-07-11 18:40:57 +05:30
Nabin Hait
548a45d550 Hong kong timezone added 2012-07-11 18:40:48 +05:30
Nabin Hait
0cd057ce94 Hong kong timezone added 2012-07-11 18:39:28 +05:30
Rushabh Mehta
cda9732f51 price list cleanup 2012-07-11 17:29:46 +05:30
Nabin Hait
42e1273c4c listview for salary structure 2012-07-11 16:38:00 +05:30
Rushabh Mehta
3a0f191658 cleaned up fiscal_year, currency and added select-all + help in doclistview 2012-07-11 16:35:39 +05:30
Nabin Hait
3b0f5dddea fiscal_year_closed and abbr removed from code 2012-07-11 15:14:06 +05:30
Rushabh Mehta
9acf463427 budget distribution cleanup and formatting of markdown 2012-07-11 14:39:33 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e3dd54c220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:19:36 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Nabin Hait
21fdff01e2 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:16:38 +05:30
Nabin Hait
9e5059f6b9 packing list introduced in pos invoice 2012-07-11 13:15:57 +05:30
Nabin Hait
cfc6bb1d6c consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items 2012-07-11 13:14:52 +05:30
Anand Doshi
e2cddd4e78 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 12:09:41 +05:30
Anand Doshi
45ec64a58e fixes in outgoing email connection error handling 2012-07-11 12:06:38 +05:30
Nabin Hait
e4e78b469a Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 11:54:08 +05:30
Rushabh Mehta
bf96499c0e account cleanup, added toggle_fields in cur_frm 2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29 account cleanup started 2012-07-10 18:38:59 +05:30
Nabin Hait
c296764cfe repost button removed from closing entry voucher 2012-07-10 18:25:59 +05:30
Nabin Hait
dcc4cf1fe6 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 18:18:57 +05:30
Nabin Hait
04aa191869 freezed account allowed in closing entry 2012-07-10 18:18:03 +05:30
Rushabh Mehta
5281e350fb cost center cleanup 2012-07-10 18:16:09 +05:30
Nabin Hait
29d7641206 fixed issue in period closing voucher: consider freezed account for closing 2012-07-10 18:12:00 +05:30
Rushabh Mehta
1ee2a5ac12 cost center cleanup + grid css 2012-07-10 17:22:20 +05:30
Anand Doshi
090a12d167 do not force send email using conf.py configuration 2012-07-10 15:15:46 +05:30
Nabin Hait
0aec0e1a63 repost balance button removed from period closing voucher 2012-07-10 14:24:45 +05:30
Nabin Hait
7c0b893b1f mandatory validation in cost center 2012-07-10 14:18:35 +05:30
Nabin Hait
969622dcef mandatory validation in cost center 2012-07-10 14:11:01 +05:30
Nabin Hait
0a38e4528b Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce removed depricated commenting style 2012-07-10 10:27:58 +05:30
Anand Doshi
40fce89631 Favicon for website
Started work on comments to be embedded in blog page
2012-07-09 20:02:52 +05:30
Nabin Hait
94a6c7e8ac changes in reset_series 2012-07-09 16:06:53 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing
Login page rendered via a template
2012-07-09 15:56:12 +05:30
Nabin Hait
cbd23dace7 Merge branch 'master' of git://github.com/webnotes/erpnext 2012-07-09 15:26:10 +05:30
Nabin Hait
1c9903594b utility script for cleanup test data 2012-07-09 15:25:08 +05:30
Anand Doshi
0f5e220d6c Email Digest: New Transactions --> consider feed_type is null records only 2012-07-09 12:48:32 +05:30
Anand Doshi
c6fce634cf added app frame to todo list 2012-07-09 12:34:02 +05:30
Anand Doshi
95a822c701 Fetch Customer's Item Code in Sales Transaction 2012-07-09 11:09:07 +05:30
Nabin Hait
cb2e76a79c delete row issue in grid fixed 2012-07-05 14:44:39 +05:30
Anand Doshi
8c90f12967 changed label of included in print rate to Is this Tax included in Basic Rate? 2012-07-04 13:30:13 +05:30
Anand Doshi
ac475c61dc Merge branch 'master' of github.com:webnotes/erpnext 2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5 Update master 2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Anand Doshi
1b8f24b507 update in contact's permissions 2012-07-03 12:55:17 +05:30
Nabin Hait
594d63ab5d serial no fix 2012-07-03 12:24:18 +05:30
Nabin Hait
fdb1993125 fixed conflict 2012-07-03 12:14:48 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Nabin Hait
9b1e9aceaf packing list cleanup and serial no status update 2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425 packing list cleanup and serial no status update 2012-07-02 16:41:11 +05:30
Nabin Hait
de293e51fc save packing list after cleanup 2012-07-02 16:24:54 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30
Anand Doshi
cec84e1ec7 logout a disabled user 2012-07-02 11:55:29 +05:30
Nabin Hait
6751261589 reload pr-po mapper patch' 2012-07-02 11:24:37 +05:30
Nabin Hait
5a376f0cdb Merge branch 'master' of github.com:webnotes/erpnext 2012-07-02 11:14:25 +05:30
Nabin Hait
84a2e546de po date should be greated than equal to pur request date 2012-07-02 11:13:48 +05:30
Anand Doshi
c4cae8d561 Merge branch 'master' into dev 2012-06-29 19:07:29 +05:30
Anand Doshi
54b7235705 formatted money in chart of accounts tree 2012-06-29 19:07:20 +05:30
Anand Doshi
365e0c5f13 Merge branch 'master' into dev 2012-06-29 19:04:10 +05:30
Anand Doshi
351352670e formatted money in chart of accounts tree 2012-06-29 19:03:59 +05:30
Anand Doshi
e9a21cbb85 show child table values in doclistview 2012-06-29 18:09:04 +05:30
Anand Doshi
ebe23b0f89 allow deletion of communication 2012-06-29 16:38:07 +05:30
Anand Doshi
1f69f92d2f supplier part number in purchase order 2012-06-29 13:25:08 +05:30
Anand Doshi
efc055241a Merge branch 'master' into dev 2012-06-29 12:25:02 +05:30
Anand Doshi
08faf5bb7f added field descriptions for packing slip 2012-06-29 12:24:35 +05:30
Anand Doshi
bd025a6cdf added field descriptions for packing slip 2012-06-29 12:23:44 +05:30
Anand Doshi
b38546489d Merge branch 'master' into dev 2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326 fix in cacheitem table 2012-06-28 20:46:46 +05:30
Anand Doshi
e301e8a6c1 Merge branch 'master' into dev
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Anand Doshi
cbf181c390 employee list -- show status 2012-06-28 18:38:38 +05:30
Anand Doshi
36f5e257ed minor fix in support ticket list view 2012-06-28 13:08:43 +05:30
Anand Doshi
fef4a71177 minor fix in communication list view 2012-06-28 13:05:39 +05:30
Anand Doshi
0afab07a1f communication listview - show pretty date 2012-06-28 12:59:33 +05:30
Nabin Hait
2c2a17f138 pull available qty in so and DN in selection of item 2012-06-27 15:14:58 +05:30
Nabin Hait
1bf92fe034 update modified time of GRN while updating QA no in GRN 2012-06-27 14:50:14 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
2012-06-27 14:13:34 +05:30
Nabin Hait
490ae41cee maintenance visit cleanup and integrated with maintenance schedule 2012-06-27 13:21:12 +05:30
Anand Doshi
bba4db1627 product listing and pages 2012-06-27 12:06:45 +05:30
Nabin Hait
b81aa88091 Lease agreement link removed from account home page 2012-06-27 12:00:24 +05:30
Nabin Hait
7ce737be3d Issue fixed in stock reconciliation 2012-06-27 11:33:05 +05:30
Nabin Hait
b8108c68e9 Issue fixed in stock reconciliation 2012-06-27 11:16:28 +05:30
Nabin Hait
5a24749456 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-27 10:12:21 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30
Anand Doshi
74962a9213 auto create email digest after setup is completed 2012-06-26 12:47:14 +05:30
Anand Doshi
401f12418f Merge branch 'master' into dev
Conflicts:
	erpnext/patches/patch_list.py
2012-06-26 12:20:29 +05:30
Anand Doshi
0b06004986 delete unwanted doctypes of website settings 2012-06-26 12:18:41 +05:30
Anand Doshi
68196bc966 delete records in child table where parent is missing or parent is like
old_par%
2012-06-26 12:15:21 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
a5e972dd89 reserved warehouse in so and delivery warehouse in dn can be different 2012-06-25 18:06:37 +05:30
Nabin Hait
c6fc345f35 alter tabsessions to change user column definition 2012-06-25 15:30:59 +05:30
Nabin Hait
e5a0086fea alter tabsessions to change user column definition 2012-06-25 15:29:40 +05:30
Nabin Hait
8b14617dce run view ledger report through set_route 2012-06-25 13:15:59 +05:30
Nabin Hait
72a6ec8cb3 SO search query in DN: currency check removed 2012-06-25 10:39:38 +05:30
Anand Doshi
c7b485e724 blog - on update - delete cache if not published 2012-06-22 20:08:30 +05:30
Anand Doshi
72c945b7c6 template based web page loading using web.py 2012-06-22 20:01:07 +05:30
Nabin Hait
33dcbc096a error fixed in cost center wise expense report 2012-06-22 14:34:46 +05:30
Nabin Hait
bceec1cbef error fixed in cost center wise expense report 2012-06-22 14:32:56 +05:30
Nabin Hait
1f5a58eed7 listview of sales invoice 2012-06-22 14:19:06 +05:30
Nabin Hait
486718250e listview of purchase invoice and deletion of supplier 2012-06-22 14:14:04 +05:30
Nabin Hait
318eab813c delete customer account on deletion of customer record 2012-06-22 13:35:13 +05:30
Anand Doshi
24aaa09c99 Merge branch 'master' into dev 2012-06-22 10:56:59 +05:30
Anand Doshi
b4aa0f8ce8 fix in price list: check if a row has content before checking its length; allow only 1 attachment 2012-06-22 10:56:12 +05:30
Anand Doshi
9078f652c3 Merge branch 'master' into cms2 2012-06-21 11:50:44 +05:30
Anand Doshi
5d9fc72753 updates in web.py and template - page.html 2012-06-21 11:48:51 +05:30
Anand Doshi
2939a0ea65 fetch price list rates when creating quotation from opportunity 2012-06-21 11:20:37 +05:30
Nabin Hait
0480153042 error fixed in sales register 2012-06-19 18:07:03 +05:30
Nabin Hait
11de3ec952 fixed error in purchase register 2012-06-19 18:03:31 +05:30
Rushabh Mehta
40182bada3 added patch 2012-06-19 14:15:13 +05:30
Anand Doshi
f8946b1e31 fix in buttons displayed - on change of status in lead form 2012-06-18 18:04:28 +05:30
Anand Doshi
422a27cde0 fix in web page saving issue 2012-06-18 17:37:04 +05:30
Nabin Hait
785fe9abc4 validation changed in supplier 2012-06-18 12:43:25 +05:30
Nabin Hait
34b4d26c1a reload_doc replaced with sync in patch 2012-06-18 11:18:27 +05:30
Nabin Hait
28447e84c2 Update master 2012-06-18 11:03:51 +05:30
Nabin Hait
3adfa9595e patch list updated 2012-06-17 21:57:37 +05:30
Nabin Hait
3ad3ebdaec set recurring type as Monthly in all old sales invoice 2012-06-17 21:54:50 +05:30
Nabin Hait
8eadf09e99 recurring invoice : quarterly, half-yearly and yearly 2012-06-17 21:48:33 +05:30
Rushabh Mehta
96bf0b7f53 web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates 2012-06-15 17:29:03 +05:30
Rushabh Mehta
cc53afcef3 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-06-15 14:01:07 +05:30
Rushabh Mehta
bd7f7231f2 cms now powered by jinja2 2012-06-15 14:00:06 +05:30
Anand Doshi
3878b2a1ac add unique constraint to tabSeries name column 2012-06-14 18:28:29 +05:30
Anand Doshi
7d1e8f218b change date field for sales invoice in sales personwise transaction summary search criteria 2012-06-14 18:11:36 +05:30
Anand Doshi
616c355d20 fix in todos and email settings 2012-06-14 16:46:48 +05:30
Anand Doshi
a86d7887f0 fixes in support ticket autoreply 2012-06-14 14:59:04 +05:30
Anand Doshi
92fd9cce35 fixes in support ticket and email settings 2012-06-14 14:55:44 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Anand Doshi
575545d441 added link to show list of all reports 2012-06-13 19:36:55 +05:30
Anand Doshi
94f26eae7c patch for list of search criteria and reports 2012-06-13 19:04:27 +05:30
Anand Doshi
47afacc8e9 1. Reports List - allow read permission to All
2. Display message when ToDo doesnt contain any item
2012-06-13 18:02:43 +05:30
Anand Doshi
d104f4bc32 fix in todo 2012-06-13 17:01:52 +05:30
Anand Doshi
7deaff1979 fixed default tax fetch issue 2012-06-13 14:20:24 +05:30
Anand Doshi
3c3f996ade todo list with assigned to others list 2012-06-13 12:01:41 +05:30
Anand Doshi
64ddb9f069 show assigned to others list in todo 2012-06-12 19:24:12 +05:30
Anand Doshi
4f4f58293f fix in item group on_trash 2012-06-12 17:03:09 +05:30
Nabin Hait
4676891cbf error fixed in reorder item email notification 2012-06-12 15:04:38 +05:30
Nabin Hait
d8fd8cfe1b error fixed in reorder item email notification 2012-06-12 14:30:57 +05:30
Nabin Hait
ea8ff071cb error fixed in reorder item email notification 2012-06-12 14:23:48 +05:30
Anand Doshi
eddea78768 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-12 14:18:14 +05:30
Anand Doshi
443426277b sync purchase invoice item, purchase_receipt_item and purchase order item before patch 2012-06-12 14:17:44 +05:30
Nabin Hait
75af0b2867 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-12 14:16:45 +05:30
Anand Doshi
8eaa2dd570 sync purchase invoice item and purchase order item before patch 2012-06-12 14:16:37 +05:30
Nabin Hait
9b0178acae error fixed in reorder item email notification 2012-06-12 14:16:21 +05:30
Anand Doshi
0146ddcfc6 delete communication log for supplier and customer, on trash 2012-06-12 14:09:44 +05:30
Anand Doshi
89e2b3bda4 minor fix in lead's listview 2012-06-12 13:11:29 +05:30
Anand Doshi
3b6eda3b45 fix in listviews of lead, customer and supplier 2012-06-12 13:08:57 +05:30
Nabin Hait
8afa88b906 fixed utf8 error in multi ledger export 2012-06-11 17:48:40 +05:30
Anand Doshi
a4b19f1d58 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 18:21:56 +05:30
Anand Doshi
a65ad2c901 fetch customer/supplier given a contact in communication 2012-06-08 18:21:35 +05:30
Nabin Hait
6581ef9449 fetch organization from lead to quote 2012-06-08 18:19:32 +05:30
Nabin Hait
f74b023106 fetch organization from lead to quote 2012-06-08 18:14:38 +05:30
Nabin Hait
7357fc1817 fetch organization from lead to quote 2012-06-08 18:02:38 +05:30
Nabin Hait
563eb9c43b Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 16:15:38 +05:30
Nabin Hait
be5e5059c3 Lead Organization field added in quotation 2012-06-08 16:15:08 +05:30
Anand Doshi
3ee7bb5ead Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 16:07:45 +05:30
Anand Doshi
08c0869a3b load some conf data in boot 2012-06-08 16:07:01 +05:30
Rushabh Mehta
be7ce4744a website color should be black 2012-06-08 14:18:21 +05:30
Nabin Hait
59c7670713 copy uom in pur inv from po, pr 2012-06-08 12:31:37 +05:30
Nabin Hait
d491fc7a31 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 12:13:47 +05:30
Nabin Hait
856442e33b taxes query changes 2012-06-08 12:13:00 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
4dbeae1eae escape double quotes in communication content, allow 0 as value in data/int field 2012-06-07 14:39:42 +05:30
Nabin Hait
91034af0dc Get Query changes for tax account: allowed account type income/expense 2012-06-07 12:12:08 +05:30
Rushabh Mehta
9d18ebbf69 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-07 11:58:16 +05:30
Rushabh Mehta
e810f8eadc web-page name fix 2012-06-07 11:57:32 +05:30
Anand Doshi
afb3d53f55 fix in gs 2012-06-07 11:50:52 +05:30
Anand Doshi
e5de85aec2 fix in communication list in parent forms 2012-06-07 11:41:42 +05:30
Rushabh Mehta
a89f52041f communication is now created when email is sent 2012-06-07 11:30:02 +05:30
Rushabh Mehta
e97f8bbb5a Merge branch 'master' of github.com:webnotes/erpnext 2012-06-07 11:00:49 +05:30
Rushabh Mehta
0873e75fb2 better notification message 2012-06-07 11:00:33 +05:30
Anand Doshi
08c4f64d5f fix in communication listing 2012-06-06 13:19:38 +05:30
Anand Doshi
e37bf2215a do not load communication if no permission 2012-06-06 12:41:34 +05:30
Rushabh Mehta
c91e16dd1e email_digest updates 2012-06-06 11:27:38 +05:30
Rushabh Mehta
0b00b46a99 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-06 11:11:58 +05:30
Rushabh Mehta
260162db1b email digest: mobile friendly 2012-06-06 11:11:35 +05:30
Anand Doshi
937d838bdc min height for communication history and transaction history 2012-06-05 20:19:52 +05:30
Anand Doshi
49230000e5 communication log removal patch 2012-06-05 18:51:57 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
2012-06-05 18:37:17 +05:30
Anand Doshi
390b788e7b communication 2012-06-05 18:28:38 +05:30
Nabin Hait
252a7a189b Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice 2012-06-05 15:27:12 +05:30
Nabin Hait
f24d2efe2c Parent node validation fixed for tree 2012-06-05 10:41:27 +05:30
Nabin Hait
c84c86e458 customer info added in maintenance schedule event 2012-06-04 17:47:47 +05:30
Nabin Hait
6c34e1411f Flexible invoice period in recurring invoice 2012-06-04 16:21:25 +05:30
Nabin Hait
bc8e9d7a34 Flexible invoice period in recurring invoice 2012-06-04 16:18:38 +05:30
Nabin Hait
9ec73ccf1e Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 14:04:57 +05:30
Nabin Hait
6ea87a42a8 convert to group/ledger button hide/unhide issue fixed 2012-06-04 14:04:36 +05:30
Rushabh Mehta
983c551796 gantt chart fixes 2012-06-04 13:20:42 +05:30
Rushabh Mehta
07c94ce9c0 update in Task, notification and layout 2012-06-04 12:57:23 +05:30
Nabin Hait
aaab084a12 uom field added in pur invoice item table 2012-06-04 12:10:43 +05:30
Nabin Hait
d2301f9569 uom field added in pur invoice item table 2012-06-04 12:07:45 +05:30
Nabin Hait
765298bc63 uom field added in pur invoice item table 2012-06-04 12:02:56 +05:30
Nabin Hait
e4f2c7b213 series issue in attendance template 2012-06-04 11:48:50 +05:30
Nabin Hait
e91d8ccc5c Custom query for item in serial no 2012-06-04 10:47:44 +05:30
Nabin Hait
0e4afb910b parent node get_query modified in all tree 2012-06-04 10:32:31 +05:30
Nabin Hait
e315aba130 expected delivery date mandatory only if order type is sales 2012-06-01 10:11:14 +05:30
Anand Doshi
c5d857896e fixes in communication doctype 2012-05-31 18:23:16 +05:30
Nabin Hait
e44ebb1ec7 removed available qty validation in pos 2012-05-31 15:22:05 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Nabin Hait
fe678fd638 balance area only for accounts not for cost center 2012-05-31 13:32:45 +05:30
Nabin Hait
1835ee6c8b issue fixed 2012-05-31 12:28:07 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
6971f577da Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 15:47:47 +05:30
Anand Doshi
9c011f405d new rename doc function 2012-05-29 15:47:27 +05:30
Anand Doshi
82695ddd90 fixes in transaction history of customer and supplier 2012-05-29 14:14:27 +05:30
Anand Doshi
2ac77beb50 fix in packing list issue 2012-05-29 11:29:52 +05:30
Anand Doshi
53bac88d92 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 11:00:06 +05:30
Anand Doshi
2afe974a5b fix in remove euro currency patch 2012-05-29 10:58:28 +05:30
Rushabh Mehta
92c2c8f1f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37 show new reports as well as old 2012-05-29 10:53:37 +05:30
Anand Doshi
e012f06452 fix in purchase order validate currency's error messages, production order's produced qty field marked as no copy 2012-05-28 19:05:52 +05:30
Anand Doshi
3b091418ec allow zero payment in POS Invoice, when cash/bank account is not specified 2012-05-28 18:08:02 +05:30
Anand Doshi
2ad2426610 fix in get other charges of sales_common.py 2012-05-28 16:05:54 +05:30
Anand Doshi
4792f51e2a remove euro currency patch, address / contact supplier/customer can now contain slashes in their name 2012-05-28 13:26:17 +05:30
Anand Doshi
041cea763e fix in stock ledger entry for items have sales bom 2012-05-25 17:49:37 +05:30
Anand Doshi
16cf4fa806 fix in get_item_list, which was causing negative stock error 2012-05-25 16:54:27 +05:30
Anand Doshi
002191f166 fix in rename tool 2012-05-25 12:20:27 +05:30
Anand Doshi
fc243ea7d4 removed debug from maintenace scheduler 2012-05-24 15:56:34 +05:30
Anand Doshi
5fda36f2c0 fix in profile permissions and support ticket response should update modified datetime 2012-05-24 12:39:18 +05:30
Anand Doshi
fcbd2ad792 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 18:27:29 +05:30
Anand Doshi
9da0bf6106 fix in customer address contact report 2012-05-23 18:27:05 +05:30
Nabin Hait
4aaaa8af7b Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5 Merge branch 'shf_rename' 2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3 packing list code updated for duplicate items in item table 2012-05-23 16:21:39 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Nabin Hait
ea538bb9c7 fixed conflict 2012-05-23 12:57:05 +05:30
Nabin Hait
97bb6ce88b create report manager role patch 2012-05-23 12:55:11 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
53dab4ac40 validation in customer 2012-05-23 11:29:13 +05:30
Anand Doshi
38830ddae1 removed console log in customer.js 2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Anand Doshi
6033d96a56 fixes in style settings 2012-05-22 17:21:24 +05:30
Anand Doshi
e780f661a7 fix in transaction history 2012-05-22 17:04:33 +05:30
Nabin Hait
df9f8a363e Balance on chart of accounts 2012-05-22 16:54:46 +05:30
Nabin Hait
78b62cd865 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 16:23:27 +05:30
Nabin Hait
a21d2a9b38 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-22 14:54:25 +05:30
Nabin Hait
b695f73293 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 14:53:40 +05:30
Anand Doshi
f0babb7f0f fixes in cms 2012-05-22 13:41:51 +05:30
Anand Doshi
d287962cd9 removed the double check box in support ticket list 2012-05-21 19:36:47 +05:30
Rushabh Mehta
ceb2ab35e6 fixes in cms page generation 2012-05-21 15:56:50 +02:00
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +05:30
Anand Doshi
dedd8cc510 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-21 18:41:57 +05:30
Anand Doshi
2c4cd08844 more listviews 2012-05-21 18:40:53 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
Nabin Hait
cba9c716f2 Remove all those parent items from packing details which are no longer present in main item table 2012-05-21 15:35:23 +05:30
Nabin Hait
ee2201cc68 forced export limit increased to 2000 2012-05-21 15:13:57 +05:30
Anand Doshi
6420e602e0 make server side custom script readonly for system manager 2012-05-21 15:11:36 +05:30
Anand Doshi
8db7ff3b36 hide domain list field, as it is not functional currently 2012-05-21 14:59:45 +05:30
Nabin Hait
d429a20c6e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-21 14:51:04 +05:30
Nabin Hait
8b426a6142 customer issue cleanup 2012-05-21 14:50:28 +05:30
Nabin Hait
fec3f783af custom field included in docfield query 2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Nabin Hait
d9742a6a58 on_trash modified for item group, territory, customer group, and sales person 2012-05-21 13:33:09 +05:30
Anand Doshi
881f154275 change session cache storage as json 2012-05-21 13:13:10 +05:30
Rushabh Mehta
03a26f2ed2 list blogs based on creation date 2012-05-19 10:53:15 +05:30
Nabin Hait
c68635d70a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 18:37:28 +05:30
Nabin Hait
3b8d4776a2 company validation 2012-05-18 18:36:56 +05:30
Anand Doshi
df914991c4 Merge branch 'shf_rename' 2012-05-18 18:21:43 +05:30
Anand Doshi
bde13a655f moved uom next to qty in quotation item 2012-05-18 18:21:29 +05:30
Anand Doshi
fd3b19defa Merge branch 'shf_rename' 2012-05-18 18:08:44 +05:30
Anand Doshi
67a2e0123c moved po number and po date to basic info section of delivery note 2012-05-18 18:08:28 +05:30
Anand Doshi
0f7dd5453d Merge branch 'shf_rename' 2012-05-18 16:55:48 +05:30
Anand Doshi
227e9d3ac6 cleanup customize form 2012-05-18 16:55:20 +05:30
Anand Doshi
00175612ac Merge branch 'shf_rename'
Conflicts:
	erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1 new listviews 2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename'
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-05-18 11:52:31 +05:30
Anand Doshi
acd291a228 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 11:50:08 +05:30
Nabin Hait
c1f1702e22 so pending item patch 2012-05-18 11:43:10 +05:30
Nabin Hait
c58fbffc00 so pending item patch 2012-05-18 11:07:04 +05:30
Nabin Hait
a926468574 reload so pending items 2012-05-17 18:12:32 +05:30
Anand Doshi
fc9145425d Fixes in Print Formats - discount in description 2012-05-17 18:11:54 +05:30
Nabin Hait
7a13b238cb fixes in sales order pending items report 2012-05-17 18:06:14 +05:30
Nabin Hait
7638833b75 salary register issue fixed 2012-05-17 17:47:26 +05:30
Nabin Hait
f5e9dd7b96 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-17 17:10:59 +05:30
Nabin Hait
76d69b1000 salary register issue fixed 2012-05-17 17:10:15 +05:30
Anand Doshi
c7e26873c0 Merge branch 'shf_rename' 2012-05-17 15:28:54 +05:30
Anand Doshi
dad93ce8a3 fix in payment reconciliation 2012-05-17 15:28:38 +05:30
Nabin Hait
57f9bd1d73 bom issue fixed 2012-05-17 15:02:02 +05:30
Nabin Hait
86289d1291 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-17 12:48:19 +05:30
Nabin Hait
8b2473cc40 report fixed: sales persons target variance (item group wise) 2012-05-17 12:47:48 +05:30
Anand Doshi
ae4fc41e61 Merge branch 'shf_rename' 2012-05-16 14:35:15 +05:30
Anand Doshi
57599ebbae Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 14:11:24 +05:30
Anand Doshi
9175100e3d fixes in print format 2012-05-16 14:10:27 +05:30
Nabin Hait
76862b1ebc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 14:07:11 +05:30
Nabin Hait
7b87a7ec74 fixed pos settings 2012-05-16 14:07:02 +05:30
Anand Doshi
28335b7ee7 print format readonly patch 2012-05-16 13:44:06 +05:30
Anand Doshi
c51c0d38d7 Merge branch 'shf_rename' 2012-05-16 12:28:14 +05:30
Nabin Hait
f0c3fc47f9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 12:20:53 +05:30
Nabin Hait
86dec8da7a naming series issue fixed in pos settings 2012-05-16 12:20:21 +05:30
Anand Doshi
1bba28a723 Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-15 18:22:55 +05:30
Anand Doshi
a5a747fd8d reload sales invoice print formats 2012-05-15 18:17:52 +05:30
Nabin Hait
f044526b92 json error fixed in stock entry 2012-05-15 15:29:47 +05:30
Nabin Hait
901e92d8fa rejected qty issue fixed 2012-05-15 13:40:26 +05:30
Nabin Hait
0a1c5d9db6 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-15 12:15:44 +05:30
Nabin Hait
ed02a85184 fixed issue 2012-05-15 12:15:19 +05:30
Anand Doshi
f295591168 Merge branch 'shf_rename' 2012-05-14 18:03:45 +05:30
Anand Doshi
4ce0cd7274 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-14 18:03:12 +05:30
Anand Doshi
4924c96380 sync support emails only when sync_support_mails is set to 1 2012-05-14 18:02:21 +05:30
Rushabh Mehta
deeae62b18 merge js/css 2012-05-14 15:03:17 +05:30
Rushabh Mehta
6598b6276b fixes to website settings and linking import data in setup 2012-05-14 15:02:35 +05:30
Nabin Hait
a13b435163 invoice period in print format if recurring invoice 2012-05-14 14:11:56 +05:30
Anand Doshi
07af8f6247 fix in last purchase rate 2012-05-14 13:02:31 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
Anand Doshi
314c202340 more changes to last purchase rate 2012-05-11 18:38:11 +05:30
Anand Doshi
cec150b487 fixes in last purchase rate 2012-05-11 18:13:53 +05:30
Rushabh Mehta
7483ae9573 fix in button disablity leading to double click 2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361 fetch defaults after mapping from prev document 2012-05-11 14:45:02 +05:30
Nabin Hait
bd3d3ca1eb error fixed in sending mail on submitting of sal slip 2012-05-11 13:36:17 +05:30
Nabin Hait
43dd041ced page role series pacth 2012-05-11 11:47:18 +05:30
Nabin Hait
a5b8ac4867 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-11 11:12:23 +05:30
Nabin Hait
41526227e3 page role series pacth 2012-05-11 11:11:46 +05:30
Anand Doshi
df74d30cf1 fix in listview of journal voucher 2012-05-10 19:19:31 +05:30
Rushabh Mehta
7f523ac33c merge 2012-05-10 19:11:00 +05:30
Rushabh Mehta
ea7ba72397 data import and upload issues 2012-05-10 19:07:53 +05:30
Anand Doshi
2f53eba3dc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-10 18:48:47 +05:30
Anand Doshi
02c0eaf99a don't show currency in journal voucher's listview 2012-05-10 18:48:15 +05:30
Nabin Hait
ef85c4e556 posting time fixes in stock ledger entry 2012-05-10 17:48:34 +05:30
Anand Doshi
4b1a44f4a7 fix blog page 2012-05-10 15:44:36 +05:30
Anand Doshi
3fa25faca2 fixes after merge with cms 2012-05-10 15:15:43 +05:30
Nabin Hait
91d6d1423d reload reports 2012-05-10 14:32:56 +05:30
Nabin Hait
3f7b883010 reload reports 2012-05-10 14:32:02 +05:30
Anand Doshi
e463fc6300 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-10 14:20:09 +05:30
Anand Doshi
951d8ec342 fix in issues arising due to wn.require 2012-05-10 14:19:11 +05:30
Nabin Hait
6fb498ebcd changed field position of net total(import) 2012-05-10 14:03:39 +05:30
Nabin Hait
a15740a974 fixed issue 2012-05-10 12:56:40 +05:30
Anand Doshi
bf68e04d2f Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	erpnext/patches/patch_list.py
2012-05-10 12:40:58 +05:30
Nabin Hait
fdeb55ba69 stock reco patch 2012-05-10 12:18:11 +05:30
Nabin Hait
08f4cb7f6a stock reco fix in valuation and cancellation 2012-05-10 12:13:47 +05:30
Anand Doshi
df8b4ab9b1 Merge branch 'cms' 2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Rushabh Mehta
81dba76699 cms updates 2012-05-09 15:37:54 +05:30
Nabin Hait
7f82256394 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-09 15:27:03 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Rushabh Mehta
be93aa027f cms fixes 2012-05-09 14:44:40 +05:30
Rushabh Mehta
fa390039ff cms fixes 2012-05-09 14:41:36 +05:30
Rushabh Mehta
caf4e374ab cms fixes 2012-05-09 14:40:44 +05:30
Rushabh Mehta
9454ccc5b8 cms fixes 2012-05-09 14:35:00 +05:30
Rushabh Mehta
cb1f1d81aa cms patch 2012-05-09 14:10:49 +05:30
Rushabh Mehta
e45042e011 merge 2012-05-09 12:22:50 +05:30
Rushabh Mehta
b9483d1809 cms updates 2012-05-09 11:42:52 +05:30
Anand Doshi
c241a476ab moved shipping address in basic info section 2012-05-09 11:07:15 +05:30
Rushabh Mehta
458ca8eddb cms fixes 2012-05-09 10:17:08 +05:30
Nabin Hait
a6b8e84f09 removed whong depends on value 2012-05-08 17:18:40 +05:30
Rushabh Mehta
a933b632ad templates cleaner and generation for all pages 2012-05-08 16:06:44 +05:30
Rushabh Mehta
5ab8163140 fixes to routing and activating web page 2012-05-08 12:58:32 +05:30
Nabin Hait
6d6ca4bdb8 mapper fix 2012-05-08 11:51:35 +05:30
Rushabh Mehta
c22d9e03e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms 2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Nabin Hait
c22bd05bb5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 17:35:45 +05:30
Nabin Hait
5375627bca stock reco issue fixed 2012-05-07 17:35:15 +05:30
Anand Doshi
a00852ce19 fix in purchase receipt - show challan no for indian customers 2012-05-07 16:59:28 +05:30
Nabin Hait
12ec1db2fa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 12:00:00 +05:30
Nabin Hait
5f4ca56fd1 Fixes related to renamedt 2012-05-07 11:59:23 +05:30
Rushabh Mehta
7ef15ce7fe Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 10:44:24 +05:30
Rushabh Mehta
252664e288 remove unsupported for google 2012-05-07 10:43:18 +05:30
Anand Doshi
ebc3b87f8d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-05 20:06:43 +05:30
Anand Doshi
f36aee2c6b fix in contact address saving issue 2012-05-05 20:05:58 +05:30
Nabin Hait
875ccac151 stock reco cancellation issue fxed 2012-05-04 18:48:30 +05:30
Nabin Hait
b5d50dcc53 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 17:56:00 +05:30
Nabin Hait
ce4d297641 rename dt in custom search criteria 2012-05-04 17:55:32 +05:30
Anand Doshi
29d36a6cea fixes in account setup 2012-05-04 16:20:30 +05:30
Anand Doshi
bc1d74dbfe fix in landed cost master query 2012-05-04 13:13:44 +05:30
Anand Doshi
837baee1b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 13:05:36 +05:30
Anand Doshi
cc1583de88 fix in landed cost master 2012-05-04 13:04:40 +05:30
Nabin Hait
8cf9934b93 Trend analyzer issue fixed 2012-05-04 12:52:56 +05:30
Nabin Hait
978a1e0e46 field rearranged in sales invoice 2012-05-04 11:57:55 +05:30
Nabin Hait
ff81c37689 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 11:46:38 +05:30
Nabin Hait
0fb4eeb5bb cancellation issue fixed in stock reco 2012-05-04 11:46:07 +05:30
Rushabh Mehta
f9c766ad3a login-topbar id fix 2012-05-04 11:41:57 +05:30
Rushabh Mehta
7f5791ba1e jv, search fix 2012-05-04 10:10:30 +05:30
Rushabh Mehta
22cd09beb3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 10:02:51 +05:30
Rushabh Mehta
5a774db021 delivery, not and sales_bom 2012-05-04 10:02:09 +05:30
Nabin Hait
7c60fc13b2 reports fixed: itemwise sales/delivery report 2012-05-03 18:22:32 +05:30
Nabin Hait
a67f706c92 options did not updated in stock entry 2012-05-03 18:09:15 +05:30
Nabin Hait
0f11df13bb Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 17:50:06 +05:30
Nabin Hait
d8df7b5884 quotation fix 2012-05-03 17:49:45 +05:30
Anand Doshi
f09bd67e53 fix in security settings 2012-05-03 16:44:54 +05:30
Anand Doshi
ee9863cfce Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 16:27:20 +05:30
Anand Doshi
4b6c1f8de5 fixes in notification control due to renaming of doctype 2012-05-03 16:26:38 +05:30
Nabin Hait
d315cb5eb7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 14:55:36 +05:30
Nabin Hait
dc7ffe47b2 fixes in quotation 2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648 fixes in quotation 2012-05-03 14:41:35 +05:30
Anand Doshi
47fac1804b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 13:23:32 +05:30
Anand Doshi
359852e3d9 fix in email digest 2012-05-03 13:23:06 +05:30
Nabin Hait
618331672d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 13:10:52 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Anand Doshi
57bc3f424f fix in email digest 2012-05-03 12:57:56 +05:30
Anand Doshi
996abdd155 fix in email digest 2012-05-03 12:48:44 +05:30
Anand Doshi
a467eee917 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 12:38:01 +05:30
Anand Doshi
e5982c0399 email digest fixes 2012-05-03 12:37:26 +05:30
Rushabh Mehta
ce02a74dbc login id for topbar 2012-05-03 10:57:03 +05:30
Rushabh Mehta
39489278ec update messages fix 2012-05-03 10:44:44 +05:30
Rushabh Mehta
28bb342f96 list view for purchase receipt 2012-05-03 10:41:19 +05:30
Rushabh Mehta
3d0c9ba22d added listview for stock entry, listview templates 2012-05-03 10:35:51 +05:30
Rushabh Mehta
182569feb0 shipping address on top for delivery note 2012-05-03 10:28:23 +05:30
Rushabh Mehta
acd0769098 list in listview and sales order fix 2012-05-03 10:20:38 +05:30
Nabin Hait
8c04a1fe77 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 17:59:20 +05:30
Nabin Hait
b92d9ef618 removed patch file specific to bullows 2012-05-02 17:58:13 +05:30
Rushabh Mehta
d5e1031f42 floating logo on left 2012-05-02 17:44:59 +05:30
Nabin Hait
52ca9a1ed1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 16:05:15 +05:30
Nabin Hait
00ba2ce8b4 fixes in sales and pur return 2012-05-02 16:04:42 +05:30
Rushabh Mehta
f2c3db6e83 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 15:30:58 +05:30
Rushabh Mehta
4ee56c064e added ace editor 2012-05-02 15:30:15 +05:30
Nabin Hait
a4561e14aa patch list updated 2012-05-02 14:58:53 +05:30
Nabin Hait
7ef8168dbc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 14:56:17 +05:30
Nabin Hait
afb704c940 rename fix in prev doctype 2012-05-02 14:56:00 +05:30
Rushabh Mehta
30ab0227b3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 13:45:25 +05:30
Rushabh Mehta
aa51377e94 custom startup 2012-05-02 13:03:41 +05:30
Anand Doshi
187ac7ccf1 delete question-view page 2012-05-02 12:23:44 +05:30
Anand Doshi
60118662ff delete question-view page 2012-05-02 12:23:05 +05:30
Anand Doshi
b1f46c80b2 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:21:53 +05:30
Anand Doshi
e876ac2005 delete question-view page 2012-05-02 12:21:27 +05:30
Nabin Hait
a4e9a52ea3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:19:59 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Rushabh Mehta
7b4a60a980 form toolbar lables and support ticket fix 2012-05-02 11:35:04 +05:30
Nabin Hait
c55d83b36e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:36:29 +05:30
Nabin Hait
dd200d363e cleanup property setter patch 2012-05-02 10:36:16 +05:30
Nabin Hait
50a0cadb9f cleanup property setter patch 2012-05-02 10:32:28 +05:30
Rushabh Mehta
b21307767d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:22:20 +05:30
Rushabh Mehta
a0571fe570 toolbar fix for null 2012-05-02 10:20:40 +05:30
Nabin Hait
8d6917dc04 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:00:44 +05:30
Nabin Hait
07c3b399f6 field arrngement fix 2012-05-02 10:00:03 +05:30
Rushabh Mehta
8eba118379 font fix 2012-05-02 09:45:28 +05:30
Anand Doshi
98ae634c50 fixes in sales order item widths 2012-05-01 18:31:40 +05:30
Nabin Hait
722bbd8ef0 JV fix 2012-05-01 16:36:51 +05:30
Nabin Hait
5af62d0857 fixed conflict using theirs 2012-05-01 16:29:40 +05:30
Nabin Hait
796505a83e field arrangement in purchase and stock cycle 2012-05-01 16:26:16 +05:30
Rushabh Mehta
8360a5f729 no address in footer 2012-05-01 16:23:05 +05:30
Rushabh Mehta
c59fc6623b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-01 16:15:37 +05:30
Rushabh Mehta
39c47a0b4b blog sequence 2012-05-01 16:15:09 +05:30
Anand Doshi
23e777545a fix in naming series patch's execution 2012-05-01 16:05:23 +05:30
Rushabh Mehta
58bf2379a0 double dashbaord 2012-05-01 15:18:26 +05:30
Rushabh Mehta
ef048f7256 fix to profile_settings 2012-05-01 14:56:20 +05:30
Rushabh Mehta
30e3f157bc fix to startupjs 2012-05-01 14:07:41 +05:30
Rushabh Mehta
efed5239f0 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-01 13:43:03 +05:30
Rushabh Mehta
6f8e9e951e website fixes 2012-05-01 13:41:44 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Anand Doshi
3f6eed2dc2 fix in account subscription info box creation 2012-05-01 12:23:28 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647 field arrangement in sales cycle 2012-05-01 11:37:13 +05:30
Nabin Hait
1e335f3272 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:53:50 +05:30
Nabin Hait
41c62727c7 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:45:47 +05:30
Anand Doshi
563fcc1b05 fix in startup.js 2012-04-30 21:06:31 +05:30
Anand Doshi
5c2a792d03 if max_users = 0, consider unlimited users 2012-04-30 20:03:23 +05:30
Anand Doshi
954567b87f Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 20:01:00 +05:30
Anand Doshi
4b2b159d12 if max_users = 0, consider unlimited users 2012-04-30 20:00:19 +05:30
Rushabh Mehta
45850fe496 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:38:40 +05:30
Anand Doshi
84777ac457 change in expiry message 2012-04-30 18:33:32 +05:30
Rushabh Mehta
2ab4451d1b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:05:47 +05:30
Nabin Hait
228d03ec01 posting time fix 2012-04-30 16:59:39 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Anand Doshi
72308564be Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 15:44:02 +05:30
Anand Doshi
2aa9ba63e3 fixes in select field type 2012-04-30 15:43:34 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Rushabh Mehta
542acf6757 website, product and grid bugfix 2012-04-30 14:23:12 +05:30
Rushabh Mehta
963c651f2c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 14:22:50 +05:30
Rushabh Mehta
a4be4d3390 website, product and grid bugfix 2012-04-30 14:22:02 +05:30
Anand Doshi
b60807c325 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 12:23:03 +05:30
Anand Doshi
c55d9ad033 working on setup account 2012-04-30 12:22:47 +05:30
Anand Doshi
8cffe7e440 fix in support ticket, expiry banner 2012-04-30 12:13:51 +05:30
Nabin Hait
28b9551acf fixes in patch 2012-04-30 11:55:25 +05:30
Nabin Hait
d1ac71c3e7 patch list updated 2012-04-30 11:53:58 +05:30
Nabin Hait
d4c5a9e2c4 fixes in bin 2012-04-30 11:50:34 +05:30
Nabin Hait
3e8f35c09e fixes in bin 2012-04-30 11:47:45 +05:30
Nabin Hait
fc51f995c8 fixes in bin 2012-04-30 11:43:16 +05:30
Rushabh Mehta
30cb5c20a1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:39:56 +05:30
Rushabh Mehta
389880d0b6 more website cleanups 2012-04-27 18:39:14 +05:30
Nabin Hait
7ff69e10bf repost stock for entries where posting time goes wrong 2012-04-27 18:27:06 +05:30
Nabin Hait
ebbd328977 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:15:13 +05:30
Anand Doshi
f5216b46e3 fixes 2012-04-27 18:03:47 +05:30
Nabin Hait
914d67a1a3 selective deletes from child table while overwriting 2012-04-27 17:47:46 +05:30
Anand Doshi
864e220ec5 fixes in serial no patch 2012-04-27 17:12:47 +05:30
Anand Doshi
d461148296 fix in reload_c_form path 2012-04-27 17:05:50 +05:30
Anand Doshi
3fbf2ec0c5 fix in setup control 2012-04-27 16:11:56 +05:30
Anand Doshi
1dac43159a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 15:31:35 +05:30
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Nabin Hait
201f8ca821 fixed conflict in sales bom using ours 2012-04-27 14:03:06 +05:30
Nabin Hait
b931f37735 fixed conflict using ours 2012-04-27 13:59:39 +05:30
Nabin Hait
0d1daa8875 fld order change 2012-04-27 13:56:58 +05:30
Nabin Hait
de975ff307 fixed filtering issue in gs 2012-04-27 13:53:20 +05:30
Nabin Hait
762056aaa8 sales bom amendment issue fixed 2012-04-27 11:06:12 +05:30
Nabin Hait
727431b7b1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 11:04:44 +05:30
Nabin Hait
b9d3ade2f4 sales bom issue fixed 2012-04-27 11:04:11 +05:30
Rushabh Mehta
2e16a01efd Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 19:02:32 +05:30
Rushabh Mehta
702473d65e website updates 2012-04-26 19:01:35 +05:30
Nabin Hait
92ec4dcb6f minor fixes 2012-04-26 13:13:10 +05:30
Nabin Hait
2453740621 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 13:03:18 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
5a6e641565 fixed batch issue 2012-04-26 11:11:34 +05:30
Rushabh Mehta
44279f87b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-25 18:25:29 +05:30
Nabin Hait
aa577ed82e serial no fixes: sle creation through import data 2012-04-25 18:25:13 +05:30
Rushabh Mehta
dcfdfc317c fixes to website module and fixed rename and double column bugs 2012-04-25 18:24:44 +05:30
Nabin Hait
04a276c934 Error fixed in gl netry when negative entry and cancel event 2012-04-25 16:08:45 +05:30
Nabin Hait
ed7de5fee2 posting time format validation 2012-04-25 15:07:46 +05:30
Nabin Hait
4626b27038 updated sales bom document 2012-04-24 15:17:56 +05:30
Nabin Hait
d98ca01082 fixed wrong serial no qty validation 2012-04-24 14:07:04 +05:30
Nabin Hait
3afecb9e30 update permission in appraisal 2012-04-24 13:32:26 +05:30
Nabin Hait
9a6dbfca8f updated permlevel in address 2012-04-24 12:40:50 +05:30
Nabin Hait
dd828be432 updated patch list 2012-04-24 12:25:39 +05:30
Nabin Hait
3fb741c3ef update role in address 2012-04-24 12:23:12 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
e6d808820a Error fixed in notification control 2012-04-24 11:06:48 +05:30
Nabin Hait
4c9525139d Error fixed in stock ledger netry batch related 2012-04-24 10:38:37 +05:30
Nabin Hait
8f9a953931 Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py 2012-04-23 19:00:39 +05:30
Nabin Hait
69f6d79791 patch list modified 2012-04-23 18:27:53 +05:30
Nabin Hait
a45f44d805 remove def val from rv detail cost center 2012-04-23 18:26:08 +05:30
Nabin Hait
e848300958 patch list modified 2012-04-23 18:24:22 +05:30
Nabin Hait
ca102d567e change cacheitem schema 2012-04-23 18:23:17 +05:30
Nabin Hait
2bbb086b10 Update erpnext/accounts/doctype/rv_detail/rv_detail.txt 2012-04-23 17:57:18 +05:30
Nabin Hait
9ceaccce86 create custom flds for bullows account 2012-04-23 16:04:41 +05:30
Nabin Hait
c425d8bd16 after sync cleanup 2012-04-23 16:04:16 +05:30
Nabin Hait
708917db50 some fixes in cleanup 2012-04-23 16:03:38 +05:30
Nabin Hait
6dbfcdbe5c Merge branch 'master' of github.com:webnotes/erpnext 2012-04-23 14:03:22 +05:30
Nabin Hait
b743bb6c10 ledger bal export format changed 2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Nabin Hait
15230eb955 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-23 12:17:41 +05:30
Nabin Hait
6ed865f89a Fld label based on currency 2012-04-23 10:37:28 +05:30
Rushabh Mehta
f4a8c87db5 kb bug fix 2012-04-23 10:31:29 +05:30
Nabin Hait
a8d83b6c51 update modified date 2012-04-20 14:02:44 +05:30
Nabin Hait
f19bb52b2a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:59:22 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Rushabh Mehta
5bce61d58e merge 2012-04-20 13:40:48 +05:30
Rushabh Mehta
f30d1a0515 report builder - sort, save, pre-select columns, Report DocType 2012-04-20 13:37:49 +05:30
Nabin Hait
0788570ce7 automatically write off feature in sales invoice 2012-04-20 13:31:05 +05:30
Anand Doshi
b301251090 Store base currency on client side 2012-04-20 11:51:27 +05:30
Anand Doshi
9e0221c58e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 11:22:38 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Anand Doshi
37df8abfc7 knowledge base module removed 2012-04-20 11:17:10 +05:30
Nabin Hait
b9984c8995 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 10:25:33 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
7c135ed2fc projects date_format to be fetched from wn.boot.sysdefaults 2012-04-19 17:58:56 +05:30
Rushabh Mehta
6ff95727e1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-19 17:49:44 +05:30
Rushabh Mehta
a11bc07a7f new report builder - todo: sort, save 2012-04-19 17:48:57 +05:30
Nabin Hait
94329abd02 modifed format for raw material report in prod plan 2012-04-19 16:08:33 +05:30
Nabin Hait
776e8572a2 issue fixed in prod plan 2012-04-19 15:00:48 +05:30
Nabin Hait
cba6f9148a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-19 13:56:04 +05:30
Nabin Hait
40738aecfa removed msgprint 2012-04-19 13:55:45 +05:30
Anand Doshi
b50a7a5ff9 Fix in rate fetching on get item details, when using inclusive rate 2012-04-19 12:00:49 +05:30
Anand Doshi
f642168a26 hr home: changed Allocate Leaves --> Leave Allocation Tool 2012-04-18 18:35:30 +05:30
Anand Doshi
7c67aad059 removed account_url from global defaults 2012-04-18 17:25:06 +05:30
Anand Doshi
2d56115c08 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 17:18:06 +05:30
Anand Doshi
619e16c956 removed account_url from global defaults 2012-04-18 17:17:02 +05:30
Rushabh Mehta
81c8ec2b89 knowledge base cleanup 2012-04-18 17:14:33 +05:30
Rushabh Mehta
46162c4e35 knowledge base cleanup 2012-04-18 16:59:37 +05:30
Rushabh Mehta
b194eb83a9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:56:09 +05:30
Rushabh Mehta
edab76b274 knowledge base cleanup 2012-04-18 16:55:43 +05:30
Nabin Hait
66c7fbca8a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-18 16:18:58 +05:30
Nabin Hait
6da191de03 negative stock fixes 2012-04-18 16:18:20 +05:30
Anand Doshi
8d1a0b4061 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:08:15 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Nabin Hait
97051ba79f allow negative stock field in global defaults 2012-04-18 12:51:11 +05:30
Rushabh Mehta
5fc06554ff question css 2012-04-18 12:50:09 +05:30
Nabin Hait
4776d3e097 Update erpnext/production/doctype/bill_of_materials/bill_of_materials.js 2012-04-18 12:37:01 +05:30
Rushabh Mehta
b12349a768 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 12:34:43 +05:30
Rushabh Mehta
3a9ddaf2c1 permission engine bugfix 2012-04-18 12:34:18 +05:30
Nabin Hait
7afc2124a6 allow negative qty feature 2012-04-18 12:04:20 +05:30
Anand Doshi
1fb128158c fix in support ticket options of naming_series 2012-04-18 11:18:54 +05:30
Anand Doshi
40808e18f1 minor fixes 2012-04-17 18:43:29 +05:30
Nabin Hait
69e7eb4f3d Merge branch 'master' of github.com:webnotes/erpnext 2012-04-17 18:06:10 +05:30
Nabin Hait
5da9d56047 removed voucher date filter 2012-04-17 18:05:58 +05:30
Anand Doshi
c9d1ac4112 fix - show about of application 2012-04-17 13:54:53 +05:30
Anand Doshi
44f16eaefa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f fix in doclistview - check if _user_tags exists before rendering 2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Anand Doshi
b2974e8e59 fix in delete check 2012-04-17 11:57:50 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
acb3d56e02 fix in install docs 2012-04-17 11:39:18 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Rushabh Mehta
6910ec1946 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 18:37:33 +05:30
Rushabh Mehta
71085592a4 fixed account_browser 2012-04-16 18:36:46 +05:30
Nabin Hait
fe127c216c fixed issue in stock 2012-04-16 16:01:02 +05:30
Rushabh Mehta
6610d390e1 merge 2012-04-16 14:49:11 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-04-16 13:41:06 +05:30
Rushabh Mehta
449f56db75 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 13:35:53 +05:30
Rushabh Mehta
6820dbf72d framework build 2012-04-16 13:33:14 +05:30
Nabin Hait
eaf8b91402 hr reports cleanup 2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0 fixed hr issues 2012-04-16 12:22:47 +05:30
Rushabh Mehta
0c18b18b84 new framework build 2012-04-16 11:18:45 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Rushabh Mehta
f465b4fa76 merge 2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02 started rewrite of accounts browser 2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Anand Doshi
a0f6a3eab7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136 Merge branch 'master' into shf_rename 2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7 fixes in se js 2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253 all fields visible if any other custom purpose in stock entry 2012-04-13 14:13:02 +05:30
Anand Doshi
6af47a8c37 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 13:13:54 +05:30
Anand Doshi
b3ab90a01a field changes in sp return tool 2012-04-13 12:38:34 +05:30
Anand Doshi
800b214ff3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 12:37:23 +05:30
Anand Doshi
3abe9bd018 fixes in fieldnames and hide unnecessary fields in jv 2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e Added doc_type to JV Print Formats 2012-04-13 12:27:56 +05:30
Nabin Hait
7fca9e617d fixes in global defaults 2012-04-13 12:18:06 +05:30
Rushabh Mehta
d76146372e merge 2012-04-13 12:01:23 +05:30
Nabin Hait
b176e94b92 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Anand Doshi
7aafb7e19e Purchase Requisition to Purchase Request 2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
44e954f509 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-12 17:52:09 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Nabin Hait
3cb148e53b fixed conflict 2012-04-12 16:44:23 +05:30
Nabin Hait
de237e2bf7 error fixed 2012-04-12 16:36:01 +05:30
Anand Doshi
25bc68c7b2 fix in field names 2012-04-12 14:08:43 +05:30
Anand Doshi
654f6bfa85 fixes 2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269 fixes in button function calling 2012-04-11 19:07:02 +05:30
Anand Doshi
5ed0b6971c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Anand Doshi
ece64fa908 fixes 2012-04-10 19:18:00 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Nabin Hait
7a3faa9575 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-10 18:07:51 +05:30
Nabin Hait
af094b9daf ledger balance export report in new format 2012-04-10 18:07:36 +05:30
Nabin Hait
0a8a487230 Update erpnext/stock/doctype/item/item.js 2012-04-10 16:50:23 +05:30
Anand Doshi
a9ccc7d6bd naming series changes now saved as property setter 2012-04-10 15:31:48 +05:30
Anand Doshi
cfcaf38111 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-10 12:39:15 +05:30
Anand Doshi
966b6f1aa0 fix in patches 2012-04-10 12:38:17 +05:30
Rushabh Mehta
db05aacbc4 merge 2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14 website style fixes 2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Anand Doshi
9afb57ffb2 Syntax error fix in c_form.txt 2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
Anand Doshi
85eb840ab4 fix in rename dt patch 2012-04-09 12:02:15 +05:30
Rushabh Mehta
b43f949e93 website smaller 2012-04-08 20:33:51 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Nabin Hait
3525d92cfb c-form reload pach 2012-04-06 17:49:25 +05:30
Nabin Hait
c63a58d416 c-form reload pach 2012-04-06 17:42:02 +05:30
Nabin Hait
7da6ebc9af Attachment option and total invoiced amt added in c-form 2012-04-06 17:30:53 +05:30
Nabin Hait
1299dab010 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-06 15:19:18 +05:30
Nabin Hait
05e4fc6eb6 Chart of account/cc link only for accounts user and account manager role in account home page 2012-04-06 15:19:02 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Nabin Hait
9ba2e49468 Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:54:19 +05:30
Nabin Hait
758eed555c Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:45:33 +05:30
Nabin Hait
f77c940fcf fixed price list currency issue 2012-04-05 16:29:02 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
00ceafb42d fix in fiscal year of email digest 2012-04-03 18:43:17 +05:30
Anand Doshi
fc8bf7b1d8 add select type link fields in permission control 2012-04-03 13:49:14 +05:30
Anand Doshi
e9c505608a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-03 13:23:14 +05:30
Anand Doshi
a6eb15df4a fix in earning and deduction type field tyep 2012-04-03 13:22:20 +05:30
Anand Doshi
130dfaee8c fix in todo 2012-04-03 12:18:35 +05:30
Nabin Hait
1b81badd58 validation changes for po item 2012-04-03 11:27:03 +05:30
Anand Doshi
be9562dcd5 rerun of rename_dt 2012-04-02 19:13:00 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
5c6cdb06b2 fix in decimal places 2012-04-02 15:02:34 +05:30
Rushabh Mehta
c7f1e5a54a patch fixes 2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66 patch fixes 2012-04-02 14:06:46 +05:30
Anand Doshi
896c6fdc3c fix in patch order 2012-04-02 14:06:33 +05:30
Anand Doshi
0442bc5d63 fix in patch list 2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename
Conflicts:
	erpnext/patches/patch_list.py
2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Anand Doshi
0442b4e207 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-29 15:22:15 +05:30
Anand Doshi
66722dfe69 some buying listviews 2012-03-29 15:20:35 +05:30
Nabin Hait
dc8ce0190d Merge branch 'master' into renamedt 2012-03-29 11:53:02 +05:30
Anand Doshi
8ac5ccae0a fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:29:55 +05:30
Anand Doshi
9767f79845 fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:25:29 +05:30
Anand Doshi
419260298b fix in mapper 2012-03-28 19:12:36 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8 Merge branch 'master' into handlerupdate 2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Nabin Hait
79bc01e33d updated rename_dt 2012-03-28 16:19:01 +05:30
Nabin Hait
6370ba8280 Merge branch 'master' of github.com:webnotes/erpnext into renamedt 2012-03-28 16:17:53 +05:30
Rushabh Mehta
0dfa140b7d Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 10:42:20 +02:00
Nabin Hait
e6340f26c2 mapper fix in DN_RV 2012-03-28 14:11:31 +05:30
Rushabh Mehta
c0fdaaf2c6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:08:47 +02:00
Nabin Hait
5b00addaf7 reload mapper for checking ref value 2012-03-28 11:38:25 +05:30
Rushabh Mehta
bb769c5461 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:04:17 +02:00
Nabin Hait
13f789701e erro fixed in reorder_item 2012-03-28 11:33:25 +05:30
Nabin Hait
df77a1f619 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 11:32:58 +05:30
Nabin Hait
6ed0450dba reload mapper for checking ref value 2012-03-28 11:32:44 +05:30
Anand Doshi
b489297108 added delete_docformat in patch_list 2012-03-27 19:41:45 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Nabin Hait
a0a3ca3178 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-27 17:09:03 +05:30
Anand Doshi
3107096890 Merge branch 'master' of github.com:webnotes/erpnext into shf_merge 2012-03-27 15:02:38 +05:30
Anand Doshi
66ea30543c sync patches 2012-03-27 15:02:30 +05:30
Anand Doshi
94d26f0338 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 22:34:18 +05:30
Anand Doshi
063fe503db fix in queries in stock reconciliation 2012-03-26 22:32:34 +05:30
Rushabh Mehta
91c79305e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 12:11:22 +02:00
Nabin Hait
854935f12c added docstatus in item get_query in PV 2012-03-26 15:40:56 +05:30
Nabin Hait
b66ade11e0 modified item code get_query in purchase cycle 2012-03-26 15:30:11 +05:30
Rushabh Mehta
20dc45f7bd Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 10:50:40 +02:00
Anand Doshi
c009450ef0 fix in item addition - details fetching 2012-03-26 14:17:30 +05:30
Nabin Hait
eecea8ef19 modified item code get_query in purchase cycle 2012-03-26 13:11:15 +05:30
Rushabh Mehta
4227d3fe58 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 08:23:18 +02:00
Nabin Hait
9329b5a461 modified item code get_query in purchase cycle 2012-03-26 11:52:16 +05:30
Rushabh Mehta
4a19819fe9 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 08:12:32 +02:00
Anand Doshi
4943af6d6c fix in address issue - customer coming in supplied field 2012-03-26 11:42:09 +05:30
Rushabh Mehta
6fd7395101 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 08:03:19 +02:00
Nabin Hait
ea36202fbf modified item code get_query in purchase cycle 2012-03-26 11:33:03 +05:30
Rushabh Mehta
5b80423dbb Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:55:45 +02:00
Nabin Hait
2bd086f1c3 modified item code get_query in purchase cycle 2012-03-26 11:25:31 +05:30
Rushabh Mehta
f06d6f34e7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:48:21 +02:00
Nabin Hait
68764ce775 modified item code get_query in purchase cycle 2012-03-26 11:16:41 +05:30
Nabin Hait
e2fe5629f0 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 11:07:01 +05:30
Nabin Hait
bb6f10098e updated rename_dt 2012-03-26 11:06:34 +05:30
Rushabh Mehta
9d0ea6a5f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:25:22 +02:00
Nabin Hait
6d4ee80cca Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 10:54:31 +05:30
Anand Doshi
964dee9f18 fix in stock reconciliation 2012-03-26 10:54:05 +05:30
Nabin Hait
67016dcfea Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 10:54:05 +05:30
Nabin Hait
f23d18316a modified item code get_query in purchase cycle 2012-03-26 10:53:45 +05:30
Rushabh Mehta
339afe858c link empty value and kb fix 2012-03-23 15:54:49 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge
Conflicts:
	erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Anand Doshi
2d4139cbeb sync_handler_merge 2012-03-23 14:46:07 +05:30
Rushabh Mehta
b6f808846d website fixes 2012-03-23 14:19:49 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
	js/all-app.js
	version.num
2012-03-23 13:55:20 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Anand Doshi
358304d216 fix in sales common regarding date formatting 2012-03-23 11:12:03 +05:30
Nabin Hait
191e55f1bc sync ref db patch 2012-03-22 15:07:28 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Anand Doshi
7944b4b888 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 14:34:35 +05:30
Anand Doshi
3697534f10 Merge branch 'master' into handlerupdate 2012-03-22 14:32:10 +05:30
Rushabh Mehta
479061df9c merge 2012-03-22 13:53:34 +05:30
Rushabh Mehta
fa0e7b6933 listing/messages fix 2012-03-22 13:44:04 +05:30
Anand Doshi
8463870a4f Added Custom Scripts in setup page 2012-03-22 13:39:23 +05:30
Rushabh Mehta
1952f5b033 lead listview 2012-03-22 12:21:56 +05:30
Rushabh Mehta
6ac1d73731 lead listview 2012-03-22 12:10:49 +05:30
Rushabh Mehta
27cf13b541 merge 2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Anand Doshi
98f847c01f fix in todo 2012-03-22 11:18:28 +05:30
Rushabh Mehta
a12a28bec6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-22 06:35:35 +01:00
Anand Doshi
f1eb1b1508 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 11:02:46 +05:30
Anand Doshi
06fcfdfcde assign to - allow comments 2012-03-22 11:01:38 +05:30
Rushabh Mehta
aaac794a8e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:08:04 +01:00
Nabin Hait
40d4b4d939 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:34:13 +05:30
Nabin Hait
2f82219fd0 item query changes in stock entry 2012-03-22 10:32:06 +05:30
Nabin Hait
9066dcaba5 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:26:07 +05:30
Nabin Hait
afeeb9c484 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:24:39 +05:30
Nabin Hait
bad13149b2 item query changes in stock entry 2012-03-22 10:24:26 +05:30
Rushabh Mehta
d0f26026af Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 13:34:00 +01:00
Anand Doshi
29ed95ba22 simple fixes in todo 2012-03-21 18:02:17 +05:30
Anand Doshi
71d0b2a428 permission engine fix - is doctype submittable 2012-03-21 17:15:49 +05:30
Rushabh Mehta
b1f77d1bde Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:39:54 +01:00
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Nabin Hait
653536596d fax added in address display 2012-03-21 17:07:42 +05:30
Rushabh Mehta
2d229b423e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:28:42 +01:00
Nabin Hait
d551281cbe cdt not defined fixed 2012-03-21 16:57:08 +05:30
Rushabh Mehta
9851fcef2c Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:33:27 +01:00
Nabin Hait
93162f603d update bom no options in stock entry 2012-03-21 16:02:44 +05:30
Rushabh Mehta
c1f8af58d1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:29:06 +01:00
Nabin Hait
31fcc4bb36 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 15:57:07 +05:30
Nabin Hait
830b8baa9d update bom no options in stock entry 2012-03-21 15:56:22 +05:30
Nabin Hait
2a68bdf231 Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:50:14 +05:30
Rushabh Mehta
e07c38f5f5 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:06:38 +01:00
Nabin Hait
c37cb4d7c3 Update erpnext/stock/doctype/stock_entry/stock_entry.js 2012-03-21 15:35:41 +05:30
Nabin Hait
ac9adff1bb Update erpnext/stock/doctype/stock_entry/stock_entry.py 2012-03-21 15:35:04 +05:30
Nabin Hait
7ff14ede3c Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:33:50 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
5bd00adeed Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 09:06:02 +01:00
Rushabh Mehta
983a171567 using font lato 2012-03-21 13:35:34 +05:30
Nabin Hait
e8da15cb5b sync ref file 2012-03-21 12:45:14 +05:30
Rushabh Mehta
7aaea5e2be Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 08:00:11 +01:00
Rushabh Mehta
c01b7e9c75 website topbar fix, doclistnew, back fix 2012-03-21 12:29:56 +05:30
Nabin Hait
91375d64f1 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 12:05:30 +05:30
Rushabh Mehta
69c9065e7c Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:23:11 +01:00
Rushabh Mehta
fd563b4874 support ticket listview 2012-03-21 11:52:49 +05:30
Rushabh Mehta
f74ef4c64b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:18:41 +01:00
Rushabh Mehta
a665c1f60d stylefixes and listviews 2012-03-21 11:47:58 +05:30
Rushabh Mehta
dad4e3ebac Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:17:28 +01:00
Nabin Hait
5f04061291 changes in recurring invoice print format 2012-03-21 11:47:00 +05:30
Rushabh Mehta
0d1e918177 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 06:33:35 +01:00
Nabin Hait
39a24794eb Purpose others to other 2012-03-21 11:02:50 +05:30
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Rushabh Mehta
437c1b512c listview update and form fix 2012-03-20 18:45:28 +05:30
Anand Doshi
310bc462b9 fix in doctype refactor patch 2012-03-20 17:49:23 +05:30
Nabin Hait
ba62cf3b5a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 17:40:16 +05:30
Nabin Hait
39c26f4580 billing period in recurring sales invoice mail 2012-03-20 17:39:48 +05:30
Anand Doshi
986caee03d clear item cache on update of certain docs 2012-03-20 17:30:31 +05:30
Nabin Hait
ceb9f41f15 lead organization fld added in quotation for printing: patch 2012-03-20 17:04:32 +05:30
Nabin Hait
de51040763 lead organization fld added in quotation for printing 2012-03-20 16:47:03 +05:30
Nabin Hait
9ff92369ad lead organization fld added in quotation for printing 2012-03-20 16:44:15 +05:30
Anand Doshi
8347aad402 email settings separated from control panel 2012-03-20 14:54:25 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Nabin Hait
93654a3e04 stock entry: new purpose others added 2012-03-20 14:31:14 +05:30
Nabin Hait
594ee37d26 patch list updated 2012-03-20 14:26:32 +05:30
Nabin Hait
547478f973 stock entry: new purpose others added in stock entry 2012-03-20 14:26:14 +05:30
Anand Doshi
d05aad6474 fix in POS invoice 2012-03-20 12:33:02 +05:30
Anand Doshi
6ba51ca693 POS Invoice fix 2012-03-20 12:24:51 +05:30
Anand Doshi
4f5e92a06c Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 12:17:50 +05:30
Anand Doshi
547ce9f9c8 POS Invoice fix 2012-03-20 12:11:38 +05:30
Anand Doshi
3401086d66 POS Invoice fix 2012-03-20 12:07:18 +05:30
Nabin Hait
bdd6877a4f Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:56:08 +05:30
Nabin Hait
31e0eacb7a Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:54:11 +05:30
Rushabh Mehta
9d0fc767b2 merge 2012-03-19 18:44:33 +05:30
Nabin Hait
11824ffb90 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:43:51 +05:30
Nabin Hait
fdab486720 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:43:07 +05:30
Rushabh Mehta
d48417c93b slide navigation fixes 2012-03-19 18:42:13 +05:30
Nabin Hait
7107d4af2b Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:39:42 +05:30
Rushabh Mehta
8d8fa66e8f Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 14:06:12 +01:00
Nabin Hait
b7dce7da31 Update erpnext/stock/doctype/delivery_note/delivery_note.js 2012-03-19 18:35:57 +05:30
Rushabh Mehta
ffe9d358e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 12:40:07 +01:00
Nabin Hait
65ad3b1a0f Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py 2012-03-19 17:09:14 +05:30
Nabin Hait
a189af48f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 16:27:42 +05:30
Nabin Hait
16d9f4942a Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:48:08 +05:30
Nabin Hait
422f7e99db Update erpnext/selling/doctype/customer/customer.txt 2012-03-19 15:37:03 +05:30
Nabin Hait
9aa3777ba6 Update erpnext/setup/doctype/sales_person/sales_person.txt 2012-03-19 15:21:30 +05:30
Nabin Hait
e5d99f5ed1 Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:15:20 +05:30
Anand Doshi
a7158f6ea9 fix in session expiry 2012-03-19 14:41:05 +05:30
Anand Doshi
5dabfdd920 sync doctype - first cut 2012-03-19 14:26:14 +05:30
Rushabh Mehta
6498cee998 fixed conflict 2012-03-19 09:01:16 +01:00
Nabin Hait
b6cd3316c4 error fixed in lease receipts client wise 2012-03-19 13:27:06 +05:30
Anand Doshi
f02c9e7b6c fix in due_date fetching for receivable voucher 2012-03-19 11:43:24 +05:30
Rushabh Mehta
a0a53c90f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 06:12:43 +01:00
Nabin Hait
15a0271557 Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt 2012-03-19 10:22:32 +05:30
Nabin Hait
9f5b2cd8d9 Update erpnext/stock/doctype/delivery_note/delivery_note.txt 2012-03-19 10:20:22 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Nabin Hait
3ffca32ace rename dt patch updated 2012-03-16 16:21:44 +05:30
Nabin Hait
deac31fd2d Update erpnext/selling/doctype/sales_common/sales_common.py 2012-03-16 15:14:27 +05:30
Nabin Hait
15afe87984 cost center will be fetched from other charges master 2012-03-16 15:11:02 +05:30
Rushabh Mehta
8e3d596cbc Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 16:44:19 +05:30
Rushabh Mehta
2438de4c9b fixed tags in list2 2012-03-15 16:43:46 +05:30
Rushabh Mehta
2f052fd1ff Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 07:22:39 +01:00
Rushabh Mehta
5b9e0951d7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-15 07:21:43 +01:00
Anand Doshi
92da889d32 fix in report builder saving 2012-03-15 11:50:26 +05:30
Anand Doshi
96188f0310 sync with gateway moved to defs 2012-03-15 11:11:57 +05:30
Rushabh Mehta
f47192c5ce merge 2012-03-14 19:07:11 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
3b3e336fcc Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-14 13:25:19 +01:00
Anand Doshi
018f075b66 Merge branch 'master' into sync 2012-03-14 17:54:32 +05:30
Anand Doshi
0e2461fa7c fix in qa inspection report link 2012-03-14 17:53:53 +05:30
Anand Doshi
4b7ddff4c9 patch after doctype.py refactor 2012-03-14 17:45:54 +05:30
Rushabh Mehta
3bbc7aeeb8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-14 07:58:10 +01:00
Anand Doshi
0493897297 Merge branch 'master' into sync
Conflicts:
	js/all-app.js
	js/all-web.js
	version.num
2012-03-14 12:24:37 +05:30
Anand Doshi
990599ad9a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-14 12:20:58 +05:30
Nabin Hait
4af2c094cc rename dt error fixed 2012-03-14 12:12:23 +05:30
Nabin Hait
1732905db8 rename dt error fixed 2012-03-14 12:04:16 +05:30
Anand Doshi
7854f81ca0 show todo, calendar and support desktop notifications 2012-03-14 12:01:13 +05:30
Nabin Hait
64f40fab6d Rename doctype for more meaningful name 2012-03-14 11:07:00 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Nabin Hait
c6b989c9d7 update stock reco permission 2012-03-13 12:47:07 +05:30
Nabin Hait
9826ccce54 update stock reco permission 2012-03-13 12:45:53 +05:30
Rushabh Mehta
b9878d01e1 style fixes 2012-03-12 16:12:09 +05:30
Rushabh Mehta
ae4d1f973c modules cleanup 2012-03-12 14:34:55 +05:30
Anand Doshi
5230aa89a2 Merge branch 'master' into sync 2012-03-12 13:28:15 +05:30
Rushabh Mehta
09595eee3e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-12 13:21:07 +05:30
Nabin Hait
b5b39f0e48 update cost as per LPR and standard rate 2012-03-12 11:25:10 +05:30
Rushabh Mehta
9f89e35ebe search selector fix for link 2012-03-09 17:51:39 +05:30
Rushabh Mehta
519f70b384 new autosuggest, other fixes 2012-03-09 16:44:21 +05:30
Nabin Hait
6715172211 sub contracted item are allowed to create po 2012-03-09 16:04:19 +05:30
Anand Doshi
4cc7d3e392 fix in support ticket rendering 2012-03-08 14:49:49 +05:30
Anand Doshi
c37c772678 fix in support ticket thread 2012-03-08 14:35:19 +05:30
Anand Doshi
20f63da794 fix in messages 2012-03-08 12:10:51 +05:30
Anand Doshi
eb55df0aa3 fix in messages 2012-03-08 12:06:27 +05:30
Anand Doshi
a6952c935c doctype refactor first commit 2012-03-07 19:37:23 +05:30
Rushabh Mehta
9a1bdf7224 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-07 18:20:33 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Nabin Hait
928e89a359 validation added in enquire 2012-03-07 13:11:24 +05:30
Nabin Hait
20f68b342b Merge branch 'master' of github.com:webnotes/erpnext 2012-03-07 12:51:19 +05:30
Nabin Hait
00260870d1 fixes in rv 2012-03-07 12:50:55 +05:30
Rushabh Mehta
0dd5da2299 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9 removed 2012-03-06 18:41:11 +05:30
Anand Doshi
18b6c1d4e9 minor changes in support ticket 2012-03-06 18:31:25 +05:30
Anand Doshi
2bc141f5db fix in support ticket and email settings 2012-03-06 18:05:23 +05:30
Anand Doshi
a872d81983 trying to fix support ticket 2012-03-06 17:09:53 +05:30
Anand Doshi
2b60484bab fix in reverted my company 2012-03-06 16:17:34 +05:30
Anand Doshi
bb64d302df email digest fix 2012-03-06 11:42:32 +05:30
Nabin Hait
4e154d2233 removed rv series def val 2012-03-06 11:19:29 +05:30
Nabin Hait
b659457b4d Removed def value from invoice naming series 2012-03-06 11:07:24 +05:30
Rushabh Mehta
60871c3f54 merge, doclist2 2012-03-05 18:29:34 +05:30
Rushabh Mehta
b9004bd6d0 doclist2 2012-03-05 18:28:33 +05:30
Nabin Hait
a528f54dcb serial no fld print_hide=0 2012-03-05 17:45:38 +05:30
Rushabh Mehta
23d366a0be Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-05 11:31:04 +01:00
Nabin Hait
d342e2a4f2 reload item tables 2012-03-05 15:22:55 +05:30
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Rushabh Mehta
2f69c14e36 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-05 06:34:17 +01:00
Nabin Hait
d14bea3de5 patch list updated 2012-03-05 11:03:54 +05:30
Rushabh Mehta
38305a4b65 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-05 06:30:10 +01:00
Nabin Hait
3f958f7433 reload patch: field order changed 2012-03-05 10:59:02 +05:30
Nabin Hait
07e9ff3d30 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05 field order changed 2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987 fix in delivery note detail double entry 2012-03-03 16:27:48 +05:30
Anand Doshi
5478842d80 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-03 15:02:18 +05:30
Anand Doshi
146f17bf57 fix in delivery note submission - error caused due to default packed qty 2012-03-03 15:01:41 +05:30
Nabin Hait
97e1770296 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 17:15:21 +05:30
Nabin Hait
89a30ff7dc Company 'all' removed from financial statements 2012-03-02 17:15:01 +05:30
Rushabh Mehta
c326075bdb Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-02 12:36:39 +01:00
Anand Doshi
c4e2d62333 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 17:05:33 +05:30
Anand Doshi
d536f16c53 user addition fix 2012-03-02 17:05:04 +05:30
Rushabh Mehta
bb8bf194a7 merge 2012-03-02 16:28:09 +05:30
Rushabh Mehta
ee92f4b8ca Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 16:25:35 +05:30
Rushabh Mehta
e45ffd6daf activity date fix 2012-03-02 16:25:22 +05:30
Nabin Hait
a0801f7e39 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 16:06:46 +05:30
Nabin Hait
40c514612b price list rate hiding issue 2012-03-02 16:06:33 +05:30
Anand Doshi
5cc8cd7dc1 do not record logins by demo@webnotestech.com 2012-03-02 15:42:08 +05:30
Nabin Hait
7e6b62eafd print hide issue 2012-03-02 15:12:52 +05:30
Nabin Hait
fae852eb78 print hide issue 2012-03-02 15:10:51 +05:30
Rushabh Mehta
d0fb5e5d5d merge 2012-03-02 14:58:39 +05:30
Nabin Hait
e0eb58ad26 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 14:57:56 +05:30
Nabin Hait
0d155a9135 print hide issue 2012-03-02 14:57:44 +05:30
Nabin Hait
1841d8defa pr/dn no mapping through sales/pur return 2012-03-02 14:57:27 +05:30
Rushabh Mehta
a86f3e4507 cleanup of handler.js 2012-03-02 14:56:51 +05:30
Rushabh Mehta
58cdaa8590 fix in support ticket sending 2012-03-02 10:03:16 +01:00
Anand Doshi
31c3190681 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 13:13:04 +05:30
Anand Doshi
f68e3053a7 fix in support ticket.. checks sync_support_mails checkbox before sending emails 2012-03-02 13:11:53 +05:30
Nabin Hait
6db30a5b5a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 12:29:23 +05:30
Nabin Hait
88986ca007 column break print hide issue 2012-03-02 12:29:08 +05:30
Anand Doshi
86fa67065e Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-02 12:21:01 +05:30
Anand Doshi
ecd8df8cfb fix in user password change by system manager 2012-03-02 12:18:47 +05:30
Rushabh Mehta
305717a629 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 11:30:00 +05:30
Rushabh Mehta
37f531b6da fixes to profile update 2012-03-02 11:29:09 +05:30
Anand Doshi
a7c2de6164 fix in user passwordgs 2012-03-02 11:27:50 +05:30
Anand Doshi
1e9b15eb5d Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-01 19:28:36 +05:30
Anand Doshi
e306a1f5e1 fix in sales and purchase common column hide 2012-03-01 19:25:33 +05:30
Nabin Hait
06292433a6 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 19:23:42 +05:30
Nabin Hait
760e91e949 print hide issue fixed in dn 2012-03-01 19:23:21 +05:30
Rushabh Mehta
84e0c6f7ba Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:59:01 +05:30
Rushabh Mehta
b5af807281 browser support 2012-03-01 18:58:29 +05:30
Nabin Hait
c4bc429cf7 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:56:33 +05:30
Nabin Hait
80d5261100 patch list updated 2012-03-01 18:56:06 +05:30
Rushabh Mehta
97ceffccce Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:53:50 +05:30
Rushabh Mehta
5d267a4ad7 browse support 2012-03-01 18:53:06 +05:30
Nabin Hait
1fb0058283 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:48:54 +05:30
Nabin Hait
db4af96388 issue fixed in pos 2012-03-01 18:47:51 +05:30
Rushabh Mehta
f6cca4f218 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:42:44 +05:30
Rushabh Mehta
70f7674aed browse support and images 2012-03-01 18:42:05 +05:30
Anand Doshi
50b950b692 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:21:27 +05:30
Anand Doshi
68fb2c9b19 fix in import error due to indentation issues in item_grou[ 2012-03-01 18:20:31 +05:30
Nabin Hait
96639d76b2 fixed indentation issue for custom script 2012-03-01 18:11:27 +05:30
Nabin Hait
823f192876 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:04:29 +05:30
Nabin Hait
423474da5c transaction date issue in mapper patch 2012-03-01 18:04:08 +05:30
Nabin Hait
f237a67183 transaction date issue in mapper 2012-03-01 18:03:47 +05:30
Anand Doshi
232d725fd7 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 17:55:13 +05:30
Anand Doshi
e90e35dcda restoring contact control 2012-03-01 17:52:31 +05:30
Nabin Hait
e3ce5b4e0c voucher date removal issue fixed 2012-03-01 17:37:36 +05:30
Nabin Hait
be0b090d27 voucher date removal issue fixed 2012-03-01 17:31:51 +05:30
Nabin Hait
7807c6f173 clear cache patch 2012-03-01 15:58:30 +05:30
Nabin Hait
5b29deb968 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 15:52:12 +05:30
Nabin Hait
995d79421d error fixed in patch 2012-03-01 15:51:33 +05:30
Anand Doshi
496d9a0980 Merge branch 'master' into navupdate 2012-03-01 14:55:22 +05:30
Anand Doshi
48ca42beb9 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 14:54:01 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Nabin Hait
b95ad21208 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 14:48:13 +05:30
Nabin Hait
cf907f98bd error fixed in posting balance 2012-03-01 14:47:56 +05:30
Rushabh Mehta
4a0cc249a9 merge 2012-03-01 13:59:47 +05:30
Rushabh Mehta
b473a4d489 added all_read condition to check if user can read 2012-03-01 13:58:17 +05:30
Anand Doshi
8acf46c725 update in patches 2012-03-01 13:58:13 +05:30
Anand Doshi
552093c3fd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac fix in print formats and file rename 2012-03-01 13:50:33 +05:30
Rushabh Mehta
b6023a4d34 users - list condition 2012-03-01 13:47:51 +05:30
Rushabh Mehta
df33cb3a39 added activity avatar and removed menus.css 2012-03-01 13:44:09 +05:30
Rushabh Mehta
fe521fdbc2 add messages to always show and add attribution to patch 2012-03-01 13:39:09 +05:30
Rushabh Mehta
cc131af77a add messages to always show 2012-03-01 13:35:07 +05:30
Rushabh Mehta
5ce587be33 merge 2012-03-01 13:32:06 +05:30
Rushabh Mehta
4c1e9e7db4 added attributions pages 2012-03-01 13:30:34 +05:30
Nabin Hait
2b9a13d81f Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 13:05:23 +05:30
Nabin Hait
eaf144a545 form cleanup in pur cycle 2012-03-01 13:05:04 +05:30
Nabin Hait
e73db0e331 set serial_no status="In Store" if purchase return cancelled 2012-03-01 12:26:12 +05:30
Anand Doshi
fba591cbb3 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 12:21:16 +05:30
Rushabh Mehta
111bca8220 activity image 2012-03-01 12:19:18 +05:30
Anand Doshi
91797904c9 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 12:17:54 +05:30
Anand Doshi
0e140962b8 Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults 2012-03-01 12:16:02 +05:30
Rushabh Mehta
cc6398e7c7 patch - update user_image in profile 2012-03-01 12:15:54 +05:30
Rushabh Mehta
b4a2f4c98f activty images, website heading fix 2012-03-01 11:49:54 +05:30
Rushabh Mehta
ffb25fc36b users button fix 2012-03-01 11:29:22 +05:30
Rushabh Mehta
94a2fecf9d merge 2012-03-01 11:26:07 +05:30
Rushabh Mehta
428929b1f7 fixed permissions 2012-03-01 11:24:45 +05:30
Nabin Hait
bb4539e458 fixed conflict in version 2012-03-01 10:58:48 +05:30
Nabin Hait
6d517ff005 form cleanup: fixed callback issues 2012-03-01 10:57:23 +05:30
Nabin Hait
284a07e23b if more info unchecked, more info in customer, supplier will be visible 2012-03-01 10:55:41 +05:30
Nabin Hait
177ca8dbbd Description changed 2012-03-01 10:54:34 +05:30
Nabin Hait
63b275c97f allowed debit and credit against same acc head 2012-03-01 10:35:35 +05:30
Rushabh Mehta
a4f454faa0 module page link fix 2012-02-29 19:19:01 +05:30
Rushabh Mehta
204e77d125 background, user_info 2012-02-29 19:09:20 +05:30
Rushabh Mehta
dc7e6889dd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 19:06:56 +05:30
Anand Doshi
9a63996699 fix in account setup and user addition 2012-02-29 18:59:45 +05:30
Anand Doshi
fd5a213890 fix in account setup and user addition 2012-02-29 18:58:02 +05:30
Rushabh Mehta
4240ade0de user background 2012-02-29 18:40:21 +05:30
Rushabh Mehta
412a65c23c user background 2012-02-29 18:38:18 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Anand Doshi
8049c27d78 Merge branch 'master' into navupdate 2012-02-29 16:22:30 +05:30
Rushabh Mehta
79ae16506b minor fix 2012-02-29 15:23:25 +05:30
Rushabh Mehta
1572adf7f7 minor fix 2012-02-29 15:19:20 +05:30
Rushabh Mehta
864a47933e Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 15:11:27 +05:30
Rushabh Mehta
12852e73ab added activity page 2012-02-29 15:11:06 +05:30
Anand Doshi
c70933373b Merge branch 'master' of github.com:webnotes/erpnext 2012-02-29 14:06:25 +05:30
Anand Doshi
1304d97416 fix in import data page 2012-02-29 14:05:43 +05:30
Nabin Hait
41d6852218 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 11:25:09 +05:30
Nabin Hait
a3eee118fc Added on_trash function for checking link of the master 2012-02-29 11:24:55 +05:30
Rushabh Mehta
a38bbe28ce home page fixes 2012-02-29 10:55:43 +05:30
Nabin Hait
902b14592f Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 10:44:51 +05:30
Nabin Hait
22aa17bcce changes in trend analyzer query 2012-02-29 10:44:27 +05:30
Nabin Hait
72d412567c Update erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py 2012-02-29 10:43:21 +05:30
Rushabh Mehta
17da764d04 modules_setup 2012-02-28 18:56:56 +05:30
Rushabh Mehta
75d8f51e7d messages and merge 2012-02-28 17:44:16 +05:30
Rushabh Mehta
aaf86ba4ef added users 2012-02-28 17:40:13 +05:30
Nabin Hait
bef8b86331 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-28 14:14:49 +05:30
Nabin Hait
1f4aeab85c error fixed in label_cleanup 2012-02-28 14:14:20 +05:30
Anand Doshi
6b69b4f6a4 Merge branch 'master' into navupdate 2012-02-28 13:51:29 +05:30
Anand Doshi
fc60335620 fix in leave application query 2012-02-28 13:51:04 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Anand Doshi
f9e4b16731 fix in scheduler related import issue 2012-02-28 11:31:46 +05:30
Anand Doshi
b37f22dc97 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 19:16:40 +05:30
Anand Doshi
ac144121ff fix in hover effect 2012-02-27 19:16:24 +05:30
Rushabh Mehta
caebd1bff6 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 19:05:44 +05:30
Rushabh Mehta
1a5c9c5926 message reply 2012-02-27 18:56:31 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Anand Doshi
2b8c4d78f3 reload messages 2012-02-27 18:42:00 +05:30
Rushabh Mehta
ef29e55469 message delete 2012-02-27 18:41:11 +05:30
Anand Doshi
f9f73bfa55 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-27 18:32:38 +05:30
Anand Doshi
e68a1e5ecc click effect on button 2012-02-27 18:31:15 +05:30
Rushabh Mehta
07a36a4baa messages 2012-02-27 18:17:57 +05:30
Rushabh Mehta
05c339cea7 merge 2012-02-27 18:08:27 +05:30
Rushabh Mehta
fdea966198 messages 2012-02-27 18:03:54 +05:30
Anand Doshi
226df715b2 support ticket css 2012-02-27 17:24:47 +05:30
Anand Doshi
b25b4b7624 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 17:19:03 +05:30
Anand Doshi
5b1beebd33 Changed position of menus in navbar 2012-02-27 17:17:48 +05:30
Anand Doshi
0455ddfb98 Merge branch 'master' into navupdate
Conflicts:
	version.num
2012-02-27 13:21:48 +05:30
Rushabh Mehta
a3211d3e94 calendar bug fixes 2012-02-27 12:54:47 +05:30
Rushabh Mehta
aa999df088 calendar fix 2012-02-27 12:54:04 +05:30
Nabin Hait
5b09122264 fixed conflict while merging 2012-02-27 12:52:46 +05:30
Nabin Hait
78805e702e patch for form/label cleanup 2012-02-27 12:48:35 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +05:30
Nabin Hait
0cde984dc5 Update future year balances at the time of tranaction and acc bal reposting patch 2012-02-27 12:34:14 +05:30
Anand Doshi
01a7558589 added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background 2012-02-24 19:35:09 +05:30
Anand Doshi
d45ab64a85 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-24 19:28:09 +05:30
Anand Doshi
40ee8d6432 UI fixes in support ticket and desktop 2012-02-24 19:21:47 +05:30
Rushabh Mehta
a50b762d36 support link 2012-02-24 18:13:08 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Anand Doshi
eaaf65131b desktop: first cut 2012-02-24 15:29:07 +05:30
Rushabh Mehta
b73fa49f34 cleaned up kb 2012-02-24 15:07:39 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Anand Doshi
ef041114bb show submittable warning 2012-02-23 12:56:45 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
c023cdd0c0 Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-23 11:46:39 +05:30
Rushabh Mehta
1a35574afe redesigned scheduler 2012-02-23 11:46:28 +05:30
Anand Doshi
23b9de1582 Merge branch 'master' of github.com:webnotes/erpnext 2012-02-23 11:32:07 +05:30
Anand Doshi
bfa58a3516 allow deletion of products 2012-02-23 11:31:17 +05:30
Anand Doshi
9f94275d65 allow deletion of products 2012-02-23 11:27:40 +05:30
Nabin Hait
8569b7400a Update erpnext/production/doctype/bill_of_materials/bill_of_materials.py 2012-02-23 10:46:24 +05:30
Anand Doshi
cab5b31ffa change product's document type to Master 2012-02-22 18:33:39 +05:30
Nabin Hait
72129a8587 Product document type set as master 2012-02-22 18:30:20 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
2478363bba Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-21 19:04:14 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Anand Doshi
ffbfd2c60a Update feed on submission 2012-02-21 18:15:31 +05:30
Rushabh Mehta
393d325e00 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 13:15:02 +01:00
Rushabh Mehta
085617ed12 merge latest 2012-02-21 17:31:04 +05:30
Anand Doshi
c70e8d9791 fix in remove_archive 2012-02-21 17:30:36 +05:30
Rushabh Mehta
50144468be Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:58:48 +01:00
Anand Doshi
b8fa4a37e5 fix in remove_archive 2012-02-21 17:27:24 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Rushabh Mehta
307da4f91b Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:17:20 +01:00
Anand Doshi
62a3872480 fix in remove_archive 2012-02-21 16:46:57 +05:30
Rushabh Mehta
534b6a7d7f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:16:13 +01:00
Anand Doshi
5ff541b53c fix in remove_archive patch 2012-02-21 16:44:31 +05:30
Rushabh Mehta
7a867fc1f8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:00:02 +01:00
Anand Doshi
8e703ef26f packing slip fix 2012-02-21 16:29:46 +05:30
Rushabh Mehta
0c410b8261 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 11:58:03 +01:00
Anand Doshi
0bcc20f980 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 16:26:36 +05:30
Anand Doshi
ff33677624 Packing Slip Fix 2012-02-21 16:26:08 +05:30
Nabin Hait
e1f976ce05 deleted supp quotation 2012-02-21 14:33:45 +05:30
Rushabh Mehta
02b36eba1c Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:54:33 +01:00
Nabin Hait
b461e1788a patch list updated 2012-02-21 14:22:06 +05:30
Rushabh Mehta
cdf0b7a502 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:45:46 +01:00
Anand Doshi
f9e9000092 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 14:12:39 +05:30
Anand Doshi
c05ee5bf64 patch to remove archive 2012-02-21 14:12:13 +05:30
Rushabh Mehta
25e57421f7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:17:30 +01:00
Nabin Hait
4b36c1e8f4 insert after fld should be no copy in custom fld 2012-02-21 13:43:59 +05:30
Rushabh Mehta
2fe8f12424 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:06:55 +01:00
Nabin Hait
8e9b578c00 expected delivery date can be equal to po date, not before po date 2012-02-21 13:35:28 +05:30
Rushabh Mehta
e55778627f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 08:57:24 +01:00
Nabin Hait
1a7cd16dba reorder qty fld in item 2012-02-21 13:26:49 +05:30
Nabin Hait
5fe6760406 reorder level checking based on stores and reserved warehouse 2012-02-21 13:25:27 +05:30
Rushabh Mehta
98902f82db Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 07:24:52 +01:00
Rushabh Mehta
6e156c748b moved to boostrap 2.0 2012-02-21 11:19:24 +05:30
Nabin Hait
468008717b removed extra cond from bom 2012-02-21 11:14:49 +05:30
Rushabh Mehta
4dc2f43c0d moving to bootstrap 2.0 2012-02-21 10:30:43 +05:30
Rushabh Mehta
f70760d8c8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 14:09:09 +01:00
Anand Doshi
0b3f4d40c4 fix in support ticket and email digest 2012-02-20 18:38:33 +05:30
Rushabh Mehta
09a897afe4 added selling-home 2012-02-20 18:30:52 +05:30
Rushabh Mehta
d25e0957d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 12:06:55 +01:00
Anand Doshi
2a7fa0451c todo_item patch 2012-02-20 16:36:08 +05:30
Anand Doshi
09ef7dc416 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-20 16:33:28 +05:30
Anand Doshi
c3023be794 notifications of todo items 2012-02-20 16:31:55 +05:30
Rushabh Mehta
3f29b85f5d 2 col layout in form, docbrowser and home 2012-02-20 15:40:29 +05:30
Rushabh Mehta
cb1ab98bec Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 08:35:47 +01:00
Nabin Hait
f361289147 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 13:05:01 +05:30
Nabin Hait
6ac0be5fb2 delete all cancelled gl entry on account deletion 2012-02-20 13:04:36 +05:30
Rushabh Mehta
5ceab06bb5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 08:06:37 +01:00
Rushabh Mehta
13531b73eb form bugfix and otehr minor fixes 2012-02-20 12:35:23 +05:30
Nabin Hait
db0df4fd53 over-wrinting of child tables data in import_data 2012-02-17 15:55:51 +05:30
Rushabh Mehta
7b7af279cf Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-17 08:18:30 +01:00
Rushabh Mehta
aa848bee28 website css cleanups + dropdown in top toolbar 2012-02-17 12:06:33 +05:30
Rushabh Mehta
639c268abd Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-17 05:59:46 +01:00
Anand Doshi
e31d94ffc4 fix in control panel issue of sales and purchase return wizard 2012-02-17 10:27:46 +05:30
Rushabh Mehta
265c41b604 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 12:05:24 +01:00
Anand Doshi
e7ecb86ce7 roles for a new company's first user 2012-02-16 16:34:47 +05:30
Rushabh Mehta
ee5ba8105e Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 11:46:59 +01:00
Anand Doshi
aa92ecdd26 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 15:56:57 +05:30
Anand Doshi
8aa841866f add Website Manager Role to first user 2012-02-16 15:56:36 +05:30
Rushabh Mehta
22eb57a217 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 11:00:23 +01:00
Nabin Hait
60e81ce8f5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 15:29:09 +05:30
Rushabh Mehta
7c76f80966 gateway patch 2012-02-16 10:58:45 +01:00
Nabin Hait
195b620787 callback issue in packing slip 2012-02-16 15:21:39 +05:30
Rushabh Mehta
1b1179477b added patch 2012-02-16 15:11:28 +05:30
Rushabh Mehta
8425c87d5f fixed old style file names 2012-02-16 13:01:28 +05:30
Anand Doshi
761a044cd7 fix in user addition email sending.. 2012-02-16 12:47:11 +05:30
Anand Doshi
ec1af179cb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 12:08:10 +05:30
Anand Doshi
f8395343f7 fix in password not copied to server database during company creation 2012-02-16 12:07:38 +05:30
Nabin Hait
da1f48b96e mentioed account type for some tax/chargeable account 2012-02-16 10:55:05 +05:30
Nabin Hait
470e18a380 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 17:31:56 +05:30
Nabin Hait
2d8ac7f3f9 fixed asynchronus issue 2012-02-15 17:31:23 +05:30
Anand Doshi
2c2991c3b7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 15:42:34 +05:30
Anand Doshi
65bc9db85e File Data rename 2012-02-15 15:42:18 +05:30
Rushabh Mehta
f27b67b474 fix in change password 2012-02-15 10:45:29 +01:00
Nabin Hait
237ac638f5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 14:28:57 +05:30
Nabin Hait
ab90ee04f5 callback issues and item default get most priority 2012-02-15 14:28:02 +05:30
Rushabh Mehta
533bc77976 rolling back gateway changes 2012-02-15 09:35:42 +01:00
Nabin Hait
0e14191163 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 18:55:34 +05:30
Nabin Hait
13e62ccbc9 clear cache patch 2012-02-14 18:55:01 +05:30
Rushabh Mehta
c9b10fd8d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 17:25:40 +05:30
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Anand Doshi
518202f9f2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 16:16:42 +05:30
Anand Doshi
737c2f9432 fix in login as 2012-02-14 16:16:13 +05:30
Nabin Hait
75ef7c7a89 def val of is_subcontracted is NO 2012-02-14 16:08:22 +05:30
Nabin Hait
3d794a682d required by date should be mapped in indent-po 2012-02-14 15:25:11 +05:30
Nabin Hait
461a071dfa Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 15:13:52 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Anand Doshi
ec6f9fedd6 Fix in smtplib import issue 2012-02-14 13:54:04 +05:30
Anand Doshi
507cb3c592 add website manager patch 2012-02-14 12:58:47 +05:30
Anand Doshi
b2be11cad1 error due to old packing slip hide fields in feature setup 2012-02-14 12:45:55 +05:30
Rushabh Mehta
56c5ae5bc8 version 2012-02-14 11:47:05 +05:30
Rushabh Mehta
afaac60982 made all.js and all.css and all guests share same session 2012-02-14 11:44:13 +05:30
Nabin Hait
5bd88d99b5 fixes 2012-02-14 11:39:42 +05:30
Nabin Hait
7eda1cac27 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 09:57:57 +05:30
Anand Doshi
2c582d5f65 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 19:00:24 +05:30
Anand Doshi
d7ddea1e2a domain list patch 2012-02-13 18:59:43 +05:30
Nabin Hait
c45337bf97 Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 18:25:52 +05:30
Nabin Hait
409612457b error fixed in trash control 2012-02-13 18:24:14 +05:30
Rushabh Mehta
bfc03cf8bd Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 13:41:51 +01:00
Rushabh Mehta
a9bd79487d company whitelist fix 2012-02-13 13:41:45 +01:00
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Anand Doshi
5fe5df370f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 17:57:45 +05:30
Anand Doshi
e8928b8bff website settings 2012-02-13 17:56:59 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Nabin Hait
e63ea67b54 error fixed in patch 2012-02-13 15:38:15 +05:30
Anand Doshi
82cfe4b28d Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 15:30:24 +05:30
Nabin Hait
42852a88dc account type patch added in patch list 2012-02-13 15:29:51 +05:30
Anand Doshi
702f174265 call update item details in post render 2012-02-13 15:29:41 +05:30
Rushabh Mehta
ff0946bbda naming fix in web page, list style 2012-02-13 15:26:17 +05:30
Nabin Hait
bd0c05bf94 Mentioned account type in default accounts 2012-02-13 14:48:34 +05:30
Anand Doshi
945b3c4680 Domain Name list in Website Settings 2012-02-13 14:04:54 +05:30
Nabin Hait
7949b33b70 Logout session if user deleted 2012-02-13 12:43:38 +05:30
Nabin Hait
043b0f26bd Merge branch 'stable' of github.com:webnotes/erpnext 2012-02-13 12:26:45 +05:30
Nabin Hait
bf0d92e125 deleted and disabled users excluded in applicable to and approver link fields 2012-02-13 12:22:08 +05:30
Nabin Hait
b0fd0b3615 Edited through patch 2012-02-13 11:34:36 +05:30
Anand Doshi
ba746dfb2f Stop support ticket refresh on send, if there is a server message 2012-02-10 15:46:54 +05:30
Anand Doshi
701e0559e9 Merge branch 'stable' into latest 2012-02-10 13:44:03 +05:30
Anand Doshi
00f9b58bba Do not refresh is there is an exception 2012-02-10 13:43:39 +05:30
Anand Doshi
15d2d45b36 Merge branch 'stable' into latest 2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b Debit/Credit note creation on purchase/sales return 2012-02-10 10:48:35 +05:30
Anand Doshi
dae6e1e6a2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-09 12:48:13 +05:30
Anand Doshi
ad37575701 First name and last name in setup account dialog 2012-02-09 12:48:04 +05:30
Rushabh Mehta
96765f170d Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-09 12:46:17 +05:30
Rushabh Mehta
0b2874afdb fix to install 2012-02-09 12:45:50 +05:30
Anand Doshi
95e89de21d Merge branch 'stable' into latest
Conflicts:
	erpnext/home/page/event_updates/event_updates.js
2012-02-09 12:23:15 +05:30
Anand Doshi
3801804a8a First Name and Last Name in setup account dialog box 2012-02-09 12:16:47 +05:30
Anand Doshi
83302dfe63 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 16:23:47 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
Rushabh Mehta
f16e32eca1 report builder fix' 2012-02-08 16:16:28 +05:30
Rushabh Mehta
b8d6497818 many style fixes 2012-02-08 12:33:13 +05:30
Anand Doshi
a685379d6b Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 11:06:12 +05:30
Anand Doshi
9908d6e4be Merge branch 'stable' into latest 2012-02-08 11:05:47 +05:30
Rushabh Mehta
a1f3764238 about us style fix 2012-02-08 10:51:08 +05:30
Anand Doshi
c9fcc05792 Allow IS POS to be set as default from customize form view 2012-02-08 10:46:27 +05:30
Rushabh Mehta
02ec8c06fb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 10:44:33 +05:30
Rushabh Mehta
3fd279977b website p sty;e 2012-02-08 10:44:02 +05:30
Anand Doshi
c6eea1e1ca Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 10:24:16 +05:30
Anand Doshi
88e4a0ffc2 Merge branch 'stable' into latest 2012-02-08 10:24:03 +05:30
Rushabh Mehta
bd20d29dae pre style 2012-02-08 10:23:16 +05:30
Anand Doshi
d7ac84f430 removed msgprint in pending po items to receive report 2012-02-08 10:18:30 +05:30
Anand Doshi
a629fa3f05 Merge branch 'stable' into latest 2012-02-07 18:02:42 +05:30
Anand Doshi
02035d071a Fix in import docs containing utf-8 encoding 2012-02-07 17:57:40 +05:30
Rushabh Mehta
a7f0c448bb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:58:14 +05:30
Rushabh Mehta
4d20b2246c style fixes 2012-02-07 14:57:49 +05:30
Anand Doshi
f812acf063 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:51:56 +05:30
Anand Doshi
8d3d2a9905 Merge branch 'stable' into latest 2012-02-07 14:51:38 +05:30
Anand Doshi
e59f456ad4 If support ticket doesnt have body, then do not append in reply to string 2012-02-07 14:50:50 +05:30
Rushabh Mehta
5b625fa592 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:32:20 +05:30
Rushabh Mehta
f9620eaf44 fix to product, blog 2012-02-07 14:31:49 +05:30
Anand Doshi
b65363aa46 Merge branch 'stable' into latest 2012-02-07 14:28:29 +05:30
Anand Doshi
188a499f45 Fix in default customer group fetch while converting lead to customer 2012-02-07 14:28:05 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Rushabh Mehta
518533fde0 added sitemap, rss feeds 2012-02-07 13:29:31 +05:30
Rushabh Mehta
9c7fe3bce4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 11:43:51 +05:30
Rushabh Mehta
8b96b05163 fixes to products 2012-02-07 11:43:41 +05:30
Rushabh Mehta
002340080d fixes to products 2012-02-07 07:08:05 +01:00
Anand Doshi
67d2c8396c Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
f35992f695 top bar to accept url 2012-02-07 10:39:17 +05:30
Anand Doshi
99e7f3d7a4 Fix in valuation_control.py: eval requires a string. does not accept None. 2012-02-06 18:06:34 +05:30
Rushabh Mehta
0a45f96c48 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 17:40:46 +05:30
Rushabh Mehta
28307193a1 item group txt 2012-02-06 17:40:37 +05:30
Rushabh Mehta
cc54fd46bc website fixes 2012-02-06 13:09:08 +01:00
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Rushabh Mehta
a7e68f7cd7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 15:33:37 +05:30
Rushabh Mehta
e219db0e20 moved wnf.py to erpnext and added website manager role 2012-02-06 15:33:08 +05:30
Rushabh Mehta
b4244bacba Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 10:59:48 +01:00
Rushabh Mehta
4167e2f97a patch fix 2012-02-06 10:58:48 +01:00
Rushabh Mehta
74fab55948 add home in website patch 2012-02-06 14:34:42 +05:30
Rushabh Mehta
594a0ca11d fix in related page 2012-02-06 12:52:15 +05:30
Rushabh Mehta
af1cb632d6 bugfix to topbar 2012-02-06 07:29:52 +01:00
Rushabh Mehta
04048ff890 Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-06 07:12:43 +01:00
Anand Doshi
7e13f9b4b5 Fix in email digest due to unicode change 2012-02-06 11:41:25 +05:30
Rushabh Mehta
fd5005567b Fix in setup role permissions 2012-02-06 06:34:04 +01:00
Rushabh Mehta
7d5575ea3a Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-04 11:53:08 +01:00
Anand Doshi
b05f1a68f5 support ticket send issue 2012-02-04 16:22:21 +05:30
Rushabh Mehta
eba29ab88a Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-04 09:54:10 +05:30
Rushabh Mehta
6147451da3 refactored patches, bug fix for assign_to 2012-02-04 09:53:25 +05:30
Rushabh Mehta
cc43b7e927 Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-03 13:35:59 +01:00
Anand Doshi
3f711e2cb0 Fix in support ticket response issue 2012-02-03 18:03:32 +05:30
Rushabh Mehta
479670e4e1 added unicode to mysql, fix in about us 2012-02-03 16:56:18 +05:30
Rushabh Mehta
b4c814484e fix to patch 2012-02-03 13:36:44 +05:30
Rushabh Mehta
63d669f390 updated feed for comments and login 2012-02-03 12:56:12 +05:30
Rushabh Mehta
adc9a61bd7 bugfix 2012-02-02 16:45:26 +05:30
Rushabh Mehta
50e2cfe78e dateutil.js/patch fix 2012-02-02 16:40:01 +05:30
Anand Doshi
6d5cd01e03 Merge branch 'stable' into latest 2012-02-02 15:36:58 +05:30
Anand Doshi
2cb047d5a4 Added search field 'account_type' in account doctype 2012-02-02 15:36:34 +05:30
Anand Doshi
62427a6024 Merge branch 'stable' into latest 2012-02-02 15:23:33 +05:30
Anand Doshi
962c2aa80d Auto fetch default bank account for jv of type Bank Voucher 2012-02-02 15:22:11 +05:30
Anand Doshi
8694dbb754 Merge branch 'stable' into latest 2012-02-02 14:07:55 +05:30
Anand Doshi
fd11313138 Support ticket response text fix 2012-02-02 14:07:39 +05:30
Anand Doshi
1a3bce3676 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-02 13:45:00 +05:30
Anand Doshi
32e1fa22cd Merge branch 'stable' into latest 2012-02-02 13:44:32 +05:30
Rushabh Mehta
63adcb7355 patch update 2012-02-02 13:44:28 +05:30
Anand Doshi
ce25e169ab Show only last response in support ticket response message 2012-02-02 13:44:05 +05:30
Rushabh Mehta
a3d21a46e8 version 2012-02-02 13:43:20 +05:30
Rushabh Mehta
7018b19f42 added website settings, refactored home 2012-02-02 13:42:28 +05:30
Anand Doshi
0c9cde9f62 Merge branch 'stable' into latest
Conflicts:
	version.num
2012-02-02 12:43:39 +05:30
Anand Doshi
354dd9b35a Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing) 2012-02-02 12:42:14 +05:30
Anand Doshi
a9a5128402 Merge branch 'stable' into latest
Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Rushabh Mehta
d47e1d14b7 added related page and other cleanups 2012-02-01 18:02:33 +05:30
Rushabh Mehta
9c69914cf6 todo fix 2012-02-01 15:03:54 +05:30
Rushabh Mehta
9ef63f93d6 moved back to 'index.cgi' model 2012-02-01 14:47:29 +05:30
Anand Doshi
3325d0db74 Patch to set docstatus=2 for purchase returned serial no 2012-02-01 11:36:31 +05:30
Anand Doshi
4f948e03be Set docstatus as 2 for a purchase returned serial no 2012-02-01 11:27:36 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Anand Doshi
6afc6818a3 Check for duplicate challan number only in submitted purchase receipts 2012-01-31 17:21:04 +05:30
Anand Doshi
0717ca63b2 Fix in Purchase Return - Serial No. status issue 2012-01-31 16:20:37 +05:30
Anand Doshi
6c95ccb8f5 Net total calculation fix 2012-01-30 14:28:31 +05:30
Rushabh Mehta
bc5ec4f19e version 2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
2729123868 Fix add user from my company 2012-01-30 12:50:18 +05:30
Anand Doshi
5f29438b1c Fix in add user in my company 2012-01-30 12:44:59 +05:30
Anand Doshi
f3d3105d9a Password fix on add user 2012-01-30 12:40:07 +05:30
Anand Doshi
e72de12993 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-30 11:59:05 +05:30
Anand Doshi
69cfc5566a Email settings check on save 2012-01-30 11:54:59 +05:30
Anand Doshi
d3db70bb72 Supplier rename fix 2012-01-30 11:08:47 +05:30
Anand Doshi
327269fbc6 Check email settings while saving 2012-01-27 18:49:51 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Rushabh Mehta
ad10c695ff Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-27 15:57:32 +05:30
Rushabh Mehta
c8d2e73ee6 added blog 2012-01-27 15:57:17 +05:30
Anand Doshi
76a4caeada fix in send notification part of recurring invoices 2012-01-27 14:34:26 +05:30
Anand Doshi
f5738817db fix in recurring invoice 2012-01-27 14:18:09 +05:30
Anand Doshi
707cd06606 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
2012-01-27 12:30:35 +05:30
Anand Doshi
02c662936f Merge branch 'master' into latest 2012-01-27 12:28:21 +05:30
Anand Doshi
74d1b65105 changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch 2012-01-27 12:25:09 +05:30
Rushabh Mehta
51e51da63f added about_us 2012-01-27 12:17:09 +05:30
Rushabh Mehta
4adaae6974 version 2012-01-25 18:49:32 +05:30
Rushabh Mehta
949496c31b added website.page.contact 2012-01-25 18:48:46 +05:30
Anand Doshi
af1ad9a31e Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-01-25 17:27:57 +05:30
Anand Doshi
6e174cc2c4 Merge branch 'master' into latest
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
2012-01-25 17:21:14 +05:30
Anand Doshi
46848a48fe Show DocType Labels instead of DocType names in Customize Form View 2012-01-25 17:15:46 +05:30
Rushabh Mehta
4b1fe0528a added home template 2012-01-25 15:06:28 +05:30
Anand Doshi
04a115e771 Fix: Logout user on disabling profile 2012-01-25 12:52:38 +05:30
Rushabh Mehta
9c7a01ade9 starting up 2012-01-25 11:04:54 +05:30
Rushabh Mehta
a8ad3907db added website page, home, patch 2012-01-25 10:37:35 +05:30
Anand Doshi
c655e37f1a Fixes in production and stock modules 2012-01-25 09:58:06 +05:30
Anand Doshi
d194e6b5cf Fix: show message if contact doesn't have email if notification control is enabled 2012-01-24 17:08:53 +05:30
Rushabh Mehta
17a8a3697d Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-24 15:16:34 +05:30
Rushabh Mehta
5b9270981c added css: 2012-01-24 15:16:06 +05:30
Anand Doshi
6be842f960 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-24 14:58:41 +05:30
Anand Doshi
a2c9e39ca3 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-24 14:58:24 +05:30
Anand Doshi
f51e52c1be Fix in subject issue of support ticket 2012-01-24 14:56:20 +05:30
Rushabh Mehta
7cca292494 version 2012-01-24 14:34:27 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Anand Doshi
a2fcca578d Purchase Other Charges - company field 2012-01-24 13:46:46 +05:30
Anand Doshi
2e3ce6cc02 Fix error in patch due to single quote in name 2012-01-24 11:37:28 +05:30
Anand Doshi
3c572d7468 change patch file in patch list customer address contact patch 2012-01-24 10:55:04 +05:30
Anand Doshi
568ab004ad Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	index.html
	version.num
2012-01-23 18:41:33 +05:30
Anand Doshi
590be7e643 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-23 18:37:09 +05:30
Anand Doshi
706baf77ae customer address contact patch 2012-01-23 18:35:28 +05:30
Anand Doshi
9a7ea9285e Customer Address Contact report 2012-01-23 18:32:20 +05:30
Anand Doshi
7daed0cad7 Merge branch 'master' into stable 2012-01-23 18:13:58 +05:30
Rushabh Mehta
1061b4a7ea Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-23 16:18:53 +05:30
Rushabh Mehta
c5bf642c7d version 2012-01-23 16:18:34 +05:30
Anand Doshi
4d22ce96d1 Fix: is_default of BOM 2012-01-23 14:51:00 +05:30
Anand Doshi
cfdd827a84 Merge branch 'master' into latest 2012-01-23 14:09:50 +05:30
Anand Doshi
a170418ed0 Fixes in floating point issues 2012-01-23 14:09:06 +05:30
Anand Doshi
0529bc1e53 Doc's name in subject of auto notifications 2012-01-23 10:54:53 +05:30
Rushabh Mehta
843db59fcb version fixes 2012-01-20 17:43:37 +05:30
Rushabh Mehta
49ebfb6a30 version 2012-01-20 15:32:18 +05:30
Anand Doshi
6840ef67df Merge branch 'stable' into latest 2012-01-20 15:03:23 +05:30
Anand Doshi
da68ce8b84 Fix to other charges total 2012-01-20 15:02:41 +05:30
Anand Doshi
af4b0a9e90 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 14:50:45 +05:30
Anand Doshi
12b1db4e8a Merge branch 'stable' into latest 2012-01-20 14:50:15 +05:30
Anand Doshi
60c42d2e1c Fix to other charges total 2012-01-20 14:44:14 +05:30
Anand Doshi
4c92390972 Fix to other charges total 2012-01-20 14:32:01 +05:30
Anand Doshi
10393b39d3 Other Charges total fixed to 2 decimals 2012-01-20 14:29:40 +05:30
Rushabh Mehta
c071af73e2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 13:51:44 +05:30
Rushabh Mehta
8c309bee53 bootstrap toolbar 2012-01-20 13:47:16 +05:30
Anand Doshi
821b6544f8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 13:23:37 +05:30
Anand Doshi
42907ffb43 Merge branch 'stable' into latest 2012-01-20 13:23:04 +05:30
Anand Doshi
ff54778418 Fix in sales_common 2012-01-20 13:20:21 +05:30
Rushabh Mehta
764fdb942e updated account url and js version 2012-01-20 12:07:56 +05:30
Rushabh Mehta
b7d831b734 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 10:53:35 +05:30
Rushabh Mehta
0a5657809a fixes to add user 2012-01-20 10:52:53 +05:30
Anand Doshi
869c7bcbb2 Validate if another GRN exists having same supplier and challan no. - then throw exception 2012-01-19 18:31:21 +05:30
Anand Doshi
8c36f47ea6 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-19 17:13:43 +05:30
Anand Doshi
6c7e54d373 Merge branch 'master' into latest 2012-01-19 17:13:05 +05:30
Anand Doshi
edb45c6ce5 Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js 2012-01-19 17:12:17 +05:30
Rushabh Mehta
f2c4c4231f minor bugfixes 2012-01-19 11:43:34 +01:00
Rushabh Mehta
3a32478db9 confict fix 2012-01-19 15:11:07 +05:30
Rushabh Mehta
d31bf62c9a fixed patches, small bugs 2012-01-19 15:09:49 +05:30
Anand Doshi
20274a0069 Merge branch 'master' into latest 2012-01-19 15:00:56 +05:30
Anand Doshi
39eff71864 remove get tds button 2012-01-19 14:57:23 +05:30
Anand Doshi
28ac0b0c88 Merge branch 'master' into latest
Conflicts:
	erpnext/patches/patch_list.py
2012-01-19 14:31:03 +05:30
Anand Doshi
26814e7bad Remove Get TDS button, which appears twice in JV 2012-01-19 14:26:25 +05:30
Anand Doshi
ad2f5d1270 Merge branch 'stable' 2012-01-19 12:42:11 +05:30
Anand Doshi
f343a8bc75 remove extra buttons labelled Make Maintenance Visit 2012-01-19 12:41:54 +05:30
Anand Doshi
4b0b4a7fdc Merge branch 'stable'
Conflicts:
	erpnext/patches/patch_list.py
2012-01-19 12:35:54 +05:30
Anand Doshi
b5bc54dd00 Merge branch 'stable' into latest
Conflicts:
	erpnext/patches/patch_list.py
2012-01-19 12:34:30 +05:30
Anand Doshi
5f72836f11 Patch to change allocated_to options to 'Profile' 2012-01-19 12:32:15 +05:30
Anand Doshi
06c1050863 Merge branch 'master' into latest 2012-01-19 11:51:28 +05:30
Anand Doshi
367357fafd utf-8 encode response message while sending email response message 2012-01-19 11:48:43 +05:30
Anand Doshi
d94d1c6dff Merge branch 'master' into latest 2012-01-19 11:38:23 +05:30
Anand Doshi
32fd59b3ff resolved utf-8 issue in 'In Reply To' part of support ticket response 2012-01-19 11:37:32 +05:30
Anand Doshi
a7d632db99 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	index.html
	version.num
2012-01-18 12:33:16 +05:30
Anand Doshi
165fe9e122 Merge branch 'stable' into latest 2012-01-18 12:31:51 +05:30
Anand Doshi
2cb3cef064 Merge branch 'stable' 2012-01-18 12:31:32 +05:30
Anand Doshi
890aa0f51d fix: interface error due to use of sql instead of webnotes.conn.sql 2012-01-18 12:25:20 +05:30
Rushabh Mehta
94b88b9e22 added patch for subdomain 2012-01-18 10:55:39 +05:30
Rushabh Mehta
0a29975bfe fixed conflicts 2012-01-18 10:54:55 +05:30
Rushabh Mehta
88ba7b86dc fixes to login check 2012-01-18 06:18:52 +01:00
Anand Doshi
d3a23b5e8c Item Manufacturer/Supplier Details in item doctype 2012-01-17 18:46:43 +05:30
Rushabh Mehta
bedc1fe534 new login authentication 2012-01-17 18:17:06 +05:30
Anand Doshi
16c4e72199 Merge branch 'stable' into latest 2012-01-17 14:25:30 +05:30
Anand Doshi
97bd3663f2 Show full name in contact_display 2012-01-17 14:22:09 +05:30
Anand Doshi
34561e73dd Merge branch 'stable' into latest 2012-01-16 17:53:45 +05:30
Anand Doshi
a0b1948261 Support Ticket - In response to fix 2012-01-16 17:52:15 +05:30
Anand Doshi
dc914276a9 Merge branch 'master' into latest 2012-01-16 17:39:33 +05:30
Anand Doshi
a9023b1787 Merge branch 'stable' 2012-01-16 17:39:10 +05:30
Anand Doshi
fd0373826b Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-01-16 17:38:47 +05:30
Anand Doshi
d487f782a4 Fix: change module name from material_management to stock in an import in installation_note 2012-01-16 17:38:19 +05:30
Anand Doshi
077416300e Fix: floating point issue on submission of RV and creation of GL Entry 2012-01-16 16:02:47 +05:30
Rushabh Mehta
b3672784be support ticket goes with response 2012-01-16 14:27:43 +05:30
Anand Doshi
90f6e55c29 Changes in Inclusive Rate Taxes precision 2012-01-16 14:13:39 +05:30
Rushabh Mehta
cb60ca13a9 added patch to convert tables to utf8 2012-01-16 11:58:14 +05:30
Anand Doshi
1acf3f4de5 Merge branch 'stable' 2012-01-13 17:43:46 +05:30
Anand Doshi
610f9728ab Removing ref_rate back calculation as it injects floating point issue 2012-01-13 17:43:22 +05:30
Anand Doshi
8241e9a2ce Merge branch 'stable' 2012-01-13 15:54:01 +05:30
Anand Doshi
a318235a1f Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision 2012-01-13 15:53:46 +05:30
Anand Doshi
e5b60884d0 Merge branch 'stable' 2012-01-13 15:46:17 +05:30
Anand Doshi
4badeecf36 Reverting toFixed issue for grand total 2012-01-13 15:45:58 +05:30
Anand Doshi
98660b5d5a Merge branch 'stable' 2012-01-13 14:36:09 +05:30
Anand Doshi
560883145c Fix to floating point issue in grand total 2012-01-13 14:35:42 +05:30
Anand Doshi
ada0b5d554 Merge branch 'stable' 2012-01-13 13:24:53 +05:30
Anand Doshi
7b96d1f300 search_criteria patch 2012-01-13 11:53:22 +05:30
Anand Doshi
4b80a81a2e Rename Search Criteria Patch 2012-01-13 11:14:29 +05:30
Anand Doshi
d2b8072805 Merge branch 'stable' 2012-01-12 15:13:59 +05:30
Anand Doshi
265f3edb8f On clicking Get Charges, also pull the field included_in_print_rate 2012-01-12 14:56:26 +05:30
Anand Doshi
d03efeaf00 Fixed UX issue in change user password by system manager 2012-01-12 14:50:51 +05:30
Anand Doshi
29c5676467 Merge branch 'stable' 2012-01-12 13:47:22 +05:30
Anand Doshi
cb1f361461 Fix: Notify via email on new post on my company page 2012-01-12 13:46:46 +05:30
Anand Doshi
640955f91d Patch for fixes after major production rewrite 2012-01-12 12:55:29 +05:30
Anand Doshi
2bc9423cd1 Fix: Backflush issue due to missing BOM 2012-01-12 12:32:13 +05:30
Nabin Hait
c95bad917b open sales order query changes: pull only those which are pending to deliver 2012-01-11 18:28:43 +05:30
Nabin Hait
d3db58d6b4 Pull only SO which has production/subcontracted item 2012-01-11 17:48:09 +05:30
Nabin Hait
8389e7aad1 Description changed in pro order 2012-01-11 17:37:06 +05:30
Nabin Hait
a8077bdd20 Error fixed in patch 2012-01-11 17:22:54 +05:30
Nabin Hait
ce3ecf00c2 Removed msgprint from bom control 2012-01-11 17:17:47 +05:30
Nabin Hait
8be5017048 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-11 16:58:01 +05:30
Nabin Hait
42a411398a Error fixed in patches 2012-01-11 16:57:44 +05:30
Anand Doshi
a550c06729 last_name optional in profile settings 2012-01-11 16:53:50 +05:30
Nabin Hait
55c037c250 Added production_cleanup patch 2012-01-11 16:44:07 +05:30
Nabin Hait
c5d6bcbb8f Production module cleanup 2012-01-11 16:41:16 +05:30
Anand Doshi
06d43bcfe2 Fix: Rounded Total appearing extra in Standard Print Format 2012-01-11 15:05:24 +05:30
Anand Doshi
58574acfbc Fix: Bug in Actual Tax Rate due to inclusive rate 2012-01-11 13:39:06 +05:30
Anand Doshi
a8c2f59d1b Escape (') in customer name in authorization control 2012-01-11 12:07:48 +05:30
Anand Doshi
385299903d Escape (') in customer name in authorization control 2012-01-11 12:03:47 +05:30
Anand Doshi
35041607be Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate 2012-01-11 11:21:58 +05:30
Anand Doshi
9896452903 txt dump of DocType Label Indent and Module Def Buying 2012-01-10 17:58:07 +05:30
Anand Doshi
bf166e487d Patch to rename doctype indent 2012-01-10 17:06:16 +05:30
Anand Doshi
3a82dfd171 Rename Indent to Purchase Requisition 2012-01-10 16:56:11 +05:30
Anand Doshi
bc45f896f7 Merged master with stable 2012-01-10 14:11:07 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-10 13:59:04 +05:30
Anand Doshi
95c9d30cfd Removed unnecessary console logs 2012-01-10 11:52:43 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Nabin Hait
40de49110e Removed webforms link from setup 2012-01-09 12:54:20 +05:30
Anand Doshi
07d8570c80 Make Profile Last Name optional in profile settings 2012-01-06 18:14:42 +05:30
Anand Doshi
a31fd1080b Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link 2012-01-06 16:27:54 +05:30
Anand Doshi
58455c9d8e Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed 2012-01-06 14:33:57 +05:30
Anand Doshi
4a1da119f9 Refresh support ticket status when a new reply is received 2012-01-06 12:58:23 +05:30
Anand Doshi
7f16efe35d Refresh issue fixed for support ticket 2012-01-06 12:06:29 +05:30
Anand Doshi
7a87c7de46 Trying to fix support ticket refresh issue 2012-01-06 12:02:50 +05:30
Anand Doshi
449f534c36 Trying to fix support ticket refresh on reply issue 2012-01-06 11:54:21 +05:30
Anand Doshi
6a13e8b645 Apply naming series when saving support ticket for 1st time 2012-01-05 19:17:57 +05:30
Nabin Hait
fb5df36c38 event notificationin maintenance schedule 2012-01-05 18:37:27 +05:30
Nabin Hait
84745e7ac1 event notificationin maintenance schedule 2012-01-05 18:03:16 +05:30
Anand Doshi
9dd1e5d728 Support Ticket Naming Series 2012-01-05 17:39:42 +05:30
Anand Doshi
97b1bf4b19 Fixed support ticket issue 2012-01-05 15:46:47 +05:30
Anand Doshi
dc64802e96 Fix Support Ticket 2012-01-05 15:19:00 +05:30
Anand Doshi
523f3a0ea2 Added Administrator to exception list of users to be logged out post login 2012-01-05 14:34:30 +05:30
Nabin Hait
a9cca2e2e9 error fixed in reorder indent 2012-01-05 14:10:14 +05:30
Nabin Hait
8fb9abd47e Subject added in notification mail 2012-01-05 14:01:35 +05:30
Anand Doshi
9dfc9f617b Fix regarding support ticket to support ticket system email chaining issue 2012-01-05 13:54:29 +05:30
Nabin Hait
b50c02214c removed pur of service 2012-01-05 12:21:03 +05:30
Nabin Hait
7394239e05 delete purpose of service 2012-01-05 12:16:28 +05:30
Nabin Hait
2abc6026f2 reload po-pr mapper 2012-01-05 11:24:49 +05:30
Nabin Hait
d2686b1c31 reload doctype 2012-01-05 11:16:18 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Nabin Hait
15e8277a46 Dont update series starts from if no prefix 2012-01-04 16:23:09 +05:30
Nabin Hait
9d8e85c1f5 Dont update series starts from if no prefix 2012-01-04 16:17:18 +05:30
Anand Doshi
a6272af68a Fix to logout previous session on login 2012-01-03 17:02:20 +05:30
Anand Doshi
b63a007c91 Fixed logout issue 2012-01-03 16:11:04 +05:30
Anand Doshi
d34ff76526 Fixed logout issues 2012-01-03 16:00:03 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Anand Doshi
9fdee387ea Allow demo user to have multiple sessions 2012-01-03 11:26:00 +05:30
Nabin Hait
616548f95c Merge branch 'master' of github.com:webnotes/erpnext 2012-01-03 11:10:25 +05:30
Nabin Hait
db126e80b8 pos setting patch 2012-01-03 11:10:11 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Anand Doshi
1e4b8be8dc Merge pull request #194 from anandpdoshi/master
Posting comments to other users now working
2012-01-02 02:31:30 -08:00
Anand Doshi
1fad05aed8 Bug Fix: Posting comments to other users now working 2012-01-02 16:00:15 +05:30
Anand Doshi
62dbf27780 Merge pull request #192 from anandpdoshi/master
New transaction entries fix for email digest
2011-12-30 02:33:05 -08:00
Anand Doshi
34b9f5b1e0 Fix new transaction entries issue 2011-12-30 16:02:03 +05:30
Nabin Hait
c184dc56a4 Error fixed in uom conversion rate fetching 2011-12-30 13:29:45 +05:30
Nabin Hait
a21156d4d3 Removed msgprint 2011-12-30 11:16:15 +05:30
Nabin Hait
21d0b68a7d Fixes in pending_patches 2011-12-29 15:39:26 +05:30
Nabin Hait
0dfb8e939c Pending patches to be run from patch.py 2011-12-29 14:40:05 +05:30
Nabin Hait
48285ede08 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-29 12:57:31 +05:30
Nabin Hait
6182b929bf set default value as blank insead of None through manage account 2011-12-29 12:56:55 +05:30
Anand Doshi
10748d6bdb Merge pull request #190 from anandpdoshi/master
Changed link for customer master and supplier master in accounts browser
2011-12-28 03:49:13 -08:00
Anand Doshi
eaa6d21691 Changed link for customer master and supplier master in accounts browser 2011-12-28 17:18:09 +05:30
Nabin Hait
9e08c12a10 Default price list currency issue in delivery note fixed 2011-12-28 16:30:48 +05:30
Anand Doshi
7a4d9dbd3e Fixes in support ticket attachments 2011-12-27 19:40:10 +05:30
Anand Doshi
c50f605450 Enabled Attachments in Support Ticket 2011-12-27 17:44:30 +05:30
Anand Doshi
08eff708bf Merge branch 'master' of github.com:webnotes/erpnext 2011-12-27 17:24:19 +05:30
Anand Doshi
20f0d305cb Allow attachments in support ticket 2011-12-27 17:09:55 +05:30
Nabin Hait
4febc84f13 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-27 16:42:27 +05:30
Nabin Hait
3029474b0e Fixes in recurring invoice 2011-12-27 16:42:03 +05:30
Nijil Y
04eb52dbe3 added fields 2011-12-26 15:30:45 +05:30
Nijil Y
68de3687f4 added fields 2011-12-26 15:24:55 +05:30
Nabin Hait
3f7d7077f0 Merge pull request #183 from nijil/master
allignment and error fix
2011-12-25 23:13:05 -08:00
Nabin Hait
a0778fec61 Reload gl mapper patches 2011-12-26 12:28:14 +05:30
Nijil Y
2a59030e05 task notification fix 2011-12-26 12:00:30 +05:30
Nabin Hait
16aacdfeeb Error fixed in ticket 2011-12-26 11:37:52 +05:30
Nabin Hait
cf0163d09e Patch updated 2011-12-26 11:13:49 +05:30
Nabin Hait
f7e1569207 ticket.py modified 2011-12-26 11:08:55 +05:30
Nabin Hait
a0286e986e patch updated 2011-12-26 11:08:32 +05:30
Nabin Hait
40deced91c Merge pull request #180 from nijil/master
Task Notification
2011-12-25 21:24:33 -08:00
Nabin Hait
56f7ccbe70 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-23 18:26:34 +05:30
Nabin Hait
c6359a9179 Patch to update against_voucher in gle for jv aganst jv 2011-12-23 18:26:17 +05:30
Nabin Hait
382dc6e819 GL Mapper changes for JV 2011-12-23 18:25:11 +05:30
Nijil Y
a4e8d1e983 . 2011-12-23 18:01:40 +05:30
Nijil Y
0cfecf2920 email message fix for task 2011-12-23 17:54:07 +05:30
Nijil Y
0de918204d Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-23 17:35:39 +05:30
Nijil Y
cc64682baa fixed 2011-12-23 17:35:18 +05:30
Nijil Y
89e5624730 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:21:51 +05:30
Nijil Y
9239afa222 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:18:49 +05:30
Nijil Y
cc0e502d0f scheduler 2011-12-23 15:08:43 +05:30
Anand Doshi
8d53f7635a Merge pull request #179 from anandpdoshi/master
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
2011-12-23 00:21:53 -08:00
Anand Doshi
ac20eb2107 Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create 2011-12-23 13:50:28 +05:30
Nijil Y
4d64379aa6 scheduler added to project control for reminder 2011-12-23 12:32:08 +05:30
Nijil Y
b8eab4f2da Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-23 12:19:46 +05:30
Nijil Y
f1e98b9d8b Scheduler added for reminder notification - which will be sent 2 days before the task begins 2011-12-23 12:01:31 +05:30
Anand Doshi
d9fc4c07c9 Merge pull request #178 from anandpdoshi/master
Fix: Email digest gets deleted if even one is disabled
2011-12-22 22:27:47 -08:00
Anand Doshi
bd269cdbe7 Fix: Email digest gets deleted if even one is disabled. 2011-12-23 11:55:00 +05:30
Nabin Hait
e80496cef4 Consider description also to check item duplication in purchase cycle 2011-12-23 11:25:37 +05:30
Nabin Hait
e323ef20b0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 19:05:08 +05:30
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Anand Doshi
f5d5f10ff3 Remove "Add Recipients" button from Email Digest (again!) 2011-12-22 19:02:15 +05:30
Anand Doshi
4714424de0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 18:22:46 +05:30
Anand Doshi
0188df1609 Amended the patch to import class Document 2011-12-22 18:21:57 +05:30
Anand Doshi
27b05eac7a Merge pull request #176 from anandpdoshi/master
Patch to enable income year to date summary in email digest
2011-12-22 04:48:57 -08:00
Anand Doshi
68f3967de0 Patch to enable income year to date summary in email digest 2011-12-22 18:18:10 +05:30
Anand Doshi
a4db9e9b5a Merge pull request #175 from anandpdoshi/master
Added feature: Income Year To Date in Email Digest
2011-12-22 04:33:35 -08:00
Anand Doshi
61a4a498cf Added feature: Income Year To Date in Email Digest 2011-12-22 18:02:36 +05:30
Nijil Y
f2a5c290b3 Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-22 17:43:46 +05:30
Nijil Y
b3058a3d5a Task Notification donw, reminder left 2011-12-22 17:39:18 +05:30
Anand Doshi
6d0be02364 Merge pull request #174 from anandpdoshi/master
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
2011-12-22 04:06:35 -08:00
Anand Doshi
94a18109d7 Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body 2011-12-22 17:34:11 +05:30
Anand Doshi
3ca92bb3e4 Merge pull request #173 from anandpdoshi/master
Dont show bank balance if no ledger of type "Bank or Cash"
2011-12-22 03:54:48 -08:00
Anand Doshi
7792d08408 Dont show bank balance if no ledger of type "Bank or Cash" 2011-12-22 17:23:11 +05:30
Anand Doshi
99479bdb7f Merge pull request #172 from anandpdoshi/master
remove previous field property setter
2011-12-22 01:50:07 -08:00
Anand Doshi
f2f4c87bb6 remove previous field property setter 2011-12-22 15:19:16 +05:30
Anand Doshi
d1bfe839fa Merge pull request #171 from anandpdoshi/master
Patch to update idx which starts with 0
2011-12-22 01:37:04 -08:00
Anand Doshi
9ca7e5255b Patch to update idx.. start idx from 1 2011-12-22 15:05:14 +05:30
Nijil Y
8acb043a8a update 2011-12-22 13:08:25 +05:30
Nabin Hait
7e812bbee0 Error fixed in patch 2011-12-22 12:58:34 +05:30
Nabin Hait
6998261a7e Error fixed in auto indent patches 2011-12-22 12:56:57 +05:30
Nabin Hait
20c87531cb Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 12:54:39 +05:30
Nabin Hait
9e8249fea1 Error fixed in bin 2011-12-22 12:54:13 +05:30
Anand Doshi
5a32f78bf3 Merge pull request #170 from anandpdoshi/master
calls on_update method of email_digest obj for creating a scheduler entry
2011-12-21 22:59:31 -08:00
Anand Doshi
248f8f5687 Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry 2011-12-22 12:26:36 +05:30
Anand Doshi
c9b2743e1c Merge pull request #168 from anandpdoshi/master
Fix Image attachments and Enable Email Digests
2011-12-21 22:45:13 -08:00
Anand Doshi
972b165850 Modified deploy_email_digest to enable all the default email digests 2011-12-22 12:04:28 +05:30
Nabin Hait
b9e8a41cd2 Account and cost center get_query changes for other charges table 2011-12-21 17:33:57 +05:30
Nijil Y
36f58835e6 Update erpnext/patches/auto_indent.py 2011-12-21 16:35:43 +05:30
Nijil Y
c62953579d fix 2011-12-21 16:32:42 +05:30
Nijil Y
f800dc02f1 fix 2011-12-21 16:20:39 +05:30
Anand Doshi
c111803a4a Fixed image attachment in profile settings 2011-12-21 14:55:14 +05:30
Nijil Y
07b03fbe09 Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 14:54:34 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nijil Y
b36bebe9f0 Update erpnext/stock/doctype/bin/bin.py 2011-12-21 14:53:04 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nabin Hait
da9e2e6898 Company master link in global defaults 2011-12-21 13:24:10 +05:30
Nijil Y
9b6fc0f83d Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 13:24:02 +05:30
Nabin Hait
520de0529f Merge branch 'master' of github.com:webnotes/erpnext 2011-12-21 12:51:38 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
2011-12-21 12:34:13 +05:30
Nijil Y
16ca593bbf Update erpnext/patches/auto_indent.py 2011-12-21 12:20:07 +05:30
Nijil Y
4d6a71c5f2 Update erpnext/patches/auto_indent.py 2011-12-21 11:56:42 +05:30
Nijil Y
35aa35bea3 Update erpnext/patches/auto_indent.py 2011-12-21 11:50:20 +05:30
Nabin Hait
53ef4009ba Fixes in patches 2011-12-21 11:22:32 +05:30
Nijil Y
205e042113 patch file 2011-12-20 21:14:43 +05:30
Nijil Y
dc0461296d Email Notification for Tasks 2011-12-20 21:13:58 +05:30
Anand Doshi
146f47faab Merge pull request #167 from anandpdoshi/master
Patch to remove extra button from Email Digest Form
2011-12-20 05:40:59 -08:00
Nabin Hait
63b94c42e4 Price list patch 2011-12-20 19:09:23 +05:30
Nabin Hait
60fc54a9ba Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form 2011-12-20 18:59:26 +05:30
Nabin Hait
7c03cfad6a Default Price List Currency fld added in Global Defaults 2011-12-20 18:50:41 +05:30
Nabin Hait
a57732f71d Removed custom field from doctype 2011-12-20 18:48:19 +05:30
Anand Doshi
6a605b47ef Patch to remove 'Add Recipients' button from Email Digest form 2011-12-20 18:31:57 +05:30
Nijil Y
04da8741c3 fix 2011-12-20 18:09:43 +05:30
Nijil Y
d82e8df7e5 patch update for auto indent with email notify 2011-12-20 17:30:41 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
74fcb69b13 Error fixed in cust group 2011-12-20 11:48:27 +05:30
Nabin Hait
b8cec492c5 Fixed issue in c-form patch 2011-12-16 16:48:17 +05:30
Nabin Hait
488bcc8700 reload_employeewise_balance_leave_report patch updated 2011-12-16 16:29:31 +05:30
Nabin Hait
e3daffe477 reload_employeewise_balance_leave_report 2011-12-16 16:28:26 +05:30
Nabin Hait
3bfeefafcd Modified patch 2011-12-16 16:19:38 +05:30
Nabin Hait
f8bfcdc495 Modified patch 2011-12-16 16:15:31 +05:30
Nabin Hait
c57c5b0b44 Return if old patch.py executed anyway 2011-12-16 10:17:26 +05:30
Nabin Hait
b2150de64b Freezing Error fixed in purchase invoice 2011-12-15 16:29:04 +05:30
Nabin Hait
9a0d05d354 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 15:48:51 +05:30
Nabin Hait
6e9a1284d4 remove depricated default fileds 2011-12-15 15:48:18 +05:30
Anand Doshi
490d298fa0 patch to remove old control panel email settings 2011-12-15 15:46:31 +05:30
Anand Doshi
ca39b180f5 patch to remove old control panel email settings 2011-12-15 15:40:15 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master
Accounts Default Form Fix
2011-12-14 22:28:52 -08:00
Anand Doshi
a51aefbced Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 20:36:11 +05:30
Anand Doshi
21c649527a Provides better error message to the user 2011-12-14 20:35:19 +05:30
Anand Doshi
407ebb9e41 Merge pull request #161 from anandpdoshi/master
Resolved bug: when account of type 'Bank or Cash' does not exists
2011-12-14 06:36:32 -08:00
Anand Doshi
e7982f0f85 Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020 Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:00:55 +05:30
Nabin Hait
44bba97dc9 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 18:09:39 +05:30
Nabin Hait
b93ea233ff Error fixed in task 2011-12-14 18:09:13 +05:30
Anand Doshi
c2a9cca4fd Change in add user dialog box:
Now it includes First Name, Last Name and Password field
if run as a standalone app
2011-12-14 17:12:12 +05:30
Anand Doshi
ad42e558df Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26 Fixed bug regarding setting of banner 2011-12-14 16:09:59 +05:30
Nijil Y
b40f826c5a . 2011-12-14 15:50:09 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682 Merge pull request #159 from anandpdoshi/master
Commented print statement in email_digest.py
2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e Commented print statement while inserting record in scheduler 2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Nabin Hait
f21ceb283c Arranged field order in item table 2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565 Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nabin Hait
536e0cb1c4 fixes in patch 2011-12-13 19:05:13 +05:30
Nabin Hait
08d803791d Merge branch 'master' of git://github.com/nijil/erpnext 2011-12-13 18:49:59 +05:30
Nabin Hait
85e8e01fd6 notification email for recurring invoice 2011-12-13 18:48:24 +05:30
Nijil Y
f6a3441d99 patch 2011-12-13 18:31:42 +05:30
Nijil Y
8fb260504a purchase discount 2011-12-13 18:14:15 +05:30
Anand Doshi
f5ff4434df Patch to reload Task doctype of Projects Module 2011-12-13 18:13:23 +05:30
Anand Doshi
206df20f36 Changes in print formats to include selected print heading and discount
appended in description
2011-12-13 15:57:09 +05:30
Anand Doshi
130ae98675 Changes in dashboard start date and end date default logic such that the
conditions for fiscal year range are met
2011-12-12 20:24:06 +05:30
Anand Doshi
3a23a5740e In Dashboard, display a customer friendly error message when the start and end dates
are not within a fiscal year
2011-12-12 19:50:09 +05:30
Anand Doshi
5245e6547b Change path of images in accounts browser and sales browser 2011-12-12 19:18:23 +05:30
Nabin Hait
8a6b3b8713 Validation added in c-form 2011-12-12 14:16:16 +05:30
Anand Doshi
deb816d30c Patch to remove duplicate entries created due to change in
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
2011-12-12 12:41:36 +05:30
Nijil Y
fdc7fc62a5 payable voucher.js 2011-12-12 10:50:18 +05:30
Nijil Y
b54d7282a7 pvdetail 2011-12-12 10:31:23 +05:30
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
fb3c3fb064 Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest 2011-12-08 19:36:29 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nijil Y
38821f6104 txt order update 2011-12-08 18:32:58 +05:30
Nabin Hait
7e44f9789b Patch for c-form 2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27 Patch for c-form 2011-12-08 18:06:53 +05:30
Nabin Hait
fd20340576 Introduced C-form for Indian customer 2011-12-08 17:49:40 +05:30
Nijil Y
edf8bc2a3e Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648 Discount in purchase cycle 2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5 Discount in purchase cycle 2011-12-08 16:09:18 +05:30
Nijil Y
4499851ceb checking.. 2011-12-08 14:14:11 +05:30
Nijil Y
630256f65b purchase recipt detail 2011-12-08 13:01:43 +05:30
Nabin Hait
cde8bec0a6 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-06 19:05:14 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Anand Doshi
590448aaef Changes in email digest 2011-12-06 18:51:14 +05:30
Nabin Hait
b28d6dc617 Repost stock patch 2011-12-06 15:11:14 +05:30
Nabin Hait
ea5f5ca57d Recurring invoices patch 2011-12-06 15:10:48 +05:30
Nabin Hait
a4fdc84fda Introduced recurring invoices 2011-12-06 15:04:47 +05:30
Anand Doshi
41e542ce4d Email Digest changes 2011-12-06 10:41:54 +05:30
Anand Doshi
3f040a8f9e Resolved bug Project creation:
Customer details not getting autofilled on customer selection
2011-12-05 12:17:51 +05:30
Anand Doshi
adf2f777d3 Removed print format option. Instead show html code. 2011-12-05 12:16:31 +05:30
Anand Doshi
393f5e6078 Queries to get new records in a particular doctype 2011-12-02 19:20:10 +05:30
Anand Doshi
f10ad98ebf Refactored queries to be more clean 2011-12-02 17:53:08 +05:30
Anand Doshi
7057cbf9e5 Started with email digest 2011-12-02 15:15:38 +05:30
Anand Doshi
a27ae827c9 Merge branch 'master' of github.com:webnotes/erpnext 2011-11-30 15:25:19 +05:30
Anand Doshi
ed825062f1 Hide programming error messages from user on update_security 2011-11-30 15:23:37 +05:30
Nabin Hait
142af06d19 update serial no incoming rate through landing cost wizard 2011-11-25 16:37:21 +05:30
Nabin Hait
3aed35da0a Merge branch 'master' of github.com:webnotes/erpnext 2011-11-25 14:43:39 +05:30
Nabin Hait
28b793c88a incoming rate in serial no should be valuation rate instead of pur rate 2011-11-25 14:43:11 +05:30
Anand Doshi
8c10de6c1a Modified patch to create a DocType Label record for DocLayer 2011-11-25 11:25:39 +05:30
Nijil
4e54d7a434 pvdetail and patch 2011-11-24 16:18:42 +05:30
Nijil
1530b93a6e purchase recipt 2011-11-24 15:53:56 +05:30
Nijil
2f82c29348 .. 2011-11-24 15:18:17 +05:30
Nijil
ba40bc93fe payable voucher txt 2011-11-24 15:14:09 +05:30
Nijil
c37dad26d9 txt files 2011-11-24 15:07:54 +05:30
Nabin Hait
e92066fa80 modified fld prop in gl entry and index patch 2011-11-24 15:04:47 +05:30
Nabin Hait
a8be65aedf Merge branch 'master' of github.com:webnotes/erpnext 2011-11-24 14:48:13 +05:30
Nabin Hait
d6ed0748a3 help content midified 2011-11-24 14:47:18 +05:30
Anand Doshi
956d665738 Merge pull request #148 from anandpdoshi/master
Modified GLEntry doctype to be not in create
2011-11-24 00:29:53 -08:00
Anand Doshi
be14e021b9 Reload GL Entry doctype 2011-11-24 13:57:46 +05:30
Anand Doshi
96e5343519 Marked GLEntry as Not In Create 2011-11-24 13:51:09 +05:30
Anand Doshi
6b8d0bfb2a Added patch to reload doclayer, doclayer field and print format doctypes 2011-11-23 18:39:08 +05:30
Anand Doshi
6e5e30c420 Merge pull request #147 from anandpdoshi/master
Added Customize Form View and Print Formats to Setup Page
2011-11-23 04:35:20 -08:00
Anand Doshi
a04afc9b3b Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page 2011-11-23 13:51:52 +05:30
Nabin Hait
36427e577d address filter flds 2011-11-23 13:21:21 +05:30
Nabin Hait
5f9ceb8dc8 filter property changed in address 2011-11-23 13:19:20 +05:30
Nabin Hait
ed6b489715 filter property changed in address 2011-11-23 13:17:54 +05:30
Nabin Hait
3addd27f2c Address is added in setup for deleting purpose 2011-11-23 13:11:15 +05:30
Nabin Hait
816383056f On deletion of warehouse, delete bin and sle if no qty 2011-11-23 12:58:03 +05:30
Nabin Hait
04176e62d8 fixed error in internal reco 2011-11-23 12:15:42 +05:30
Nijil
6800ad55bd patch for Discount Rate 2011-11-22 15:21:42 +05:30
Nijil
54eb735a47 Added Discount in Purchase Cycle 2011-11-22 15:12:00 +05:30
Nabin Hait
2690e72c14 updated reco patch 2011-11-21 17:27:36 +05:30
Nabin Hait
38477a3616 patch for stock reconciliation 2011-11-21 17:16:48 +05:30
Nabin Hait
fc26f64011 rewritten stock reconciliation 2011-11-21 17:13:53 +05:30
Nijil
4491f01ce4 discount rate on purchase 2011-11-21 11:31:27 +05:30
Nijil
eb8233c779 Merge branch 'master' of git://github.com/webnotes/erpnext 2011-11-21 10:35:15 +05:30
Nijil
c7d64cf5a8 almost 2011-11-20 00:22:41 +05:30
Nijil
296c17b7ae checking 2011-11-18 14:12:06 +05:30
Nabin Hait
8fa6ad90ed sms sender name validation 2011-11-17 18:07:13 +05:30
Nabin Hait
26f74ed121 sms sender name validation 2011-11-17 18:03:10 +05:30
Nabin Hait
bc60c1f29c fixed patch 2011-11-17 16:59:29 +05:30
Nabin Hait
92ec8d26eb reload LC wizard 2011-11-17 15:03:05 +05:30
Nabin Hait
1a8831f476 reload LC wizard 2011-11-17 15:00:55 +05:30
Nabin Hait
a8da0fecb5 Account link query changed in LC wizard 2011-11-17 14:47:05 +05:30
Nabin Hait
f164b269db Merge branch 'master' of github.com:webnotes/erpnext 2011-11-16 16:39:16 +05:30
Nabin Hait
9dd6330418 updated landed cost wizard 2011-11-16 16:38:55 +05:30
Nabin Hait
815a75f917 Rewritten landed cost wizard 2011-11-16 16:34:53 +05:30
Nabin Hait
b0fa2af45b Rewritten landed cost wizard 2011-11-16 16:20:37 +05:30
Anand Doshi
bf41aef7f0 Merge pull request #144 from anandpdoshi/master
Changes in spartan print formats to show border in chrome
2011-11-16 01:20:33 -08:00
Anand Doshi
19a2767b77 Changes in spartan print formats to show border in chrome 2011-11-16 14:49:37 +05:30
Nabin Hait
7b095e97ad Update erpnext/selling/doctype/quotation/quotation.py 2011-11-16 14:25:36 +05:30
Nabin Hait
efc2c327cf Update erpnext/selling/doctype/quotation/quotation.py 2011-11-16 14:24:31 +05:30
Nabin Hait
4faf99424a Modified validation for duplicate item 2011-11-16 14:20:45 +05:30
Nabin Hait
65a053abe6 Modified validation for duplicate item 2011-11-16 14:19:26 +05:30
Anand Doshi
0900756510 Merge pull request #143 from anandpdoshi/master
Changes in Sales Invoice Print Formats
2011-11-16 00:34:36 -08:00
Anand Doshi
9fe4331862 Changes in Sales Invoice Print Format 2011-11-16 14:03:52 +05:30
Anand Doshi
96fd8bec9b Changes in Sales Invoice Print Formats 2011-11-16 14:02:30 +05:30
Anand Doshi
ded71563c8 Merge pull request #142 from anandpdoshi/master
New Print Formats as part of erpnext repository
2011-11-16 00:02:43 -08:00
Anand Doshi
c573fb8eed Modified patch install_print_formats to reload the newly added Print Formats 2011-11-16 13:31:21 +05:30
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Nabin Hait
0c92493c81 Fixed check_for_acc_of_supplier validation 2011-11-16 10:12:32 +05:30
Anand Doshi
86e91e5dce Changes in patch for installation of new print formats 2011-11-15 18:06:16 +05:30
Anand Doshi
f8b01097ac Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	index.html
2011-11-15 15:24:11 +05:30
Anand Doshi
3cb68e17b9 New Print Formats 2011-11-15 15:22:44 +05:30
Nabin Hait
5b7badaf20 supplier account head validated with supplier 2011-11-11 12:37:53 +05:30
Nabin Hait
ff72835ad9 Qty consumed per unit field type currency to data 2011-11-10 14:37:47 +05:30
Nabin Hait
e098481f45 Pull items from BOM for production issue 2011-11-10 10:56:53 +05:30
Nabin Hait
33e19480ae UOM field added in BOM, will be fetched from item master 2011-11-09 13:53:16 +05:30
Nabin Hait
2cca0e7620 test case added for multiple stock entry for same datetime 2011-11-09 12:12:53 +05:30
Nabin Hait
93ba4fbaa4 Fixes related to finding prev sle 2011-11-08 15:30:04 +05:30
Nabin Hait
235439df5b bin fixes for reposting future entries 2011-11-08 12:52:51 +05:30
Nabin Hait
76228f1c79 bin fixes for reposting future entries 2011-11-08 12:49:24 +05:30
Rushabh Mehta
d77cb27bd2 fixes to bin for reposting future entires 2011-11-08 12:06:02 +05:30
Rushabh Mehta
efd222b6ac logout fix 2011-11-08 10:39:52 +05:30
Nabin Hait
cc02fd445c Repair button only visible after submit 2011-11-07 12:14:28 +05:30
Nabin Hait
30d34c4311 sal manager reload patch 2011-11-07 11:07:50 +05:30
Nabin Hait
990a5eacca sal manager reload patch 2011-11-07 10:51:29 +05:30
Nabin Hait
c67e0d85d3 Employemnt Type filter removed from salary manager 2011-11-07 10:48:51 +05:30
Rushabh Mehta
ae00547592 appriasal copy fix 2011-11-04 10:43:11 +05:30
Rushabh Mehta
36fc1d06fb appriasal copy fix 2011-11-04 10:41:12 +05:30
Anand Doshi
9207f51ced Changed image path to lib/images 2011-11-01 10:55:02 +05:30
Anand Doshi
3ee06a924a Fixed Knowledge Base Issue 2011-11-01 10:46:49 +05:30
Anand Doshi
30cf682e46 Change criteria name of employeewise_balance_leave_report 2011-10-31 17:41:04 +05:30
Anand Doshi
25190a903c Report to get Employeewise Balance Leave 2011-10-31 16:47:48 +05:30
Anand Doshi
dac955b897 Merge branch 'master' of github.com:webnotes/erpnext 2011-10-25 10:58:17 +05:30
Anand Doshi
867895404e Reverting the change '`' as it is taken care of by default 2011-10-25 10:54:49 +05:30
Anand Doshi
cd04d950a1 Merge pull request #137 from anandpdoshi/master
Changed path to image files in my_company.js
2011-10-24 03:21:19 -07:00
Anand Doshi
b16c231158 changed path to image files 2011-10-24 15:49:11 +05:30
Anand Doshi
71e3c9be66 Merge pull request #136 from anandpdoshi/master
Trend Analyser - allow table names with space
2011-10-24 02:18:24 -07:00
Rushabh Mehta
9666e657ce fixed fpe in bin 2011-10-24 14:35:04 +05:30
Rushabh Mehta
06f432f4c7 fixes to valuation control 2011-10-24 11:59:22 +05:30
Anand Doshi
2cde8670f2 enclosed table names in "`" to allow spaces in table names while querying 2011-10-24 11:39:36 +05:30
Rushabh Mehta
09dba5cf1d fixes to valuation control 2011-10-24 11:17:36 +05:30
Nabin Hait
612efe843b POS Setting js code restored from history 2011-10-21 16:19:58 +05:30
Nabin Hait
e2f0c5dfd0 Trend analyzer fix due to project field movement to item level in pur cycle 2011-10-21 14:55:16 +05:30
Nabin Hait
d0c9d422af patch for project changes in pur cycle 2011-10-20 19:21:03 +05:30
Nabin Hait
1979ad0586 Project wise analysis included in trend analyzer 2011-10-20 19:20:16 +05:30
Nabin Hait
57dd62d790 project column moved to item table in pur cycle 2011-10-20 19:19:07 +05:30
Nabin Hait
69554511da fixes in patch 2011-10-19 16:35:39 +05:30
Nabin Hait
2eb5ae48f7 patch: default print format for invoice is standard 2011-10-19 16:06:37 +05:30
Nabin Hait
13800440f1 fixed issue in patch 2011-10-19 15:38:42 +05:30
Nabin Hait
d751c1d40d patch for reloading print format and new POS format 2011-10-19 15:33:27 +05:30
Nabin Hait
68791fb13d resolved conflict 2011-10-19 15:15:51 +05:30
Nabin Hait
7762bdaf77 Letter head issue fixed in print format 2011-10-19 15:05:26 +05:30
Rushabh Mehta
790f453490 version update for wnf 2011-10-19 14:06:32 +05:30
Nabin Hait
ec7a85d11f 'Delivery Note Packing List Wise' print format modified 2011-10-18 19:03:02 +05:30
Nabin Hait
1546003d69 issue fixed in patch 2011-10-18 18:47:08 +05:30
Nabin Hait
0c005421fe Packing slip issues fixed and modified print format 2011-10-18 16:44:20 +05:30
Nabin Hait
a315a31919 Issue fixed in get stock qty if bin not exists 2011-10-17 15:01:31 +05:30
Nabin Hait
e7c4a4011f acc bal repost patch moved in separate file 2011-10-14 19:05:38 +05:30
Nabin Hait
df8304f00b acc bal repost patch moved in separate file 2011-10-14 19:05:08 +05:30
Nabin Hait
c0d7434794 Edited erpnext/patches/patch.py via GitHub 2011-10-14 00:14:31 +05:30
Nabin Hait
989462b669 account balance reposting with freezing current session 2011-10-13 17:33:30 +05:30
Nabin Hait
1a1ce709e0 Changes regarding POS fields 2011-10-13 14:08:33 +05:30
Nabin Hait
d84ad942d1 Removed repost patch 2011-10-13 14:04:26 +05:30
Nabin Hait
fe4c4f94da repost account balance patch 2011-10-13 11:07:14 +05:30
Nabin Hait
a6f0550d40 test cases for leave 2011-10-12 17:04:31 +05:30
Nabin Hait
c7cf94ec7b page break allow_on_submit 2011-10-12 13:16:11 +05:30
Nabin Hait
ee9efb568b flds added in mapper 2011-10-12 12:42:07 +05:30
Nabin Hait
89a9a26524 page_break column allow_on_submit 2011-10-12 12:41:00 +05:30
Nabin Hait
db3728955b error fixed in leave calculation 2011-10-11 17:11:24 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
fb37157163 packing slip related changes and test case for item 2011-10-11 13:57:48 +05:30
Nabin Hait
c1d4281718 packing slip related changes 2011-10-11 12:50:55 +05:30
Rushabh Mehta
5f66d60bdd fixed login url 2011-10-11 10:58:11 +05:30
Rushabh Mehta
6edb4635e6 fixed bugs 2011-10-11 10:50:23 +05:30
Ravi Dey
24ef523cac Issue fixed in setup control 2011-10-10 18:39:49 +05:30
Nabin Hait
15cad19d7c Serial No moved to Stock module from Support module 2011-10-10 17:10:24 +05:30
Nabin Hait
2810691979 field hide/unhide for pos 2011-10-10 12:33:43 +05:30
Nabin Hait
6a0561612f cost center groupto ledger and vice versa 2011-10-10 12:23:10 +05:30
Nabin Hait
8e54aa882a patch for page break issue 2011-10-07 19:03:19 +05:30
Nabin Hait
ddaa5a33fe reload PO-PR mapper 2011-10-07 12:36:13 +05:30
Nabin Hait
7a941869ab clear cache forcefully 2011-10-07 12:30:48 +05:30
Nabin Hait
d08fe6099a map schedule date from po to pr 2011-10-07 12:11:19 +05:30
Nabin Hait
914491f630 deleted duplicate button from QA inspection report 2011-10-06 10:23:26 +05:30
Nabin Hait
c68e045014 deleted duplicate button from QA inspection report 2011-10-05 17:01:16 +05:30
Nabin Hait
5630049d2a QA Inspection: get_query 2011-10-05 16:57:36 +05:30
Nabin Hait
1971942db8 purchase tax mapping while pulling 2011-10-05 14:56:16 +05:30
Nabin Hait
da50c0859c features by default on 2011-10-05 12:10:08 +05:30
Nabin Hait
a55eec137f Fieldname changed in Features Setup 2011-10-05 11:47:08 +05:30
Nabin Hait
b30c4a6611 Fieldname changed in Features Setup 2011-10-05 11:36:16 +05:30
Nabin Hait
a970b11cfb Test case added for Material Issue 2011-09-30 18:05:08 +05:30
Nabin Hait
61985ac5fa get_query modified for item in quotation 2011-09-30 17:46:08 +05:30
Nabin Hait
88e5170bd0 Test case added for MTN 2011-09-30 17:21:41 +05:30
Nabin Hait
88f9cb5d24 Test case added for MTN 2011-09-30 17:20:06 +05:30
Nabin Hait
31665e538a Test Case:
stock entry submit and cancel
Sandbox created for maintaining testdata and testcases
2011-09-29 10:41:02 +05:30
Nabin Hait
79e8247d82 fix in stock ledger 2011-09-29 10:40:04 +05:30
Nabin Hait
fff40599e8 test field deleted from warehouse 2011-09-29 10:39:44 +05:30
Nabin Hait
525887fd8a Error fixed in auth control 2011-09-27 17:00:01 +05:30
Nabin Hait
c8d5625763 removed trashed profile from user search result 2011-09-27 15:26:29 +05:30
Nabin Hait
d9a16a282c deleted gl_entry.js file 2011-09-27 15:10:07 +05:30
Nabin Hait
ec451da2f4 Re-written update_against_document_in_jv function in RV and PV 2011-09-27 12:47:59 +05:30
Nabin Hait
e2df68bb5b reload internal reconciliation 2011-09-27 12:47:09 +05:30
Nabin Hait
e76e2a1172 reload internal reconciliation 2011-09-27 12:45:48 +05:30
Nabin Hait
80ed6b25e8 deleted gl_control.js file 2011-09-27 11:53:23 +05:30
Nabin Hait
7e97d1f390 rebuild all tree through push_patch
Appraisal score allowed to be fraction
unhide group/ledger field in cost senter for import purpose
update_nsm_model in cost center on_trash()
2011-09-27 11:34:06 +05:30
Nabin Hait
3c8a50c257 Trial balance opening issue fixed if there is no prev year 2011-09-27 11:16:30 +05:30
Nabin Hait
a77cea2b90 Dont add opening entries in account balance debit, credit column 2011-09-27 11:14:54 +05:30
Nabin Hait
c752d075e6 fixed issue in reseting in opening balance, clear bal only that company 2011-09-27 11:04:24 +05:30
Nabin Hait
5c55e43234 trend analyzer issue fixed 2011-09-27 10:57:14 +05:30
Nabin Hait
c034e3d531 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-27 10:55:24 +05:30
Nabin Hait
39297e5775 update_nsm_model in cost center on_trash() 2011-09-27 10:36:17 +05:30
Nabin Hait
d223d12308 Rewritten update_against_document function 2011-09-26 18:57:43 +05:30
Nabin Hait
5f2046496b Internal Reconciliation: for knock out booking and payment entries 2011-09-26 18:56:02 +05:30
Nabin Hait
2736fd59ca fixed cancelled gl entry issue in period closing voucher 2011-09-26 12:55:52 +05:30
Nabin Hait
a28e366c15 deleted duplicate button fron JV 2011-09-22 16:32:02 +05:30
Nabin Hait
5941ae3b75 Default account creation order changed 2011-09-22 16:10:43 +05:30
Nabin Hait
b3ce0ecb34 repost account balance through push patch 2011-09-22 16:10:15 +05:30
Nabin Hait
e8475f9b85 Appraisal score allowed to be fraction 2011-09-22 11:00:53 +05:30
Nabin Hait
fdb0e362a7 update valuation and bin_aqat patch applicable after 01-09-2009 entries 2011-09-19 12:22:47 +05:30
Nabin Hait
48a52d42ed Merge branch 'master' of github.com:webnotes/erpnext 2011-09-16 17:29:30 +05:30
Nabin Hait
f060d0cd16 contact address will be fetched in sales invoice onload when come through mapper 2011-09-16 17:28:49 +05:30
Rushabh Mehta
32e00cb050 missing buttons 2011-09-16 16:28:35 +05:30
Nabin Hait
618d65b6ad company delete permission to system manager 2011-09-16 15:55:19 +05:30
Nabin Hait
e10900115e updated company on_trash function 2011-09-16 15:50:45 +05:30
Nabin Hait
d984872be9 checked sal struc docstatus in validation 2011-09-16 14:47:19 +05:30
Nabin Hait
2d26fe48ed removed sal structure amend permission 2011-09-16 14:35:57 +05:30
Nabin Hait
1dfb3fc7d8 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-16 14:33:38 +05:30
Nabin Hait
0b5f9b0475 update valuation and bin_aqat patch 2011-09-16 14:32:23 +05:30
Nabin Hait
8c9a5af231 Error fixed in bin 2011-09-16 12:51:19 +05:30
Nabin Hait
73c4a4a154 removed make_feed() function 2011-09-16 11:24:54 +05:30
Nabin Hait
ecc75123e8 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-15 15:40:53 +05:30
Nabin Hait
6ae7f8fe58 check serial nos bin qty only if serial no entered into the document 2011-09-15 15:40:27 +05:30
Rushabh Mehta
2adbd89ada Merge branch 'master' of github.com:webnotes/erpnext 2011-09-15 15:09:14 +05:30
Rushabh Mehta
53ba83158c fixes to startup 2011-09-15 15:06:23 +05:30
Nabin Hait
3b19f6b7c8 opening balance fixes in general ledger 2011-09-15 14:38:54 +05:30
Rushabh Mehta
0aed26d83d moved report to folder 2011-09-15 13:00:46 +05:30
Rushabh Mehta
2773940db1 merged from master 2011-09-15 12:55:25 +05:30
Rushabh Mehta
1e11cb486d merging from master and usability fixes to setup 2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Rushabh Mehta
cbaae20328 breakup of farmework files 2011-09-08 19:07:14 +05:30
Rushabh Mehta
5caedffff8 fixes to buttons etc 2011-09-08 15:45:37 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
5ede3e8411 fixes to home (multiple loading) 2011-09-08 14:16:34 +05:30
Rushabh Mehta
11c6be065a ready for 0.1 2011-09-06 15:50:01 +05:30
Rushabh Mehta
aa7b05aaeb Merge branch 'master' of github.com:webnotes/erpnext 2011-09-06 12:47:51 +05:30
Rushabh Mehta
b5717bd807 patch etc fixes 2011-09-06 12:46:33 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30