Commit Graph

2360 Commits

Author SHA1 Message Date
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
Anand Doshi
878b5ca71f print format - bypass printing table if table doesnt exist 2012-01-27 17:20:35 +05:30
Anand Doshi
2ccb811cc4 print format edits 2012-01-27 16:16:40 +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
f7595f4be1 fixes to print hide on empty cols 2012-01-27 13:55:20 +05:30
Anand Doshi
1b94c1399d print hide fix 2012-01-27 13:42:41 +05:30
Anand Doshi
b44da2813b Fix in print format hide empty field 2012-01-27 13:22:21 +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