Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,642 Commits 3 Branches 0 Tags 1 GiB
3b9e864dec
Commit Graph

695 Commits

Author SHA1 Message Date
Rushabh Mehta
515636f24c Merge branch 'master' of github.com:webnotes/erpnext into cleanup 2013-11-08 16:28:12 +05:30
Anand Doshi
ed1679a1c5 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-07 20:49:13 +05:30
Akhilesh Darjee
04f65a0c56 [fix] added owner permission for query report 2013-11-06 15:45:26 +05:30
Rushabh Mehta
a063b4d50e [cleanup] UI Fixes, minor 2013-11-06 11:29:47 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
 2013-11-04 13:14:39 +05:30
Rushabh Mehta
f7b203de2d [cleanup] UI Fixes 2013-11-03 20:37:49 +05:30
Rushabh Mehta
ef5845589d [cleanup] [minor] finishing styles, labels, descriptions 2013-11-02 14:47:11 +05:30
Akhilesh Darjee
9c1488a7c0 [cleanup] [minor] for territory fixed to applicable territory 2013-10-31 19:56:31 +05:30
Anand Doshi
b950a71fb2 [minor] [fix] sales funnel 2013-10-31 19:07:05 +05:30
Nabin Hait
d43c6bfdfb [fix] [merge conflict] 2013-10-24 11:57:02 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Nabin Hait
49f9e284ff [report] lead details 2013-10-22 12:11:20 +05:30
Rushabh Mehta
70d7c481e9 [naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854 2013-10-18 17:27:45 +05:30
Akhilesh Darjee
2d82f26976 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-18 15:28:15 +05:30
Akhilesh Darjee
fcd70d04f3 [item price] item price made as an individual master and removed from price list 2013-10-18 14:24:21 +05:30
Nabin Hait
1b0664636a [fix] [conflict] 2013-10-18 13:07:28 +05:30
Nabin Hait
ef00af32c1 [minor] deleted sales common py 2013-10-18 13:02:57 +05:30
Nabin Hait
89ad6f2dab [fix] [conflict] 2013-10-18 12:55:59 +05:30
Nabin Hait
d1fd1e2d89 [Cleanup] Sales Common deprecated 2013-10-18 12:50:28 +05:30
Nabin Hait
096d363087 [fix] fixed merge conflict 2013-10-18 12:50:28 +05:30
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Nabin Hait
f146e8b7f5 Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-16 11:19:09 +05:30
Bárbara Perretti
9d6312fac4 Fix translate customers_not_buying_since_long_time.js 2013-10-15 17:57:20 -03:00
Bárbara Perretti
7329d7f118 Fix translate selling/doctype/sales_bom/sales_bom.js 2013-10-15 17:54:25 -03:00
Bárbara Perretti
f941e7499f Fix translate selling/doctype/lead/lead.js 2013-10-15 15:22:53 -03:00
Anand Doshi
a295bf5421 [minor] don't rollback when running all tests, fixed test cases 2013-10-15 19:52:29 +05:30
Nabin Hait
b338b6ed24 [fix] [minor] validate converion rate 2013-10-15 16:55:24 +05:30
Nabin Hait
1c62cbe1fc Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-15 12:53:46 +05:30
Anand Doshi
7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py
 2013-10-15 12:18:46 +05:30
Nabin Hait
028a5202f6 [minor] fixed conflict 2013-10-15 11:53:03 +05:30
Akhilesh Darjee
1797cfef63 [fix] removed validation of conversion rate equals 1 from all transaction 2013-10-11 13:34:10 +05:30
Rushabh Mehta
2eec1eb9a6 [minor] removed prevdoc_date 2013-10-10 17:08:19 +05:30
Rushabh Mehta
f56d73c9bc [minor] removed get_rate 2013-10-10 17:07:53 +05:30
Anand Doshi
373680bbae Merged master into wsgi 2013-10-10 16:04:40 +05:30
Anand Doshi
b604eddbfd [minor] [fixes] view in website and other fixes 2013-10-10 15:43:32 +05:30
Rushabh Mehta
ddca90ef7b [communication] [setup wizard] [minor] [fixes] 2013-10-09 16:08:54 +05:30
Anand Doshi
a0ecfba5f5 [minor] removed last_contact_date from lead 2013-10-09 15:28:16 +05:30
Anand Doshi
650cfc0434 [minor] removed last_contact_date in opportunity 2013-10-09 15:26:53 +05:30
Anand Doshi
599fe0532a [minor] [fix] removed contact_date_ref 2013-10-09 15:16:54 +05:30
Anand Doshi
3d72addae0 [minor] [fix] removed contact_date_ref 2013-10-09 15:01:17 +05:30
Anand Doshi
17c8b940e3 [minor] [fix] removed contact_date_ref 2013-10-09 14:52:18 +05:30
Nabin Hait
11faa57233 [fix] [minor] fetching lead details in opportunity 2013-10-09 13:21:36 +05:30
Anand Doshi
988096e82d [feature] Sales Funnel visualization. Go to Selling > Analytics > Sales Funnel 2013-10-07 18:06:52 +05:30
Nabin Hait
8f05c05bfb Validate warehouse for allowed users and matched company 2013-10-07 13:08:13 +05:30
Nabin Hait
704a915feb [fix] [minor] [delivery note] 2013-10-05 17:20:23 +05:30
Bárbara Perretti
a42d32f4c5 Fix translate selling_home.js 2013-10-04 14:07:56 -03:00
Anand Doshi
3df4f8898b [minor] crm funnel first cut 2013-10-04 21:19:30 +05:30
Rushabh Mehta
800b3aa437 [crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order 2013-10-03 17:26:33 +05:30
Rushabh Mehta
f1b6f67a98 [Delivery Note] Moved prevdoc to Sales Order and Sales Invoice so links will work webnotes/erpnext#868 2013-10-03 12:22:52 +05:30