Commit Graph

127 Commits

Author SHA1 Message Date
Anand Doshi
2d46e1e826 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-22 12:33:21 +05:30
Anand Doshi
d0c49f331e changed naming series of opportunity, removed message field from quotation 2013-01-22 12:31:31 +05:30
Rushabh Mehta
fad6746ca1 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-22 12:13:18 +05:30
Rushabh Mehta
3d55e3dd59 fmt_money - don't format flat types 2013-01-22 12:09:51 +05:30
Anand Doshi
70c41b6722 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-22 11:58:48 +05:30
Anand Doshi
ef7599f550 fix in lead lost issue in quotation 2013-01-22 11:55:05 +05:30
Nabin Hait
ec52db8490 commonified in_words function and introduced selling_controller 2013-01-22 11:53:14 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Rushabh Mehta
8f3916dd54 add job applicant, sales and jobs email settings to module help 2013-01-16 12:50:55 +05:30
Rushabh Mehta
8d3fe553e5 added automatic lead creation for sales email id 2013-01-16 12:19:28 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Anand Doshi
ad13b4a716 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-10 14:38:08 +05:30
Nabin Hait
0f61b476a2 toggle display of contact info based on customer 2013-01-09 12:50:43 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
435fd1426b Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 2013-01-09 11:25:34 +05:30
Nabin Hait
9d0f636c46 stock reconciliation - rewrite in progress 2013-01-07 18:51:11 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Anand Doshi
f9a3c8fcdc added status validation 2012-12-28 19:42:49 +05:30
Anand Doshi
44c9def74f if no address, only then have address type as Office 2012-12-27 18:34:35 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Nabin Hait
e05a5b6043 do not pull customer on selection of project 2012-12-27 15:05:06 +05:30
Anand Doshi
f04fa4664d fixes in lead list 2012-12-27 14:05:10 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Anand Doshi
a85b2e4ee3 show company name in lead list 2012-12-27 13:52:47 +05:30
Anand Doshi
bde1f4f454 minor fix in support ticket 2012-12-27 13:32:11 +05:30
Anand Doshi
5ea807829a added company in lead list 2012-12-27 13:07:50 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Anand Doshi
879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py
2012-12-19 22:28:00 +05:30
Rushabh Mehta
1ba4bd4485 added webclient.py and some misc fixes 2012-12-19 17:05:51 +05:30
Rushabh Mehta
40ca2c681a removed next_contact in quotation, fixed regex to convert relative links to absolute 2012-12-19 12:46:03 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
e93150bf26 sales order linked with project 2012-12-18 10:33:04 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
22c3f63edd small fixes: sms, quotation messages etc 2012-12-13 15:09:42 +05:30
Anand Doshi
221f03be01 minor fixes 2012-12-13 15:04:18 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Rushabh Mehta
9e12af4b7c updated recipients email in communication 2012-12-12 16:13:29 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
50a19b578c fix in fiscal year validation 2012-12-10 18:06:14 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30
Nabin Hait
2ce027fc9f floating point issue in percentage delivered/billed 2012-12-07 14:43:06 +05:30
Rushabh Mehta
76c4f61ffb more refactoring to renaming 2012-12-06 12:09:52 +05:30
Rushabh Mehta
bbd5ea32d1 added client side functions and mode_of_payment defaults 2012-12-04 16:31:54 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30