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