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 |
|