Rushabh Mehta
|
0b2874afdb
|
fix to install
|
2012-02-09 12:45:50 +05:30 |
|
Anand Doshi
|
95e89de21d
|
Merge branch 'stable' into latest
Conflicts:
erpnext/home/page/event_updates/event_updates.js
|
2012-02-09 12:23:15 +05:30 |
|
Anand Doshi
|
3801804a8a
|
First Name and Last Name in setup account dialog box
|
2012-02-09 12:16:47 +05:30 |
|
Anand Doshi
|
83302dfe63
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 16:23:47 +05:30 |
|
Anand Doshi
|
cf5f0232a9
|
Merge branch 'stable' into latest
|
2012-02-08 16:23:35 +05:30 |
|
Anand Doshi
|
df3f452a14
|
Fix in Purchase Invoice creation due to item tax stringify issue
|
2012-02-08 16:22:59 +05:30 |
|
Rushabh Mehta
|
f16e32eca1
|
report builder fix'
|
2012-02-08 16:16:28 +05:30 |
|
Rushabh Mehta
|
b8d6497818
|
many style fixes
|
2012-02-08 12:33:13 +05:30 |
|
Anand Doshi
|
a685379d6b
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 11:06:12 +05:30 |
|
Anand Doshi
|
9908d6e4be
|
Merge branch 'stable' into latest
|
2012-02-08 11:05:47 +05:30 |
|
Rushabh Mehta
|
a1f3764238
|
about us style fix
|
2012-02-08 10:51:08 +05:30 |
|
Anand Doshi
|
c9fcc05792
|
Allow IS POS to be set as default from customize form view
|
2012-02-08 10:46:27 +05:30 |
|
Rushabh Mehta
|
02ec8c06fb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 10:44:33 +05:30 |
|
Rushabh Mehta
|
3fd279977b
|
website p sty;e
|
2012-02-08 10:44:02 +05:30 |
|
Anand Doshi
|
c6eea1e1ca
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-08 10:24:16 +05:30 |
|
Anand Doshi
|
88e4a0ffc2
|
Merge branch 'stable' into latest
|
2012-02-08 10:24:03 +05:30 |
|
Rushabh Mehta
|
bd20d29dae
|
pre style
|
2012-02-08 10:23:16 +05:30 |
|
Anand Doshi
|
d7ac84f430
|
removed msgprint in pending po items to receive report
|
2012-02-08 10:18:30 +05:30 |
|
Anand Doshi
|
a629fa3f05
|
Merge branch 'stable' into latest
|
2012-02-07 18:02:42 +05:30 |
|
Anand Doshi
|
02035d071a
|
Fix in import docs containing utf-8 encoding
|
2012-02-07 17:57:40 +05:30 |
|
Rushabh Mehta
|
a7f0c448bb
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:58:14 +05:30 |
|
Rushabh Mehta
|
4d20b2246c
|
style fixes
|
2012-02-07 14:57:49 +05:30 |
|
Anand Doshi
|
f812acf063
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:51:56 +05:30 |
|
Anand Doshi
|
8d3d2a9905
|
Merge branch 'stable' into latest
|
2012-02-07 14:51:38 +05:30 |
|
Anand Doshi
|
e59f456ad4
|
If support ticket doesnt have body, then do not append in reply to string
|
2012-02-07 14:50:50 +05:30 |
|
Rushabh Mehta
|
5b625fa592
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 14:32:20 +05:30 |
|
Rushabh Mehta
|
f9620eaf44
|
fix to product, blog
|
2012-02-07 14:31:49 +05:30 |
|
Anand Doshi
|
b65363aa46
|
Merge branch 'stable' into latest
|
2012-02-07 14:28:29 +05:30 |
|
Anand Doshi
|
188a499f45
|
Fix in default customer group fetch while converting lead to customer
|
2012-02-07 14:28:05 +05:30 |
|
Anand Doshi
|
4e47c48707
|
Merge branch 'stable' into latest
|
2012-02-07 13:33:10 +05:30 |
|
Anand Doshi
|
7e8082e193
|
Fixed mapping of conversion rate for PO-PR and PO-PV
|
2012-02-07 13:32:20 +05:30 |
|
Rushabh Mehta
|
518533fde0
|
added sitemap, rss feeds
|
2012-02-07 13:29:31 +05:30 |
|
Rushabh Mehta
|
9c7fe3bce4
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-07 11:43:51 +05:30 |
|
Rushabh Mehta
|
8b96b05163
|
fixes to products
|
2012-02-07 11:43:41 +05:30 |
|
Rushabh Mehta
|
002340080d
|
fixes to products
|
2012-02-07 07:08:05 +01:00 |
|
Anand Doshi
|
67d2c8396c
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-02-07 10:59:29 +05:30 |
|
Anand Doshi
|
e00e70841c
|
Merge branch 'stable' into latest
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
|
2012-02-07 10:58:45 +05:30 |
|
Anand Doshi
|
d008964fd6
|
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
|
2012-02-07 10:48:11 +05:30 |
|
Rushabh Mehta
|
f35992f695
|
top bar to accept url
|
2012-02-07 10:39:17 +05:30 |
|
Anand Doshi
|
99e7f3d7a4
|
Fix in valuation_control.py: eval requires a string. does not accept None.
|
2012-02-06 18:06:34 +05:30 |
|
Rushabh Mehta
|
0a45f96c48
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 17:40:46 +05:30 |
|
Rushabh Mehta
|
28307193a1
|
item group txt
|
2012-02-06 17:40:37 +05:30 |
|
Rushabh Mehta
|
cc54fd46bc
|
website fixes
|
2012-02-06 13:09:08 +01:00 |
|
Rushabh Mehta
|
e651648b1b
|
added missing icons
|
2012-02-06 16:28:06 +05:30 |
|
Rushabh Mehta
|
a7e68f7cd7
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 15:33:37 +05:30 |
|
Rushabh Mehta
|
e219db0e20
|
moved wnf.py to erpnext and added website manager role
|
2012-02-06 15:33:08 +05:30 |
|
Rushabh Mehta
|
b4244bacba
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-06 10:59:48 +01:00 |
|
Rushabh Mehta
|
4167e2f97a
|
patch fix
|
2012-02-06 10:58:48 +01:00 |
|
Rushabh Mehta
|
74fab55948
|
add home in website patch
|
2012-02-06 14:34:42 +05:30 |
|
Rushabh Mehta
|
594a0ca11d
|
fix in related page
|
2012-02-06 12:52:15 +05:30 |
|
Rushabh Mehta
|
af1cb632d6
|
bugfix to topbar
|
2012-02-06 07:29:52 +01:00 |
|
Rushabh Mehta
|
04048ff890
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-06 07:12:43 +01:00 |
|
Anand Doshi
|
7e13f9b4b5
|
Fix in email digest due to unicode change
|
2012-02-06 11:41:25 +05:30 |
|
Rushabh Mehta
|
fd5005567b
|
Fix in setup role permissions
|
2012-02-06 06:34:04 +01:00 |
|
Rushabh Mehta
|
7d5575ea3a
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-04 11:53:08 +01:00 |
|
Anand Doshi
|
b05f1a68f5
|
support ticket send issue
|
2012-02-04 16:22:21 +05:30 |
|
Rushabh Mehta
|
eba29ab88a
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-04 09:54:10 +05:30 |
|
Rushabh Mehta
|
6147451da3
|
refactored patches, bug fix for assign_to
|
2012-02-04 09:53:25 +05:30 |
|
Rushabh Mehta
|
cc43b7e927
|
Merge branch 'stable' of github.com:webnotes/erpnext into latest
|
2012-02-03 13:35:59 +01:00 |
|
Anand Doshi
|
3f711e2cb0
|
Fix in support ticket response issue
|
2012-02-03 18:03:32 +05:30 |
|
Rushabh Mehta
|
479670e4e1
|
added unicode to mysql, fix in about us
|
2012-02-03 16:56:18 +05:30 |
|
Rushabh Mehta
|
b4c814484e
|
fix to patch
|
2012-02-03 13:36:44 +05:30 |
|
Rushabh Mehta
|
63d669f390
|
updated feed for comments and login
|
2012-02-03 12:56:12 +05:30 |
|
Rushabh Mehta
|
adc9a61bd7
|
bugfix
|
2012-02-02 16:45:26 +05:30 |
|
Rushabh Mehta
|
50e2cfe78e
|
dateutil.js/patch fix
|
2012-02-02 16:40:01 +05:30 |
|
Anand Doshi
|
6d5cd01e03
|
Merge branch 'stable' into latest
|
2012-02-02 15:36:58 +05:30 |
|
Anand Doshi
|
2cb047d5a4
|
Added search field 'account_type' in account doctype
|
2012-02-02 15:36:34 +05:30 |
|
Anand Doshi
|
62427a6024
|
Merge branch 'stable' into latest
|
2012-02-02 15:23:33 +05:30 |
|
Anand Doshi
|
962c2aa80d
|
Auto fetch default bank account for jv of type Bank Voucher
|
2012-02-02 15:22:11 +05:30 |
|
Anand Doshi
|
8694dbb754
|
Merge branch 'stable' into latest
|
2012-02-02 14:07:55 +05:30 |
|
Anand Doshi
|
fd11313138
|
Support ticket response text fix
|
2012-02-02 14:07:39 +05:30 |
|
Anand Doshi
|
1a3bce3676
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-02-02 13:45:00 +05:30 |
|
Anand Doshi
|
32e1fa22cd
|
Merge branch 'stable' into latest
|
2012-02-02 13:44:32 +05:30 |
|
Rushabh Mehta
|
63adcb7355
|
patch update
|
2012-02-02 13:44:28 +05:30 |
|
Anand Doshi
|
ce25e169ab
|
Show only last response in support ticket response message
|
2012-02-02 13:44:05 +05:30 |
|
Rushabh Mehta
|
a3d21a46e8
|
version
|
2012-02-02 13:43:20 +05:30 |
|
Rushabh Mehta
|
7018b19f42
|
added website settings, refactored home
|
2012-02-02 13:42:28 +05:30 |
|
Anand Doshi
|
0c9cde9f62
|
Merge branch 'stable' into latest
Conflicts:
version.num
|
2012-02-02 12:43:39 +05:30 |
|
Anand Doshi
|
354dd9b35a
|
Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing)
|
2012-02-02 12:42:14 +05:30 |
|
Anand Doshi
|
a9a5128402
|
Merge branch 'stable' into latest
Conflicts:
erpnext/stock/doctype/item/item.txt
index.html
version.num
|
2012-02-02 11:44:25 +05:30 |
|
Anand Doshi
|
75d30b803f
|
Packing Slip and its patches
|
2012-02-02 11:38:15 +05:30 |
|
Rushabh Mehta
|
d47e1d14b7
|
added related page and other cleanups
|
2012-02-01 18:02:33 +05:30 |
|
Rushabh Mehta
|
9c69914cf6
|
todo fix
|
2012-02-01 15:03:54 +05:30 |
|
Rushabh Mehta
|
9ef63f93d6
|
moved back to 'index.cgi' model
|
2012-02-01 14:47:29 +05:30 |
|
Anand Doshi
|
3325d0db74
|
Patch to set docstatus=2 for purchase returned serial no
|
2012-02-01 11:36:31 +05:30 |
|
Anand Doshi
|
4f948e03be
|
Set docstatus as 2 for a purchase returned serial no
|
2012-02-01 11:27:36 +05:30 |
|
Rushabh Mehta
|
ab1148cbc9
|
added products, custom pages and footer
|
2012-01-31 18:01:16 +05:30 |
|
Anand Doshi
|
6afc6818a3
|
Check for duplicate challan number only in submitted purchase receipts
|
2012-01-31 17:21:04 +05:30 |
|
Anand Doshi
|
0717ca63b2
|
Fix in Purchase Return - Serial No. status issue
|
2012-01-31 16:20:37 +05:30 |
|
Anand Doshi
|
6c95ccb8f5
|
Net total calculation fix
|
2012-01-30 14:28:31 +05:30 |
|
Rushabh Mehta
|
bc5ec4f19e
|
version
|
2012-01-30 14:02:41 +05:30 |
|
Rushabh Mehta
|
d6840b202a
|
added products + cleanups
|
2012-01-30 14:00:46 +05:30 |
|
Anand Doshi
|
2729123868
|
Fix add user from my company
|
2012-01-30 12:50:18 +05:30 |
|
Anand Doshi
|
5f29438b1c
|
Fix in add user in my company
|
2012-01-30 12:44:59 +05:30 |
|
Anand Doshi
|
f3d3105d9a
|
Password fix on add user
|
2012-01-30 12:40:07 +05:30 |
|
Anand Doshi
|
e72de12993
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-30 11:59:05 +05:30 |
|
Anand Doshi
|
69cfc5566a
|
Email settings check on save
|
2012-01-30 11:54:59 +05:30 |
|
Anand Doshi
|
d3db70bb72
|
Supplier rename fix
|
2012-01-30 11:08:47 +05:30 |
|
Anand Doshi
|
327269fbc6
|
Check email settings while saving
|
2012-01-27 18:49:51 +05:30 |
|
Rushabh Mehta
|
3a751e8f82
|
added blog subscriber, unsubscribe
|
2012-01-27 18:00:14 +05:30 |
|
Rushabh Mehta
|
ad10c695ff
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-27 15:57:32 +05:30 |
|
Rushabh Mehta
|
c8d2e73ee6
|
added blog
|
2012-01-27 15:57:17 +05:30 |
|
Anand Doshi
|
76a4caeada
|
fix in send notification part of recurring invoices
|
2012-01-27 14:34:26 +05:30 |
|
Anand Doshi
|
f5738817db
|
fix in recurring invoice
|
2012-01-27 14:18:09 +05:30 |
|
Anand Doshi
|
707cd06606
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
|
2012-01-27 12:30:35 +05:30 |
|
Anand Doshi
|
02c662936f
|
Merge branch 'master' into latest
|
2012-01-27 12:28:21 +05:30 |
|
Anand Doshi
|
74d1b65105
|
changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch
|
2012-01-27 12:25:09 +05:30 |
|
Rushabh Mehta
|
51e51da63f
|
added about_us
|
2012-01-27 12:17:09 +05:30 |
|
Rushabh Mehta
|
4adaae6974
|
version
|
2012-01-25 18:49:32 +05:30 |
|
Rushabh Mehta
|
949496c31b
|
added website.page.contact
|
2012-01-25 18:48:46 +05:30 |
|
Anand Doshi
|
af1ad9a31e
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
version.num
|
2012-01-25 17:27:57 +05:30 |
|
Anand Doshi
|
6e174cc2c4
|
Merge branch 'master' into latest
Conflicts:
erpnext/setup/doctype/notification_control/notification_control.js
index.html
version.num
|
2012-01-25 17:21:14 +05:30 |
|
Anand Doshi
|
46848a48fe
|
Show DocType Labels instead of DocType names in Customize Form View
|
2012-01-25 17:15:46 +05:30 |
|
Rushabh Mehta
|
4b1fe0528a
|
added home template
|
2012-01-25 15:06:28 +05:30 |
|
Anand Doshi
|
04a115e771
|
Fix: Logout user on disabling profile
|
2012-01-25 12:52:38 +05:30 |
|
Rushabh Mehta
|
9c7a01ade9
|
starting up
|
2012-01-25 11:04:54 +05:30 |
|
Rushabh Mehta
|
a8ad3907db
|
added website page, home, patch
|
2012-01-25 10:37:35 +05:30 |
|
Anand Doshi
|
c655e37f1a
|
Fixes in production and stock modules
|
2012-01-25 09:58:06 +05:30 |
|
Anand Doshi
|
d194e6b5cf
|
Fix: show message if contact doesn't have email if notification control is enabled
|
2012-01-24 17:08:53 +05:30 |
|
Rushabh Mehta
|
17a8a3697d
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-24 15:16:34 +05:30 |
|
Rushabh Mehta
|
5b9270981c
|
added css:
|
2012-01-24 15:16:06 +05:30 |
|
Anand Doshi
|
6be842f960
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-24 14:58:41 +05:30 |
|
Anand Doshi
|
a2c9e39ca3
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-24 14:58:24 +05:30 |
|
Anand Doshi
|
f51e52c1be
|
Fix in subject issue of support ticket
|
2012-01-24 14:56:20 +05:30 |
|
Rushabh Mehta
|
7cca292494
|
version
|
2012-01-24 14:34:27 +05:30 |
|
Rushabh Mehta
|
865c00a79a
|
started website
|
2012-01-24 14:33:21 +05:30 |
|
Anand Doshi
|
a2fcca578d
|
Purchase Other Charges - company field
|
2012-01-24 13:46:46 +05:30 |
|
Anand Doshi
|
2e3ce6cc02
|
Fix error in patch due to single quote in name
|
2012-01-24 11:37:28 +05:30 |
|
Anand Doshi
|
3c572d7468
|
change patch file in patch list customer address contact patch
|
2012-01-24 10:55:04 +05:30 |
|
Anand Doshi
|
568ab004ad
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
index.html
version.num
|
2012-01-23 18:41:33 +05:30 |
|
Anand Doshi
|
590be7e643
|
Merge branch 'master' into latest
Conflicts:
index.html
version.num
|
2012-01-23 18:37:09 +05:30 |
|
Anand Doshi
|
706baf77ae
|
customer address contact patch
|
2012-01-23 18:35:28 +05:30 |
|
Anand Doshi
|
9a7ea9285e
|
Customer Address Contact report
|
2012-01-23 18:32:20 +05:30 |
|
Anand Doshi
|
7daed0cad7
|
Merge branch 'master' into stable
|
2012-01-23 18:13:58 +05:30 |
|
Rushabh Mehta
|
1061b4a7ea
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-23 16:18:53 +05:30 |
|
Rushabh Mehta
|
c5bf642c7d
|
version
|
2012-01-23 16:18:34 +05:30 |
|
Anand Doshi
|
4d22ce96d1
|
Fix: is_default of BOM
|
2012-01-23 14:51:00 +05:30 |
|
Anand Doshi
|
cfdd827a84
|
Merge branch 'master' into latest
|
2012-01-23 14:09:50 +05:30 |
|
Anand Doshi
|
a170418ed0
|
Fixes in floating point issues
|
2012-01-23 14:09:06 +05:30 |
|
Anand Doshi
|
0529bc1e53
|
Doc's name in subject of auto notifications
|
2012-01-23 10:54:53 +05:30 |
|
Rushabh Mehta
|
843db59fcb
|
version fixes
|
2012-01-20 17:43:37 +05:30 |
|
Rushabh Mehta
|
49ebfb6a30
|
version
|
2012-01-20 15:32:18 +05:30 |
|
Anand Doshi
|
6840ef67df
|
Merge branch 'stable' into latest
|
2012-01-20 15:03:23 +05:30 |
|
Anand Doshi
|
da68ce8b84
|
Fix to other charges total
|
2012-01-20 15:02:41 +05:30 |
|
Anand Doshi
|
af4b0a9e90
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-20 14:50:45 +05:30 |
|
Anand Doshi
|
12b1db4e8a
|
Merge branch 'stable' into latest
|
2012-01-20 14:50:15 +05:30 |
|
Anand Doshi
|
60c42d2e1c
|
Fix to other charges total
|
2012-01-20 14:44:14 +05:30 |
|
Anand Doshi
|
4c92390972
|
Fix to other charges total
|
2012-01-20 14:32:01 +05:30 |
|
Anand Doshi
|
10393b39d3
|
Other Charges total fixed to 2 decimals
|
2012-01-20 14:29:40 +05:30 |
|
Rushabh Mehta
|
c071af73e2
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-20 13:51:44 +05:30 |
|
Rushabh Mehta
|
8c309bee53
|
bootstrap toolbar
|
2012-01-20 13:47:16 +05:30 |
|
Anand Doshi
|
821b6544f8
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-20 13:23:37 +05:30 |
|
Anand Doshi
|
42907ffb43
|
Merge branch 'stable' into latest
|
2012-01-20 13:23:04 +05:30 |
|
Anand Doshi
|
ff54778418
|
Fix in sales_common
|
2012-01-20 13:20:21 +05:30 |
|
Rushabh Mehta
|
764fdb942e
|
updated account url and js version
|
2012-01-20 12:07:56 +05:30 |
|
Rushabh Mehta
|
b7d831b734
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-20 10:53:35 +05:30 |
|
Rushabh Mehta
|
0a5657809a
|
fixes to add user
|
2012-01-20 10:52:53 +05:30 |
|
Anand Doshi
|
869c7bcbb2
|
Validate if another GRN exists having same supplier and challan no. - then throw exception
|
2012-01-19 18:31:21 +05:30 |
|
Anand Doshi
|
8c36f47ea6
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-19 17:13:43 +05:30 |
|
Anand Doshi
|
6c7e54d373
|
Merge branch 'master' into latest
|
2012-01-19 17:13:05 +05:30 |
|
Anand Doshi
|
edb45c6ce5
|
Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js
|
2012-01-19 17:12:17 +05:30 |
|
Rushabh Mehta
|
f2c4c4231f
|
minor bugfixes
|
2012-01-19 11:43:34 +01:00 |
|
Rushabh Mehta
|
3a32478db9
|
confict fix
|
2012-01-19 15:11:07 +05:30 |
|
Rushabh Mehta
|
d31bf62c9a
|
fixed patches, small bugs
|
2012-01-19 15:09:49 +05:30 |
|
Anand Doshi
|
20274a0069
|
Merge branch 'master' into latest
|
2012-01-19 15:00:56 +05:30 |
|
Anand Doshi
|
39eff71864
|
remove get tds button
|
2012-01-19 14:57:23 +05:30 |
|
Anand Doshi
|
28ac0b0c88
|
Merge branch 'master' into latest
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 14:31:03 +05:30 |
|
Anand Doshi
|
26814e7bad
|
Remove Get TDS button, which appears twice in JV
|
2012-01-19 14:26:25 +05:30 |
|
Anand Doshi
|
ad2f5d1270
|
Merge branch 'stable'
|
2012-01-19 12:42:11 +05:30 |
|
Anand Doshi
|
f343a8bc75
|
remove extra buttons labelled Make Maintenance Visit
|
2012-01-19 12:41:54 +05:30 |
|
Anand Doshi
|
4b0b4a7fdc
|
Merge branch 'stable'
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 12:35:54 +05:30 |
|
Anand Doshi
|
b5bc54dd00
|
Merge branch 'stable' into latest
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 12:34:30 +05:30 |
|
Anand Doshi
|
5f72836f11
|
Patch to change allocated_to options to 'Profile'
|
2012-01-19 12:32:15 +05:30 |
|
Anand Doshi
|
06c1050863
|
Merge branch 'master' into latest
|
2012-01-19 11:51:28 +05:30 |
|
Anand Doshi
|
367357fafd
|
utf-8 encode response message while sending email response message
|
2012-01-19 11:48:43 +05:30 |
|
Anand Doshi
|
d94d1c6dff
|
Merge branch 'master' into latest
|
2012-01-19 11:38:23 +05:30 |
|
Anand Doshi
|
32fd59b3ff
|
resolved utf-8 issue in 'In Reply To' part of support ticket response
|
2012-01-19 11:37:32 +05:30 |
|
Anand Doshi
|
a7d632db99
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
index.html
version.num
|
2012-01-18 12:33:16 +05:30 |
|
Anand Doshi
|
165fe9e122
|
Merge branch 'stable' into latest
|
2012-01-18 12:31:51 +05:30 |
|
Anand Doshi
|
2cb3cef064
|
Merge branch 'stable'
|
2012-01-18 12:31:32 +05:30 |
|
Anand Doshi
|
890aa0f51d
|
fix: interface error due to use of sql instead of webnotes.conn.sql
|
2012-01-18 12:25:20 +05:30 |
|
Rushabh Mehta
|
94b88b9e22
|
added patch for subdomain
|
2012-01-18 10:55:39 +05:30 |
|
Rushabh Mehta
|
0a29975bfe
|
fixed conflicts
|
2012-01-18 10:54:55 +05:30 |
|
Rushabh Mehta
|
88ba7b86dc
|
fixes to login check
|
2012-01-18 06:18:52 +01:00 |
|
Anand Doshi
|
d3a23b5e8c
|
Item Manufacturer/Supplier Details in item doctype
|
2012-01-17 18:46:43 +05:30 |
|
Rushabh Mehta
|
bedc1fe534
|
new login authentication
|
2012-01-17 18:17:06 +05:30 |
|
Anand Doshi
|
16c4e72199
|
Merge branch 'stable' into latest
|
2012-01-17 14:25:30 +05:30 |
|
Anand Doshi
|
97bd3663f2
|
Show full name in contact_display
|
2012-01-17 14:22:09 +05:30 |
|
Anand Doshi
|
34561e73dd
|
Merge branch 'stable' into latest
|
2012-01-16 17:53:45 +05:30 |
|
Anand Doshi
|
a0b1948261
|
Support Ticket - In response to fix
|
2012-01-16 17:52:15 +05:30 |
|
Anand Doshi
|
dc914276a9
|
Merge branch 'master' into latest
|
2012-01-16 17:39:33 +05:30 |
|
Anand Doshi
|
a9023b1787
|
Merge branch 'stable'
|
2012-01-16 17:39:10 +05:30 |
|
Anand Doshi
|
fd0373826b
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2012-01-16 17:38:47 +05:30 |
|
Anand Doshi
|
d487f782a4
|
Fix: change module name from material_management to stock in an import in installation_note
|
2012-01-16 17:38:19 +05:30 |
|
Anand Doshi
|
077416300e
|
Fix: floating point issue on submission of RV and creation of GL Entry
|
2012-01-16 16:02:47 +05:30 |
|
Rushabh Mehta
|
b3672784be
|
support ticket goes with response
|
2012-01-16 14:27:43 +05:30 |
|
Anand Doshi
|
90f6e55c29
|
Changes in Inclusive Rate Taxes precision
|
2012-01-16 14:13:39 +05:30 |
|
Rushabh Mehta
|
cb60ca13a9
|
added patch to convert tables to utf8
|
2012-01-16 11:58:14 +05:30 |
|
Anand Doshi
|
1acf3f4de5
|
Merge branch 'stable'
|
2012-01-13 17:43:46 +05:30 |
|
Anand Doshi
|
610f9728ab
|
Removing ref_rate back calculation as it injects floating point issue
|
2012-01-13 17:43:22 +05:30 |
|
Anand Doshi
|
8241e9a2ce
|
Merge branch 'stable'
|
2012-01-13 15:54:01 +05:30 |
|
Anand Doshi
|
a318235a1f
|
Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision
|
2012-01-13 15:53:46 +05:30 |
|
Anand Doshi
|
e5b60884d0
|
Merge branch 'stable'
|
2012-01-13 15:46:17 +05:30 |
|
Anand Doshi
|
4badeecf36
|
Reverting toFixed issue for grand total
|
2012-01-13 15:45:58 +05:30 |
|
Anand Doshi
|
98660b5d5a
|
Merge branch 'stable'
|
2012-01-13 14:36:09 +05:30 |
|
Anand Doshi
|
560883145c
|
Fix to floating point issue in grand total
|
2012-01-13 14:35:42 +05:30 |
|
Anand Doshi
|
ada0b5d554
|
Merge branch 'stable'
|
2012-01-13 13:24:53 +05:30 |
|
Anand Doshi
|
7b96d1f300
|
search_criteria patch
|
2012-01-13 11:53:22 +05:30 |
|
Anand Doshi
|
4b80a81a2e
|
Rename Search Criteria Patch
|
2012-01-13 11:14:29 +05:30 |
|
Anand Doshi
|
d2b8072805
|
Merge branch 'stable'
|
2012-01-12 15:13:59 +05:30 |
|
Anand Doshi
|
265f3edb8f
|
On clicking Get Charges, also pull the field included_in_print_rate
|
2012-01-12 14:56:26 +05:30 |
|
Anand Doshi
|
d03efeaf00
|
Fixed UX issue in change user password by system manager
|
2012-01-12 14:50:51 +05:30 |
|
Anand Doshi
|
29c5676467
|
Merge branch 'stable'
|
2012-01-12 13:47:22 +05:30 |
|
Anand Doshi
|
cb1f361461
|
Fix: Notify via email on new post on my company page
|
2012-01-12 13:46:46 +05:30 |
|
Anand Doshi
|
640955f91d
|
Patch for fixes after major production rewrite
|
2012-01-12 12:55:29 +05:30 |
|
Anand Doshi
|
2bc9423cd1
|
Fix: Backflush issue due to missing BOM
|
2012-01-12 12:32:13 +05:30 |
|
Nabin Hait
|
c95bad917b
|
open sales order query changes: pull only those which are pending to deliver
|
2012-01-11 18:28:43 +05:30 |
|
Nabin Hait
|
d3db58d6b4
|
Pull only SO which has production/subcontracted item
|
2012-01-11 17:48:09 +05:30 |
|
Nabin Hait
|
8389e7aad1
|
Description changed in pro order
|
2012-01-11 17:37:06 +05:30 |
|
Nabin Hait
|
a8077bdd20
|
Error fixed in patch
|
2012-01-11 17:22:54 +05:30 |
|
Nabin Hait
|
ce3ecf00c2
|
Removed msgprint from bom control
|
2012-01-11 17:17:47 +05:30 |
|
Nabin Hait
|
8be5017048
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-11 16:58:01 +05:30 |
|
Nabin Hait
|
42a411398a
|
Error fixed in patches
|
2012-01-11 16:57:44 +05:30 |
|
Anand Doshi
|
a550c06729
|
last_name optional in profile settings
|
2012-01-11 16:53:50 +05:30 |
|
Nabin Hait
|
55c037c250
|
Added production_cleanup patch
|
2012-01-11 16:44:07 +05:30 |
|
Nabin Hait
|
c5d6bcbb8f
|
Production module cleanup
|
2012-01-11 16:41:16 +05:30 |
|
Anand Doshi
|
06d43bcfe2
|
Fix: Rounded Total appearing extra in Standard Print Format
|
2012-01-11 15:05:24 +05:30 |
|
Anand Doshi
|
58574acfbc
|
Fix: Bug in Actual Tax Rate due to inclusive rate
|
2012-01-11 13:39:06 +05:30 |
|
Anand Doshi
|
a8c2f59d1b
|
Escape (') in customer name in authorization control
|
2012-01-11 12:07:48 +05:30 |
|
Anand Doshi
|
385299903d
|
Escape (') in customer name in authorization control
|
2012-01-11 12:03:47 +05:30 |
|
Anand Doshi
|
35041607be
|
Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate
|
2012-01-11 11:21:58 +05:30 |
|
Anand Doshi
|
9896452903
|
txt dump of DocType Label Indent and Module Def Buying
|
2012-01-10 17:58:07 +05:30 |
|
Anand Doshi
|
bf166e487d
|
Patch to rename doctype indent
|
2012-01-10 17:06:16 +05:30 |
|
Anand Doshi
|
3a82dfd171
|
Rename Indent to Purchase Requisition
|
2012-01-10 16:56:11 +05:30 |
|
Anand Doshi
|
bc45f896f7
|
Merged master with stable
|
2012-01-10 14:11:07 +05:30 |
|
Anand Doshi
|
266829f024
|
Merge branch 'master' into stable
|
2012-01-10 13:59:14 +05:30 |
|
Anand Doshi
|
a0aa3d5605
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-10 13:59:04 +05:30 |
|
Anand Doshi
|
95c9d30cfd
|
Removed unnecessary console logs
|
2012-01-10 11:52:43 +05:30 |
|
Anand Doshi
|
a9df960494
|
On Print Hide, hide net_total, rounded_total_export and grand_total_export
|
2012-01-09 16:55:30 +05:30 |
|
Nabin Hait
|
40de49110e
|
Removed webforms link from setup
|
2012-01-09 12:54:20 +05:30 |
|
Anand Doshi
|
07d8570c80
|
Make Profile Last Name optional in profile settings
|
2012-01-06 18:14:42 +05:30 |
|
Anand Doshi
|
a31fd1080b
|
Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link
|
2012-01-06 16:27:54 +05:30 |
|
Anand Doshi
|
58455c9d8e
|
Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed
|
2012-01-06 14:33:57 +05:30 |
|
Anand Doshi
|
4a1da119f9
|
Refresh support ticket status when a new reply is received
|
2012-01-06 12:58:23 +05:30 |
|
Anand Doshi
|
7f16efe35d
|
Refresh issue fixed for support ticket
|
2012-01-06 12:06:29 +05:30 |
|
Anand Doshi
|
7a87c7de46
|
Trying to fix support ticket refresh issue
|
2012-01-06 12:02:50 +05:30 |
|
Anand Doshi
|
449f534c36
|
Trying to fix support ticket refresh on reply issue
|
2012-01-06 11:54:21 +05:30 |
|
Anand Doshi
|
6a13e8b645
|
Apply naming series when saving support ticket for 1st time
|
2012-01-05 19:17:57 +05:30 |
|
Nabin Hait
|
fb5df36c38
|
event notificationin maintenance schedule
|
2012-01-05 18:37:27 +05:30 |
|
Nabin Hait
|
84745e7ac1
|
event notificationin maintenance schedule
|
2012-01-05 18:03:16 +05:30 |
|
Anand Doshi
|
9dd1e5d728
|
Support Ticket Naming Series
|
2012-01-05 17:39:42 +05:30 |
|
Anand Doshi
|
97b1bf4b19
|
Fixed support ticket issue
|
2012-01-05 15:46:47 +05:30 |
|
Anand Doshi
|
dc64802e96
|
Fix Support Ticket
|
2012-01-05 15:19:00 +05:30 |
|
Anand Doshi
|
523f3a0ea2
|
Added Administrator to exception list of users to be logged out post login
|
2012-01-05 14:34:30 +05:30 |
|
Nabin Hait
|
a9cca2e2e9
|
error fixed in reorder indent
|
2012-01-05 14:10:14 +05:30 |
|
Nabin Hait
|
8fb9abd47e
|
Subject added in notification mail
|
2012-01-05 14:01:35 +05:30 |
|
Anand Doshi
|
9dfc9f617b
|
Fix regarding support ticket to support ticket system email chaining issue
|
2012-01-05 13:54:29 +05:30 |
|
Nabin Hait
|
b50c02214c
|
removed pur of service
|
2012-01-05 12:21:03 +05:30 |
|
Nabin Hait
|
7394239e05
|
delete purpose of service
|
2012-01-05 12:16:28 +05:30 |
|
Nabin Hait
|
2abc6026f2
|
reload po-pr mapper
|
2012-01-05 11:24:49 +05:30 |
|
Nabin Hait
|
d2686b1c31
|
reload doctype
|
2012-01-05 11:16:18 +05:30 |
|
Anand Doshi
|
5e57a39bb1
|
Merge branch 'master' into stable
|
2012-01-04 19:32:01 +05:30 |
|
Anand Doshi
|
f80f20f480
|
Changes in Notifications
|
2012-01-04 19:31:32 +05:30 |
|
Nabin Hait
|
15e8277a46
|
Dont update series starts from if no prefix
|
2012-01-04 16:23:09 +05:30 |
|
Nabin Hait
|
9d8e85c1f5
|
Dont update series starts from if no prefix
|
2012-01-04 16:17:18 +05:30 |
|
Anand Doshi
|
a6272af68a
|
Fix to logout previous session on login
|
2012-01-03 17:02:20 +05:30 |
|
Anand Doshi
|
b63a007c91
|
Fixed logout issue
|
2012-01-03 16:11:04 +05:30 |
|
Anand Doshi
|
d34ff76526
|
Fixed logout issues
|
2012-01-03 16:00:03 +05:30 |
|
Anand Doshi
|
6ac1d4bb44
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
|
2012-01-03 11:45:11 +05:30 |
|
Anand Doshi
|
9fdee387ea
|
Allow demo user to have multiple sessions
|
2012-01-03 11:26:00 +05:30 |
|
Nabin Hait
|
616548f95c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-03 11:10:25 +05:30 |
|
Nabin Hait
|
db126e80b8
|
pos setting patch
|
2012-01-03 11:10:11 +05:30 |
|
Anand Doshi
|
d56d57d205
|
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
|
2012-01-02 16:25:05 +05:30 |
|
Anand Doshi
|
1e4b8be8dc
|
Merge pull request #194 from anandpdoshi/master
Posting comments to other users now working
|
2012-01-02 02:31:30 -08:00 |
|
Anand Doshi
|
1fad05aed8
|
Bug Fix: Posting comments to other users now working
|
2012-01-02 16:00:15 +05:30 |
|
Anand Doshi
|
62dbf27780
|
Merge pull request #192 from anandpdoshi/master
New transaction entries fix for email digest
|
2011-12-30 02:33:05 -08:00 |
|
Anand Doshi
|
34b9f5b1e0
|
Fix new transaction entries issue
|
2011-12-30 16:02:03 +05:30 |
|
Nabin Hait
|
c184dc56a4
|
Error fixed in uom conversion rate fetching
|
2011-12-30 13:29:45 +05:30 |
|
Nabin Hait
|
a21156d4d3
|
Removed msgprint
|
2011-12-30 11:16:15 +05:30 |
|
Nabin Hait
|
21d0b68a7d
|
Fixes in pending_patches
|
2011-12-29 15:39:26 +05:30 |
|
Nabin Hait
|
0dfb8e939c
|
Pending patches to be run from patch.py
|
2011-12-29 14:40:05 +05:30 |
|
Nabin Hait
|
48285ede08
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-29 12:57:31 +05:30 |
|
Nabin Hait
|
6182b929bf
|
set default value as blank insead of None through manage account
|
2011-12-29 12:56:55 +05:30 |
|
Anand Doshi
|
10748d6bdb
|
Merge pull request #190 from anandpdoshi/master
Changed link for customer master and supplier master in accounts browser
|
2011-12-28 03:49:13 -08:00 |
|
Anand Doshi
|
eaa6d21691
|
Changed link for customer master and supplier master in accounts browser
|
2011-12-28 17:18:09 +05:30 |
|
Nabin Hait
|
9e08c12a10
|
Default price list currency issue in delivery note fixed
|
2011-12-28 16:30:48 +05:30 |
|
Anand Doshi
|
7a4d9dbd3e
|
Fixes in support ticket attachments
|
2011-12-27 19:40:10 +05:30 |
|
Anand Doshi
|
c50f605450
|
Enabled Attachments in Support Ticket
|
2011-12-27 17:44:30 +05:30 |
|
Anand Doshi
|
08eff708bf
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-27 17:24:19 +05:30 |
|
Anand Doshi
|
20f0d305cb
|
Allow attachments in support ticket
|
2011-12-27 17:09:55 +05:30 |
|
Nabin Hait
|
4febc84f13
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-27 16:42:27 +05:30 |
|
Nabin Hait
|
3029474b0e
|
Fixes in recurring invoice
|
2011-12-27 16:42:03 +05:30 |
|
Nijil Y
|
04eb52dbe3
|
added fields
|
2011-12-26 15:30:45 +05:30 |
|
Nijil Y
|
68de3687f4
|
added fields
|
2011-12-26 15:24:55 +05:30 |
|
Nabin Hait
|
3f7d7077f0
|
Merge pull request #183 from nijil/master
allignment and error fix
|
2011-12-25 23:13:05 -08:00 |
|
Nabin Hait
|
a0778fec61
|
Reload gl mapper patches
|
2011-12-26 12:28:14 +05:30 |
|
Nijil Y
|
2a59030e05
|
task notification fix
|
2011-12-26 12:00:30 +05:30 |
|
Nabin Hait
|
16aacdfeeb
|
Error fixed in ticket
|
2011-12-26 11:37:52 +05:30 |
|
Nabin Hait
|
cf0163d09e
|
Patch updated
|
2011-12-26 11:13:49 +05:30 |
|
Nabin Hait
|
f7e1569207
|
ticket.py modified
|
2011-12-26 11:08:55 +05:30 |
|
Nabin Hait
|
a0286e986e
|
patch updated
|
2011-12-26 11:08:32 +05:30 |
|
Nabin Hait
|
40deced91c
|
Merge pull request #180 from nijil/master
Task Notification
|
2011-12-25 21:24:33 -08:00 |
|
Nabin Hait
|
56f7ccbe70
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-23 18:26:34 +05:30 |
|
Nabin Hait
|
c6359a9179
|
Patch to update against_voucher in gle for jv aganst jv
|
2011-12-23 18:26:17 +05:30 |
|
Nabin Hait
|
382dc6e819
|
GL Mapper changes for JV
|
2011-12-23 18:25:11 +05:30 |
|
Nijil Y
|
a4e8d1e983
|
.
|
2011-12-23 18:01:40 +05:30 |
|
Nijil Y
|
0cfecf2920
|
email message fix for task
|
2011-12-23 17:54:07 +05:30 |
|
Nijil Y
|
0de918204d
|
Merge branch 'master' of git://github.com/webnotes/erpnext
|
2011-12-23 17:35:39 +05:30 |
|
Nijil Y
|
cc64682baa
|
fixed
|
2011-12-23 17:35:18 +05:30 |
|
Nijil Y
|
89e5624730
|
Update erpnext/projects/doctype/ticket/ticket.py
|
2011-12-23 16:21:51 +05:30 |
|
Nijil Y
|
9239afa222
|
Update erpnext/projects/doctype/ticket/ticket.py
|
2011-12-23 16:18:49 +05:30 |
|
Nijil Y
|
cc0e502d0f
|
scheduler
|
2011-12-23 15:08:43 +05:30 |
|
Anand Doshi
|
8d53f7635a
|
Merge pull request #179 from anandpdoshi/master
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
|
2011-12-23 00:21:53 -08:00 |
|
Anand Doshi
|
ac20eb2107
|
Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create
|
2011-12-23 13:50:28 +05:30 |
|
Nijil Y
|
4d64379aa6
|
scheduler added to project control for reminder
|
2011-12-23 12:32:08 +05:30 |
|
Nijil Y
|
b8eab4f2da
|
Merge branch 'master' of git://github.com/webnotes/erpnext
|
2011-12-23 12:19:46 +05:30 |
|
Nijil Y
|
f1e98b9d8b
|
Scheduler added for reminder notification - which will be sent 2 days before the task begins
|
2011-12-23 12:01:31 +05:30 |
|
Anand Doshi
|
d9fc4c07c9
|
Merge pull request #178 from anandpdoshi/master
Fix: Email digest gets deleted if even one is disabled
|
2011-12-22 22:27:47 -08:00 |
|
Anand Doshi
|
bd269cdbe7
|
Fix: Email digest gets deleted if even one is disabled.
|
2011-12-23 11:55:00 +05:30 |
|
Nabin Hait
|
e80496cef4
|
Consider description also to check item duplication in purchase cycle
|
2011-12-23 11:25:37 +05:30 |
|
Nabin Hait
|
e323ef20b0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-22 19:05:08 +05:30 |
|
Nabin Hait
|
d0a892ffe7
|
print hide price list flds
|
2011-12-22 19:04:49 +05:30 |
|
Anand Doshi
|
f5d5f10ff3
|
Remove "Add Recipients" button from Email Digest (again!)
|
2011-12-22 19:02:15 +05:30 |
|
Anand Doshi
|
4714424de0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-22 18:22:46 +05:30 |
|
Anand Doshi
|
0188df1609
|
Amended the patch to import class Document
|
2011-12-22 18:21:57 +05:30 |
|
Anand Doshi
|
27b05eac7a
|
Merge pull request #176 from anandpdoshi/master
Patch to enable income year to date summary in email digest
|
2011-12-22 04:48:57 -08:00 |
|
Anand Doshi
|
68f3967de0
|
Patch to enable income year to date summary in email digest
|
2011-12-22 18:18:10 +05:30 |
|
Anand Doshi
|
a4db9e9b5a
|
Merge pull request #175 from anandpdoshi/master
Added feature: Income Year To Date in Email Digest
|
2011-12-22 04:33:35 -08:00 |
|
Anand Doshi
|
61a4a498cf
|
Added feature: Income Year To Date in Email Digest
|
2011-12-22 18:02:36 +05:30 |
|
Nijil Y
|
f2a5c290b3
|
Merge branch 'master' of git://github.com/webnotes/erpnext
|
2011-12-22 17:43:46 +05:30 |
|
Nijil Y
|
b3058a3d5a
|
Task Notification donw, reminder left
|
2011-12-22 17:39:18 +05:30 |
|
Anand Doshi
|
6d0be02364
|
Merge pull request #174 from anandpdoshi/master
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
|
2011-12-22 04:06:35 -08:00 |
|
Anand Doshi
|
94a18109d7
|
Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body
|
2011-12-22 17:34:11 +05:30 |
|
Anand Doshi
|
3ca92bb3e4
|
Merge pull request #173 from anandpdoshi/master
Dont show bank balance if no ledger of type "Bank or Cash"
|
2011-12-22 03:54:48 -08:00 |
|
Anand Doshi
|
7792d08408
|
Dont show bank balance if no ledger of type "Bank or Cash"
|
2011-12-22 17:23:11 +05:30 |
|
Anand Doshi
|
99479bdb7f
|
Merge pull request #172 from anandpdoshi/master
remove previous field property setter
|
2011-12-22 01:50:07 -08:00 |
|
Anand Doshi
|
f2f4c87bb6
|
remove previous field property setter
|
2011-12-22 15:19:16 +05:30 |
|
Anand Doshi
|
d1bfe839fa
|
Merge pull request #171 from anandpdoshi/master
Patch to update idx which starts with 0
|
2011-12-22 01:37:04 -08:00 |
|
Anand Doshi
|
9ca7e5255b
|
Patch to update idx.. start idx from 1
|
2011-12-22 15:05:14 +05:30 |
|
Nijil Y
|
8acb043a8a
|
update
|
2011-12-22 13:08:25 +05:30 |
|
Nabin Hait
|
7e812bbee0
|
Error fixed in patch
|
2011-12-22 12:58:34 +05:30 |
|
Nabin Hait
|
6998261a7e
|
Error fixed in auto indent patches
|
2011-12-22 12:56:57 +05:30 |
|
Nabin Hait
|
20c87531cb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-22 12:54:39 +05:30 |
|
Nabin Hait
|
9e8249fea1
|
Error fixed in bin
|
2011-12-22 12:54:13 +05:30 |
|
Anand Doshi
|
5a32f78bf3
|
Merge pull request #170 from anandpdoshi/master
calls on_update method of email_digest obj for creating a scheduler entry
|
2011-12-21 22:59:31 -08:00 |
|
Anand Doshi
|
248f8f5687
|
Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry
|
2011-12-22 12:26:36 +05:30 |
|
Anand Doshi
|
c9b2743e1c
|
Merge pull request #168 from anandpdoshi/master
Fix Image attachments and Enable Email Digests
|
2011-12-21 22:45:13 -08:00 |
|
Anand Doshi
|
972b165850
|
Modified deploy_email_digest to enable all the default email digests
|
2011-12-22 12:04:28 +05:30 |
|
Nabin Hait
|
b9e8a41cd2
|
Account and cost center get_query changes for other charges table
|
2011-12-21 17:33:57 +05:30 |
|
Nijil Y
|
36f58835e6
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 16:35:43 +05:30 |
|
Nijil Y
|
c62953579d
|
fix
|
2011-12-21 16:32:42 +05:30 |
|
Nijil Y
|
f800dc02f1
|
fix
|
2011-12-21 16:20:39 +05:30 |
|
Anand Doshi
|
c111803a4a
|
Fixed image attachment in profile settings
|
2011-12-21 14:55:14 +05:30 |
|
Nijil Y
|
07b03fbe09
|
Merge branch 'master' of github.com:nijil/erpnext
|
2011-12-21 14:54:34 +05:30 |
|
Nijil Y
|
9e6f00abab
|
fixes for notification
|
2011-12-21 14:54:14 +05:30 |
|
Nijil Y
|
b36bebe9f0
|
Update erpnext/stock/doctype/bin/bin.py
|
2011-12-21 14:53:04 +05:30 |
|
Nijil Y
|
2c19960996
|
account conflict
|
2011-12-21 13:30:09 +05:30 |
|
Nabin Hait
|
da9e2e6898
|
Company master link in global defaults
|
2011-12-21 13:24:10 +05:30 |
|
Nijil Y
|
9b6fc0f83d
|
Merge branch 'master' of github.com:nijil/erpnext
|
2011-12-21 13:24:02 +05:30 |
|
Nabin Hait
|
520de0529f
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-21 12:51:38 +05:30 |
|
Nijil Y
|
0f9eaeaa3c
|
updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
erpnext/projects/doctype/ticket/ticket.py
|
2011-12-21 12:34:13 +05:30 |
|
Nijil Y
|
16ca593bbf
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 12:20:07 +05:30 |
|
Nijil Y
|
4d6a71c5f2
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 11:56:42 +05:30 |
|
Nijil Y
|
35aa35bea3
|
Update erpnext/patches/auto_indent.py
|
2011-12-21 11:50:20 +05:30 |
|
Nabin Hait
|
53ef4009ba
|
Fixes in patches
|
2011-12-21 11:22:32 +05:30 |
|
Nijil Y
|
205e042113
|
patch file
|
2011-12-20 21:14:43 +05:30 |
|
Nijil Y
|
dc0461296d
|
Email Notification for Tasks
|
2011-12-20 21:13:58 +05:30 |
|
Anand Doshi
|
146f47faab
|
Merge pull request #167 from anandpdoshi/master
Patch to remove extra button from Email Digest Form
|
2011-12-20 05:40:59 -08:00 |
|
Nabin Hait
|
63b94c42e4
|
Price list patch
|
2011-12-20 19:09:23 +05:30 |
|
Nabin Hait
|
60fc54a9ba
|
Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form
|
2011-12-20 18:59:26 +05:30 |
|
Nabin Hait
|
7c03cfad6a
|
Default Price List Currency fld added in Global Defaults
|
2011-12-20 18:50:41 +05:30 |
|
Nabin Hait
|
a57732f71d
|
Removed custom field from doctype
|
2011-12-20 18:48:19 +05:30 |
|
Anand Doshi
|
6a605b47ef
|
Patch to remove 'Add Recipients' button from Email Digest form
|
2011-12-20 18:31:57 +05:30 |
|
Nijil Y
|
04da8741c3
|
fix
|
2011-12-20 18:09:43 +05:30 |
|
Nijil Y
|
d82e8df7e5
|
patch update for auto indent with email notify
|
2011-12-20 17:30:41 +05:30 |
|
Nijil Y
|
8dd861bda5
|
Auto Indent creation when stock reaches re-order level
|
2011-12-20 17:17:51 +05:30 |
|
Nabin Hait
|
74fcb69b13
|
Error fixed in cust group
|
2011-12-20 11:48:27 +05:30 |
|
Nabin Hait
|
b8cec492c5
|
Fixed issue in c-form patch
|
2011-12-16 16:48:17 +05:30 |
|
Nabin Hait
|
488bcc8700
|
reload_employeewise_balance_leave_report patch updated
|
2011-12-16 16:29:31 +05:30 |
|
Nabin Hait
|
e3daffe477
|
reload_employeewise_balance_leave_report
|
2011-12-16 16:28:26 +05:30 |
|
Nabin Hait
|
3bfeefafcd
|
Modified patch
|
2011-12-16 16:19:38 +05:30 |
|
Nabin Hait
|
f8bfcdc495
|
Modified patch
|
2011-12-16 16:15:31 +05:30 |
|
Nabin Hait
|
c57c5b0b44
|
Return if old patch.py executed anyway
|
2011-12-16 10:17:26 +05:30 |
|
Nabin Hait
|
b2150de64b
|
Freezing Error fixed in purchase invoice
|
2011-12-15 16:29:04 +05:30 |
|
Nabin Hait
|
9a0d05d354
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-15 15:48:51 +05:30 |
|
Nabin Hait
|
6e9a1284d4
|
remove depricated default fileds
|
2011-12-15 15:48:18 +05:30 |
|
Anand Doshi
|
490d298fa0
|
patch to remove old control panel email settings
|
2011-12-15 15:46:31 +05:30 |
|
Anand Doshi
|
ca39b180f5
|
patch to remove old control panel email settings
|
2011-12-15 15:40:15 +05:30 |
|
Anand Doshi
|
48d8d36b79
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-15 14:28:02 +05:30 |
|
Anand Doshi
|
7f18dd3b94
|
Patches for email digest and remove page break from defaults
|
2011-12-15 14:24:55 +05:30 |
|
Nabin Hait
|
b3081fafb6
|
Merge pull request #160 from nijil/master
Accounts Default Form Fix
|
2011-12-14 22:28:52 -08:00 |
|
Anand Doshi
|
a51aefbced
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 20:36:11 +05:30 |
|
Anand Doshi
|
21c649527a
|
Provides better error message to the user
|
2011-12-14 20:35:19 +05:30 |
|
Anand Doshi
|
407ebb9e41
|
Merge pull request #161 from anandpdoshi/master
Resolved bug: when account of type 'Bank or Cash' does not exists
|
2011-12-14 06:36:32 -08:00 |
|
Anand Doshi
|
e7982f0f85
|
Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
erpnext/setup/doctype/email_digest/email_digest.py
|
2011-12-14 20:05:16 +05:30 |
|
Anand Doshi
|
ddf4c2655d
|
Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception
|
2011-12-14 20:04:04 +05:30 |
|
Anand Doshi
|
3fe9795020
|
Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception
|
2011-12-14 20:00:55 +05:30 |
|
Nabin Hait
|
44bba97dc9
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 18:09:39 +05:30 |
|
Nabin Hait
|
b93ea233ff
|
Error fixed in task
|
2011-12-14 18:09:13 +05:30 |
|
Anand Doshi
|
c2a9cca4fd
|
Change in add user dialog box:
Now it includes First Name, Last Name and Password field
if run as a standalone app
|
2011-12-14 17:12:12 +05:30 |
|
Anand Doshi
|
ad42e558df
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 16:10:44 +05:30 |
|
Anand Doshi
|
ed73fb2b26
|
Fixed bug regarding setting of banner
|
2011-12-14 16:09:59 +05:30 |
|
Nijil Y
|
b40f826c5a
|
.
|
2011-12-14 15:50:09 +05:30 |
|
Nijil Y
|
d18153e413
|
Account Default settings form fix
|
2011-12-14 15:28:51 +05:30 |
|
Anand Doshi
|
e47be26682
|
Merge pull request #159 from anandpdoshi/master
Commented print statement in email_digest.py
|
2011-12-13 23:07:30 -08:00 |
|
Anand Doshi
|
8875d91a8e
|
Commented print statement while inserting record in scheduler
|
2011-12-14 12:35:07 +05:30 |
|
Nabin Hait
|
9e4d5b9649
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-14 11:27:50 +05:30 |
|
Nabin Hait
|
3a2fcba15f
|
Purchase Discount option in Features Setup
|
2011-12-14 11:26:46 +05:30 |
|
Nabin Hait
|
f21ceb283c
|
Arranged field order in item table
|
2011-12-14 11:26:05 +05:30 |
|
Nabin Hait
|
dcac0e7565
|
Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
|
2011-12-13 05:37:41 -08:00 |
|
Nabin Hait
|
536e0cb1c4
|
fixes in patch
|
2011-12-13 19:05:13 +05:30 |
|
Nabin Hait
|
08d803791d
|
Merge branch 'master' of git://github.com/nijil/erpnext
|
2011-12-13 18:49:59 +05:30 |
|
Nabin Hait
|
85e8e01fd6
|
notification email for recurring invoice
|
2011-12-13 18:48:24 +05:30 |
|
Nijil Y
|
f6a3441d99
|
patch
|
2011-12-13 18:31:42 +05:30 |
|
Nijil Y
|
8fb260504a
|
purchase discount
|
2011-12-13 18:14:15 +05:30 |
|
Anand Doshi
|
f5ff4434df
|
Patch to reload Task doctype of Projects Module
|
2011-12-13 18:13:23 +05:30 |
|
Anand Doshi
|
206df20f36
|
Changes in print formats to include selected print heading and discount
appended in description
|
2011-12-13 15:57:09 +05:30 |
|
Anand Doshi
|
130ae98675
|
Changes in dashboard start date and end date default logic such that the
conditions for fiscal year range are met
|
2011-12-12 20:24:06 +05:30 |
|
Anand Doshi
|
3a23a5740e
|
In Dashboard, display a customer friendly error message when the start and end dates
are not within a fiscal year
|
2011-12-12 19:50:09 +05:30 |
|
Anand Doshi
|
5245e6547b
|
Change path of images in accounts browser and sales browser
|
2011-12-12 19:18:23 +05:30 |
|
Nabin Hait
|
8a6b3b8713
|
Validation added in c-form
|
2011-12-12 14:16:16 +05:30 |
|
Anand Doshi
|
deb816d30c
|
Patch to remove duplicate entries created due to change in
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
|
2011-12-12 12:41:36 +05:30 |
|
Nijil Y
|
fdc7fc62a5
|
payable voucher.js
|
2011-12-12 10:50:18 +05:30 |
|
Nijil Y
|
b54d7282a7
|
pvdetail
|
2011-12-12 10:31:23 +05:30 |
|
Anand Doshi
|
17c1a7d9ed
|
Merge branch 'master' of github.com:webnotes/erpnext into edigest
|
2011-12-08 19:36:54 +05:30 |
|
Anand Doshi
|
fb3c3fb064
|
Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest
|
2011-12-08 19:36:29 +05:30 |
|
Anand Doshi
|
633edbef46
|
Email Digest - ready to be deployed
|
2011-12-08 19:34:01 +05:30 |
|
Nijil Y
|
38821f6104
|
txt order update
|
2011-12-08 18:32:58 +05:30 |
|
Nabin Hait
|
7e44f9789b
|
Patch for c-form
|
2011-12-08 18:07:20 +05:30 |
|
Nabin Hait
|
2577e2ae27
|
Patch for c-form
|
2011-12-08 18:06:53 +05:30 |
|
Nabin Hait
|
fd20340576
|
Introduced C-form for Indian customer
|
2011-12-08 17:49:40 +05:30 |
|
Nijil Y
|
edf8bc2a3e
|
Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
erpnext/accounts/doctype/pv_detail/pv_detail.txt
erpnext/buying/doctype/po_detail/po_detail.txt
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
|
2011-12-08 17:29:24 +05:30 |
|
Nijil Y
|
add0c85648
|
Discount in purchase cycle
|
2011-12-08 16:53:12 +05:30 |
|
Nijil Y
|
d8e5bed9e5
|
Discount in purchase cycle
|
2011-12-08 16:09:18 +05:30 |
|
Nijil Y
|
4499851ceb
|
checking..
|
2011-12-08 14:14:11 +05:30 |
|
Nijil Y
|
630256f65b
|
purchase recipt detail
|
2011-12-08 13:01:43 +05:30 |
|
Nabin Hait
|
cde8bec0a6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-12-06 19:05:14 +05:30 |
|
Nabin Hait
|
38d24534d7
|
Recurring invoice checkbox added in features setup
|
2011-12-06 19:04:21 +05:30 |
|
Anand Doshi
|
590448aaef
|
Changes in email digest
|
2011-12-06 18:51:14 +05:30 |
|
Nabin Hait
|
b28d6dc617
|
Repost stock patch
|
2011-12-06 15:11:14 +05:30 |
|
Nabin Hait
|
ea5f5ca57d
|
Recurring invoices patch
|
2011-12-06 15:10:48 +05:30 |
|
Nabin Hait
|
a4fdc84fda
|
Introduced recurring invoices
|
2011-12-06 15:04:47 +05:30 |
|
Anand Doshi
|
41e542ce4d
|
Email Digest changes
|
2011-12-06 10:41:54 +05:30 |
|
Anand Doshi
|
3f040a8f9e
|
Resolved bug Project creation:
Customer details not getting autofilled on customer selection
|
2011-12-05 12:17:51 +05:30 |
|
Anand Doshi
|
adf2f777d3
|
Removed print format option. Instead show html code.
|
2011-12-05 12:16:31 +05:30 |
|
Anand Doshi
|
393f5e6078
|
Queries to get new records in a particular doctype
|
2011-12-02 19:20:10 +05:30 |
|
Anand Doshi
|
f10ad98ebf
|
Refactored queries to be more clean
|
2011-12-02 17:53:08 +05:30 |
|
Anand Doshi
|
7057cbf9e5
|
Started with email digest
|
2011-12-02 15:15:38 +05:30 |
|
Anand Doshi
|
a27ae827c9
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-11-30 15:25:19 +05:30 |
|
Anand Doshi
|
ed825062f1
|
Hide programming error messages from user on update_security
|
2011-11-30 15:23:37 +05:30 |
|
Nabin Hait
|
142af06d19
|
update serial no incoming rate through landing cost wizard
|
2011-11-25 16:37:21 +05:30 |
|
Nabin Hait
|
3aed35da0a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-11-25 14:43:39 +05:30 |
|
Nabin Hait
|
28b793c88a
|
incoming rate in serial no should be valuation rate instead of pur rate
|
2011-11-25 14:43:11 +05:30 |
|
Anand Doshi
|
8c10de6c1a
|
Modified patch to create a DocType Label record for DocLayer
|
2011-11-25 11:25:39 +05:30 |
|
Nijil
|
4e54d7a434
|
pvdetail and patch
|
2011-11-24 16:18:42 +05:30 |
|
Nijil
|
1530b93a6e
|
purchase recipt
|
2011-11-24 15:53:56 +05:30 |
|
Nijil
|
2f82c29348
|
..
|
2011-11-24 15:18:17 +05:30 |
|
Nijil
|
ba40bc93fe
|
payable voucher txt
|
2011-11-24 15:14:09 +05:30 |
|
Nijil
|
c37dad26d9
|
txt files
|
2011-11-24 15:07:54 +05:30 |
|
Nabin Hait
|
e92066fa80
|
modified fld prop in gl entry and index patch
|
2011-11-24 15:04:47 +05:30 |
|
Nabin Hait
|
a8be65aedf
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-11-24 14:48:13 +05:30 |
|
Nabin Hait
|
d6ed0748a3
|
help content midified
|
2011-11-24 14:47:18 +05:30 |
|
Anand Doshi
|
956d665738
|
Merge pull request #148 from anandpdoshi/master
Modified GLEntry doctype to be not in create
|
2011-11-24 00:29:53 -08:00 |
|
Anand Doshi
|
be14e021b9
|
Reload GL Entry doctype
|
2011-11-24 13:57:46 +05:30 |
|
Anand Doshi
|
96e5343519
|
Marked GLEntry as Not In Create
|
2011-11-24 13:51:09 +05:30 |
|
Anand Doshi
|
6b8d0bfb2a
|
Added patch to reload doclayer, doclayer field and print format doctypes
|
2011-11-23 18:39:08 +05:30 |
|
Anand Doshi
|
6e5e30c420
|
Merge pull request #147 from anandpdoshi/master
Added Customize Form View and Print Formats to Setup Page
|
2011-11-23 04:35:20 -08:00 |
|
Anand Doshi
|
a04afc9b3b
|
Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page
|
2011-11-23 13:51:52 +05:30 |
|
Nabin Hait
|
36427e577d
|
address filter flds
|
2011-11-23 13:21:21 +05:30 |
|
Nabin Hait
|
5f9ceb8dc8
|
filter property changed in address
|
2011-11-23 13:19:20 +05:30 |
|
Nabin Hait
|
ed6b489715
|
filter property changed in address
|
2011-11-23 13:17:54 +05:30 |
|
Nabin Hait
|
3addd27f2c
|
Address is added in setup for deleting purpose
|
2011-11-23 13:11:15 +05:30 |
|
Nabin Hait
|
816383056f
|
On deletion of warehouse, delete bin and sle if no qty
|
2011-11-23 12:58:03 +05:30 |
|
Nabin Hait
|
04176e62d8
|
fixed error in internal reco
|
2011-11-23 12:15:42 +05:30 |
|
Nijil
|
6800ad55bd
|
patch for Discount Rate
|
2011-11-22 15:21:42 +05:30 |
|
Nijil
|
54eb735a47
|
Added Discount in Purchase Cycle
|
2011-11-22 15:12:00 +05:30 |
|
Nabin Hait
|
2690e72c14
|
updated reco patch
|
2011-11-21 17:27:36 +05:30 |
|
Nabin Hait
|
38477a3616
|
patch for stock reconciliation
|
2011-11-21 17:16:48 +05:30 |
|
Nabin Hait
|
fc26f64011
|
rewritten stock reconciliation
|
2011-11-21 17:13:53 +05:30 |
|
Nijil
|
4491f01ce4
|
discount rate on purchase
|
2011-11-21 11:31:27 +05:30 |
|
Nijil
|
eb8233c779
|
Merge branch 'master' of git://github.com/webnotes/erpnext
|
2011-11-21 10:35:15 +05:30 |
|
Nijil
|
c7d64cf5a8
|
almost
|
2011-11-20 00:22:41 +05:30 |
|
Nijil
|
296c17b7ae
|
checking
|
2011-11-18 14:12:06 +05:30 |
|
Nabin Hait
|
8fa6ad90ed
|
sms sender name validation
|
2011-11-17 18:07:13 +05:30 |
|
Nabin Hait
|
26f74ed121
|
sms sender name validation
|
2011-11-17 18:03:10 +05:30 |
|
Nabin Hait
|
bc60c1f29c
|
fixed patch
|
2011-11-17 16:59:29 +05:30 |
|
Nabin Hait
|
92ec8d26eb
|
reload LC wizard
|
2011-11-17 15:03:05 +05:30 |
|
Nabin Hait
|
1a8831f476
|
reload LC wizard
|
2011-11-17 15:00:55 +05:30 |
|
Nabin Hait
|
a8da0fecb5
|
Account link query changed in LC wizard
|
2011-11-17 14:47:05 +05:30 |
|
Nabin Hait
|
f164b269db
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-11-16 16:39:16 +05:30 |
|
Nabin Hait
|
9dd6330418
|
updated landed cost wizard
|
2011-11-16 16:38:55 +05:30 |
|
Nabin Hait
|
815a75f917
|
Rewritten landed cost wizard
|
2011-11-16 16:34:53 +05:30 |
|
Nabin Hait
|
b0fa2af45b
|
Rewritten landed cost wizard
|
2011-11-16 16:20:37 +05:30 |
|
Anand Doshi
|
bf41aef7f0
|
Merge pull request #144 from anandpdoshi/master
Changes in spartan print formats to show border in chrome
|
2011-11-16 01:20:33 -08:00 |
|
Anand Doshi
|
19a2767b77
|
Changes in spartan print formats to show border in chrome
|
2011-11-16 14:49:37 +05:30 |
|
Nabin Hait
|
7b095e97ad
|
Update erpnext/selling/doctype/quotation/quotation.py
|
2011-11-16 14:25:36 +05:30 |
|
Nabin Hait
|
efc2c327cf
|
Update erpnext/selling/doctype/quotation/quotation.py
|
2011-11-16 14:24:31 +05:30 |
|
Nabin Hait
|
4faf99424a
|
Modified validation for duplicate item
|
2011-11-16 14:20:45 +05:30 |
|
Nabin Hait
|
65a053abe6
|
Modified validation for duplicate item
|
2011-11-16 14:19:26 +05:30 |
|
Anand Doshi
|
0900756510
|
Merge pull request #143 from anandpdoshi/master
Changes in Sales Invoice Print Formats
|
2011-11-16 00:34:36 -08:00 |
|
Anand Doshi
|
9fe4331862
|
Changes in Sales Invoice Print Format
|
2011-11-16 14:03:52 +05:30 |
|
Anand Doshi
|
96fd8bec9b
|
Changes in Sales Invoice Print Formats
|
2011-11-16 14:02:30 +05:30 |
|
Anand Doshi
|
ded71563c8
|
Merge pull request #142 from anandpdoshi/master
New Print Formats as part of erpnext repository
|
2011-11-16 00:02:43 -08:00 |
|
Anand Doshi
|
c573fb8eed
|
Modified patch install_print_formats to reload the newly added Print Formats
|
2011-11-16 13:31:21 +05:30 |
|
Anand Doshi
|
e3559853bd
|
Added new Print Formats as part of repository
|
2011-11-16 13:18:45 +05:30 |
|
Nabin Hait
|
0c92493c81
|
Fixed check_for_acc_of_supplier validation
|
2011-11-16 10:12:32 +05:30 |
|
Anand Doshi
|
86e91e5dce
|
Changes in patch for installation of new print formats
|
2011-11-15 18:06:16 +05:30 |
|
Anand Doshi
|
f8b01097ac
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
index.html
|
2011-11-15 15:24:11 +05:30 |
|
Anand Doshi
|
3cb68e17b9
|
New Print Formats
|
2011-11-15 15:22:44 +05:30 |
|
Nabin Hait
|
5b7badaf20
|
supplier account head validated with supplier
|
2011-11-11 12:37:53 +05:30 |
|
Nabin Hait
|
ff72835ad9
|
Qty consumed per unit field type currency to data
|
2011-11-10 14:37:47 +05:30 |
|
Nabin Hait
|
e098481f45
|
Pull items from BOM for production issue
|
2011-11-10 10:56:53 +05:30 |
|
Nabin Hait
|
33e19480ae
|
UOM field added in BOM, will be fetched from item master
|
2011-11-09 13:53:16 +05:30 |
|
Nabin Hait
|
2cca0e7620
|
test case added for multiple stock entry for same datetime
|
2011-11-09 12:12:53 +05:30 |
|
Nabin Hait
|
93ba4fbaa4
|
Fixes related to finding prev sle
|
2011-11-08 15:30:04 +05:30 |
|
Nabin Hait
|
235439df5b
|
bin fixes for reposting future entries
|
2011-11-08 12:52:51 +05:30 |
|
Nabin Hait
|
76228f1c79
|
bin fixes for reposting future entries
|
2011-11-08 12:49:24 +05:30 |
|
Rushabh Mehta
|
d77cb27bd2
|
fixes to bin for reposting future entires
|
2011-11-08 12:06:02 +05:30 |
|
Rushabh Mehta
|
efd222b6ac
|
logout fix
|
2011-11-08 10:39:52 +05:30 |
|
Nabin Hait
|
cc02fd445c
|
Repair button only visible after submit
|
2011-11-07 12:14:28 +05:30 |
|
Nabin Hait
|
30d34c4311
|
sal manager reload patch
|
2011-11-07 11:07:50 +05:30 |
|
Nabin Hait
|
990a5eacca
|
sal manager reload patch
|
2011-11-07 10:51:29 +05:30 |
|
Nabin Hait
|
c67e0d85d3
|
Employemnt Type filter removed from salary manager
|
2011-11-07 10:48:51 +05:30 |
|
Rushabh Mehta
|
ae00547592
|
appriasal copy fix
|
2011-11-04 10:43:11 +05:30 |
|
Rushabh Mehta
|
36fc1d06fb
|
appriasal copy fix
|
2011-11-04 10:41:12 +05:30 |
|
Anand Doshi
|
9207f51ced
|
Changed image path to lib/images
|
2011-11-01 10:55:02 +05:30 |
|
Anand Doshi
|
3ee06a924a
|
Fixed Knowledge Base Issue
|
2011-11-01 10:46:49 +05:30 |
|
Anand Doshi
|
30cf682e46
|
Change criteria name of employeewise_balance_leave_report
|
2011-10-31 17:41:04 +05:30 |
|
Anand Doshi
|
25190a903c
|
Report to get Employeewise Balance Leave
|
2011-10-31 16:47:48 +05:30 |
|
Anand Doshi
|
dac955b897
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-10-25 10:58:17 +05:30 |
|
Anand Doshi
|
867895404e
|
Reverting the change '`' as it is taken care of by default
|
2011-10-25 10:54:49 +05:30 |
|
Anand Doshi
|
cd04d950a1
|
Merge pull request #137 from anandpdoshi/master
Changed path to image files in my_company.js
|
2011-10-24 03:21:19 -07:00 |
|
Anand Doshi
|
b16c231158
|
changed path to image files
|
2011-10-24 15:49:11 +05:30 |
|
Anand Doshi
|
71e3c9be66
|
Merge pull request #136 from anandpdoshi/master
Trend Analyser - allow table names with space
|
2011-10-24 02:18:24 -07:00 |
|
Rushabh Mehta
|
9666e657ce
|
fixed fpe in bin
|
2011-10-24 14:35:04 +05:30 |
|
Rushabh Mehta
|
06f432f4c7
|
fixes to valuation control
|
2011-10-24 11:59:22 +05:30 |
|
Anand Doshi
|
2cde8670f2
|
enclosed table names in "`" to allow spaces in table names while querying
|
2011-10-24 11:39:36 +05:30 |
|
Rushabh Mehta
|
09dba5cf1d
|
fixes to valuation control
|
2011-10-24 11:17:36 +05:30 |
|
Nabin Hait
|
612efe843b
|
POS Setting js code restored from history
|
2011-10-21 16:19:58 +05:30 |
|
Nabin Hait
|
e2f0c5dfd0
|
Trend analyzer fix due to project field movement to item level in pur cycle
|
2011-10-21 14:55:16 +05:30 |
|
Nabin Hait
|
d0c9d422af
|
patch for project changes in pur cycle
|
2011-10-20 19:21:03 +05:30 |
|
Nabin Hait
|
1979ad0586
|
Project wise analysis included in trend analyzer
|
2011-10-20 19:20:16 +05:30 |
|
Nabin Hait
|
57dd62d790
|
project column moved to item table in pur cycle
|
2011-10-20 19:19:07 +05:30 |
|
Nabin Hait
|
69554511da
|
fixes in patch
|
2011-10-19 16:35:39 +05:30 |
|
Nabin Hait
|
2eb5ae48f7
|
patch: default print format for invoice is standard
|
2011-10-19 16:06:37 +05:30 |
|
Nabin Hait
|
13800440f1
|
fixed issue in patch
|
2011-10-19 15:38:42 +05:30 |
|
Nabin Hait
|
d751c1d40d
|
patch for reloading print format and new POS format
|
2011-10-19 15:33:27 +05:30 |
|
Nabin Hait
|
68791fb13d
|
resolved conflict
|
2011-10-19 15:15:51 +05:30 |
|
Nabin Hait
|
7762bdaf77
|
Letter head issue fixed in print format
|
2011-10-19 15:05:26 +05:30 |
|
Rushabh Mehta
|
790f453490
|
version update for wnf
|
2011-10-19 14:06:32 +05:30 |
|
Nabin Hait
|
ec7a85d11f
|
'Delivery Note Packing List Wise' print format modified
|
2011-10-18 19:03:02 +05:30 |
|
Nabin Hait
|
1546003d69
|
issue fixed in patch
|
2011-10-18 18:47:08 +05:30 |
|
Nabin Hait
|
0c005421fe
|
Packing slip issues fixed and modified print format
|
2011-10-18 16:44:20 +05:30 |
|
Nabin Hait
|
a315a31919
|
Issue fixed in get stock qty if bin not exists
|
2011-10-17 15:01:31 +05:30 |
|
Nabin Hait
|
e7c4a4011f
|
acc bal repost patch moved in separate file
|
2011-10-14 19:05:38 +05:30 |
|
Nabin Hait
|
df8304f00b
|
acc bal repost patch moved in separate file
|
2011-10-14 19:05:08 +05:30 |
|
Nabin Hait
|
c0d7434794
|
Edited erpnext/patches/patch.py via GitHub
|
2011-10-14 00:14:31 +05:30 |
|
Nabin Hait
|
989462b669
|
account balance reposting with freezing current session
|
2011-10-13 17:33:30 +05:30 |
|
Nabin Hait
|
1a1ce709e0
|
Changes regarding POS fields
|
2011-10-13 14:08:33 +05:30 |
|
Nabin Hait
|
d84ad942d1
|
Removed repost patch
|
2011-10-13 14:04:26 +05:30 |
|
Nabin Hait
|
fe4c4f94da
|
repost account balance patch
|
2011-10-13 11:07:14 +05:30 |
|
Nabin Hait
|
a6f0550d40
|
test cases for leave
|
2011-10-12 17:04:31 +05:30 |
|
Nabin Hait
|
c7cf94ec7b
|
page break allow_on_submit
|
2011-10-12 13:16:11 +05:30 |
|
Nabin Hait
|
ee9efb568b
|
flds added in mapper
|
2011-10-12 12:42:07 +05:30 |
|
Nabin Hait
|
89a9a26524
|
page_break column allow_on_submit
|
2011-10-12 12:41:00 +05:30 |
|
Nabin Hait
|
db3728955b
|
error fixed in leave calculation
|
2011-10-11 17:11:24 +05:30 |
|
Nabin Hait
|
685564f71d
|
Resolved conflict after merging with master
|
2011-10-11 14:42:34 +05:30 |
|
Nabin Hait
|
fb37157163
|
packing slip related changes and test case for item
|
2011-10-11 13:57:48 +05:30 |
|
Nabin Hait
|
c1d4281718
|
packing slip related changes
|
2011-10-11 12:50:55 +05:30 |
|
Rushabh Mehta
|
5f66d60bdd
|
fixed login url
|
2011-10-11 10:58:11 +05:30 |
|
Rushabh Mehta
|
6edb4635e6
|
fixed bugs
|
2011-10-11 10:50:23 +05:30 |
|
Ravi Dey
|
24ef523cac
|
Issue fixed in setup control
|
2011-10-10 18:39:49 +05:30 |
|
Nabin Hait
|
15cad19d7c
|
Serial No moved to Stock module from Support module
|
2011-10-10 17:10:24 +05:30 |
|
Nabin Hait
|
2810691979
|
field hide/unhide for pos
|
2011-10-10 12:33:43 +05:30 |
|
Nabin Hait
|
6a0561612f
|
cost center groupto ledger and vice versa
|
2011-10-10 12:23:10 +05:30 |
|
Nabin Hait
|
8e54aa882a
|
patch for page break issue
|
2011-10-07 19:03:19 +05:30 |
|
Nabin Hait
|
ddaa5a33fe
|
reload PO-PR mapper
|
2011-10-07 12:36:13 +05:30 |
|
Nabin Hait
|
7a941869ab
|
clear cache forcefully
|
2011-10-07 12:30:48 +05:30 |
|
Nabin Hait
|
d08fe6099a
|
map schedule date from po to pr
|
2011-10-07 12:11:19 +05:30 |
|
Nabin Hait
|
914491f630
|
deleted duplicate button from QA inspection report
|
2011-10-06 10:23:26 +05:30 |
|
Nabin Hait
|
c68e045014
|
deleted duplicate button from QA inspection report
|
2011-10-05 17:01:16 +05:30 |
|
Nabin Hait
|
5630049d2a
|
QA Inspection: get_query
|
2011-10-05 16:57:36 +05:30 |
|
Nabin Hait
|
1971942db8
|
purchase tax mapping while pulling
|
2011-10-05 14:56:16 +05:30 |
|
Nabin Hait
|
da50c0859c
|
features by default on
|
2011-10-05 12:10:08 +05:30 |
|
Nabin Hait
|
a55eec137f
|
Fieldname changed in Features Setup
|
2011-10-05 11:47:08 +05:30 |
|
Nabin Hait
|
b30c4a6611
|
Fieldname changed in Features Setup
|
2011-10-05 11:36:16 +05:30 |
|
Nabin Hait
|
a970b11cfb
|
Test case added for Material Issue
|
2011-09-30 18:05:08 +05:30 |
|
Nabin Hait
|
61985ac5fa
|
get_query modified for item in quotation
|
2011-09-30 17:46:08 +05:30 |
|
Nabin Hait
|
88e5170bd0
|
Test case added for MTN
|
2011-09-30 17:21:41 +05:30 |
|
Nabin Hait
|
88f9cb5d24
|
Test case added for MTN
|
2011-09-30 17:20:06 +05:30 |
|
Nabin Hait
|
31665e538a
|
Test Case:
stock entry submit and cancel
Sandbox created for maintaining testdata and testcases
|
2011-09-29 10:41:02 +05:30 |
|
Nabin Hait
|
79e8247d82
|
fix in stock ledger
|
2011-09-29 10:40:04 +05:30 |
|
Nabin Hait
|
fff40599e8
|
test field deleted from warehouse
|
2011-09-29 10:39:44 +05:30 |
|
Nabin Hait
|
525887fd8a
|
Error fixed in auth control
|
2011-09-27 17:00:01 +05:30 |
|
Nabin Hait
|
c8d5625763
|
removed trashed profile from user search result
|
2011-09-27 15:26:29 +05:30 |
|
Nabin Hait
|
d9a16a282c
|
deleted gl_entry.js file
|
2011-09-27 15:10:07 +05:30 |
|
Nabin Hait
|
ec451da2f4
|
Re-written update_against_document_in_jv function in RV and PV
|
2011-09-27 12:47:59 +05:30 |
|
Nabin Hait
|
e2df68bb5b
|
reload internal reconciliation
|
2011-09-27 12:47:09 +05:30 |
|
Nabin Hait
|
e76e2a1172
|
reload internal reconciliation
|
2011-09-27 12:45:48 +05:30 |
|
Nabin Hait
|
80ed6b25e8
|
deleted gl_control.js file
|
2011-09-27 11:53:23 +05:30 |
|
Nabin Hait
|
7e97d1f390
|
rebuild all tree through push_patch
Appraisal score allowed to be fraction
unhide group/ledger field in cost senter for import purpose
update_nsm_model in cost center on_trash()
|
2011-09-27 11:34:06 +05:30 |
|
Nabin Hait
|
3c8a50c257
|
Trial balance opening issue fixed if there is no prev year
|
2011-09-27 11:16:30 +05:30 |
|
Nabin Hait
|
a77cea2b90
|
Dont add opening entries in account balance debit, credit column
|
2011-09-27 11:14:54 +05:30 |
|
Nabin Hait
|
c752d075e6
|
fixed issue in reseting in opening balance, clear bal only that company
|
2011-09-27 11:04:24 +05:30 |
|
Nabin Hait
|
5c55e43234
|
trend analyzer issue fixed
|
2011-09-27 10:57:14 +05:30 |
|
Nabin Hait
|
c034e3d531
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-27 10:55:24 +05:30 |
|
Nabin Hait
|
39297e5775
|
update_nsm_model in cost center on_trash()
|
2011-09-27 10:36:17 +05:30 |
|
Nabin Hait
|
d223d12308
|
Rewritten update_against_document function
|
2011-09-26 18:57:43 +05:30 |
|
Nabin Hait
|
5f2046496b
|
Internal Reconciliation: for knock out booking and payment entries
|
2011-09-26 18:56:02 +05:30 |
|
Nabin Hait
|
2736fd59ca
|
fixed cancelled gl entry issue in period closing voucher
|
2011-09-26 12:55:52 +05:30 |
|
Nabin Hait
|
a28e366c15
|
deleted duplicate button fron JV
|
2011-09-22 16:32:02 +05:30 |
|
Nabin Hait
|
5941ae3b75
|
Default account creation order changed
|
2011-09-22 16:10:43 +05:30 |
|
Nabin Hait
|
b3ce0ecb34
|
repost account balance through push patch
|
2011-09-22 16:10:15 +05:30 |
|
Nabin Hait
|
e8475f9b85
|
Appraisal score allowed to be fraction
|
2011-09-22 11:00:53 +05:30 |
|
Nabin Hait
|
fdb0e362a7
|
update valuation and bin_aqat patch applicable after 01-09-2009 entries
|
2011-09-19 12:22:47 +05:30 |
|
Nabin Hait
|
48a52d42ed
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-16 17:29:30 +05:30 |
|
Nabin Hait
|
f060d0cd16
|
contact address will be fetched in sales invoice onload when come through mapper
|
2011-09-16 17:28:49 +05:30 |
|
Rushabh Mehta
|
32e00cb050
|
missing buttons
|
2011-09-16 16:28:35 +05:30 |
|
Nabin Hait
|
618d65b6ad
|
company delete permission to system manager
|
2011-09-16 15:55:19 +05:30 |
|
Nabin Hait
|
e10900115e
|
updated company on_trash function
|
2011-09-16 15:50:45 +05:30 |
|
Nabin Hait
|
d984872be9
|
checked sal struc docstatus in validation
|
2011-09-16 14:47:19 +05:30 |
|
Nabin Hait
|
2d26fe48ed
|
removed sal structure amend permission
|
2011-09-16 14:35:57 +05:30 |
|
Nabin Hait
|
1dfb3fc7d8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-16 14:33:38 +05:30 |
|
Nabin Hait
|
0b5f9b0475
|
update valuation and bin_aqat patch
|
2011-09-16 14:32:23 +05:30 |
|
Nabin Hait
|
8c9a5af231
|
Error fixed in bin
|
2011-09-16 12:51:19 +05:30 |
|
Nabin Hait
|
73c4a4a154
|
removed make_feed() function
|
2011-09-16 11:24:54 +05:30 |
|
Nabin Hait
|
ecc75123e8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-15 15:40:53 +05:30 |
|
Nabin Hait
|
6ae7f8fe58
|
check serial nos bin qty only if serial no entered into the document
|
2011-09-15 15:40:27 +05:30 |
|
Rushabh Mehta
|
2adbd89ada
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-15 15:09:14 +05:30 |
|
Rushabh Mehta
|
53ba83158c
|
fixes to startup
|
2011-09-15 15:06:23 +05:30 |
|
Nabin Hait
|
3b19f6b7c8
|
opening balance fixes in general ledger
|
2011-09-15 14:38:54 +05:30 |
|
Rushabh Mehta
|
0aed26d83d
|
moved report to folder
|
2011-09-15 13:00:46 +05:30 |
|
Rushabh Mehta
|
2773940db1
|
merged from master
|
2011-09-15 12:55:25 +05:30 |
|
Rushabh Mehta
|
1e11cb486d
|
merging from master and usability fixes to setup
|
2011-09-14 13:25:10 +05:30 |
|
Rushabh Mehta
|
5f50617121
|
removed readme
|
2011-09-13 15:48:51 +05:30 |
|
Rushabh Mehta
|
cbaae20328
|
breakup of farmework files
|
2011-09-08 19:07:14 +05:30 |
|
Rushabh Mehta
|
5caedffff8
|
fixes to buttons etc
|
2011-09-08 15:45:37 +05:30 |
|
Rushabh Mehta
|
8cf45175a7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-08 14:17:41 +05:30 |
|
Rushabh Mehta
|
5ede3e8411
|
fixes to home (multiple loading)
|
2011-09-08 14:16:34 +05:30 |
|
Rushabh Mehta
|
11c6be065a
|
ready for 0.1
|
2011-09-06 15:50:01 +05:30 |
|
Rushabh Mehta
|
aa7b05aaeb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-09-06 12:47:51 +05:30 |
|
Rushabh Mehta
|
b5717bd807
|
patch etc fixes
|
2011-09-06 12:46:33 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|