Anand Doshi
|
05f1d45600
|
removed unicode literals from patch list
|
2012-09-18 14:04:22 +05:30 |
|
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 |
|