Commit Graph

2708 Commits

Author SHA1 Message Date
Anand Doshi
f36e15e92e fix in doclistview's order 2012-06-05 20:10:45 +05:30
Anand Doshi
49230000e5 communication log removal patch 2012-06-05 18:51:57 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
2012-06-05 18:37:17 +05:30
Anand Doshi
390b788e7b communication 2012-06-05 18:28:38 +05:30
Nabin Hait
252a7a189b Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice 2012-06-05 15:27:12 +05:30
Nabin Hait
f24d2efe2c Parent node validation fixed for tree 2012-06-05 10:41:27 +05:30
Nabin Hait
c84c86e458 customer info added in maintenance schedule event 2012-06-04 17:47:47 +05:30
Nabin Hait
6c34e1411f Flexible invoice period in recurring invoice 2012-06-04 16:21:25 +05:30
Nabin Hait
bc8e9d7a34 Flexible invoice period in recurring invoice 2012-06-04 16:18:38 +05:30
Nabin Hait
9ec73ccf1e Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 14:04:57 +05:30
Nabin Hait
6ea87a42a8 convert to group/ledger button hide/unhide issue fixed 2012-06-04 14:04:36 +05:30
Rushabh Mehta
a660dd9d49 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 13:21:03 +05:30
Rushabh Mehta
983c551796 gantt chart fixes 2012-06-04 13:20:42 +05:30
Anand Doshi
bfc52b99fd Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 13:07:03 +05:30
Anand Doshi
fdc20fdf69 fix in get_base_url of dom.js 2012-06-04 13:06:38 +05:30
Rushabh Mehta
07c94ce9c0 update in Task, notification and layout 2012-06-04 12:57:23 +05:30
Nabin Hait
aaab084a12 uom field added in pur invoice item table 2012-06-04 12:10:43 +05:30
Nabin Hait
d2301f9569 uom field added in pur invoice item table 2012-06-04 12:07:45 +05:30
Nabin Hait
765298bc63 uom field added in pur invoice item table 2012-06-04 12:02:56 +05:30
Nabin Hait
e4f2c7b213 series issue in attendance template 2012-06-04 11:48:50 +05:30
Nabin Hait
e91d8ccc5c Custom query for item in serial no 2012-06-04 10:47:44 +05:30
Nabin Hait
0e4afb910b parent node get_query modified in all tree 2012-06-04 10:32:31 +05:30
Nabin Hait
e315aba130 expected delivery date mandatory only if order type is sales 2012-06-01 10:11:14 +05:30
Anand Doshi
c5d857896e fixes in communication doctype 2012-05-31 18:23:16 +05:30
Nabin Hait
e44ebb1ec7 removed available qty validation in pos 2012-05-31 15:22:05 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Nabin Hait
fe678fd638 balance area only for accounts not for cost center 2012-05-31 13:32:45 +05:30
Nabin Hait
1835ee6c8b issue fixed 2012-05-31 12:28:07 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
6971f577da Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 15:47:47 +05:30
Anand Doshi
9c011f405d new rename doc function 2012-05-29 15:47:27 +05:30
Anand Doshi
d5f5875aab Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 14:15:18 +05:30
Anand Doshi
82695ddd90 fixes in transaction history of customer and supplier 2012-05-29 14:14:27 +05:30
Rushabh Mehta
7c91e257e2 doclistview: sidebar refresh bugfix 2012-05-29 14:05:53 +05:30
Anand Doshi
d1b36ec549 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 11:30:10 +05:30
Anand Doshi
2ac77beb50 fix in packing list issue 2012-05-29 11:29:52 +05:30
Rushabh Mehta
5df62ad318 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 11:06:44 +05:30
Rushabh Mehta
f3c390aec3 refresh stats in doclist 2012-05-29 11:06:08 +05:30
Anand Doshi
53bac88d92 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 11:00:06 +05:30
Anand Doshi
2afe974a5b fix in remove euro currency patch 2012-05-29 10:58:28 +05:30
Rushabh Mehta
92c2c8f1f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37 show new reports as well as old 2012-05-29 10:53:37 +05:30
Anand Doshi
27437742c4 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-28 19:06:34 +05:30
Anand Doshi
e012f06452 fix in purchase order validate currency's error messages, production order's produced qty field marked as no copy 2012-05-28 19:05:52 +05:30
Anand Doshi
3b091418ec allow zero payment in POS Invoice, when cash/bank account is not specified 2012-05-28 18:08:02 +05:30
Anand Doshi
2ad2426610 fix in get other charges of sales_common.py 2012-05-28 16:05:54 +05:30
Rushabh Mehta
3237d6af6f added font 'Marck Script' 2012-05-28 10:42:32 +02:00
Anand Doshi
4792f51e2a remove euro currency patch, address / contact supplier/customer can now contain slashes in their name 2012-05-28 13:26:17 +05:30