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

141 Commits

Author SHA1 Message Date
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
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
Bárbara Perretti
f941e7499f Fix translate selling/doctype/lead/lead.js 2013-10-15 15:22:53 -03:00
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
Anand Doshi
373680bbae Merged master into wsgi 2013-10-10 16:04:40 +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
Nabin Hait
11faa57233 [fix] [minor] fetching lead details in opportunity 2013-10-09 13:21:36 +05:30
Rushabh Mehta
800b3aa437 [crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order 2013-10-03 17:26:33 +05:30
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
 2013-10-02 16:52:52 +05:30
Rushabh Mehta
24ca7e4e2e Added Transactions for Import webnotes/erpnext#911 2013-10-02 14:25:36 +05:30
Bárbara Perretti
55fbeb9e93 Fix translate Lead.js 2013-09-27 14:40:54 -03:00
Nabin Hait
a1f7f2abfd [minor] update lead status as Opportunity Made when opportunity submitted 2013-09-26 16:59:32 +05:30
Nabin Hait
16ec981bfd [cleanup] [minor] fetch lead details in opportunity 2013-09-25 20:00:22 +05:30
Anand Doshi
5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
 2013-09-25 19:55:41 +05:30
Nabin Hait
ac030a57c2 [minor] [cleanup] removed banner from lead 2013-09-23 16:27:18 +05:30
Nabin Hait
aa67e7ed29 [minor] field reordered in lead 2013-09-19 10:39:59 +05:30
Pratik Vyas
5e16a69b35 mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Anand Doshi
3a6f4f882a [fix] [minor] communication related cleanup 2013-09-12 19:10:05 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Anand Doshi
7b044da0e3 [fix] [minor] on_communication, when checking if system user, extract email id and then check 2013-09-04 18:14:20 +05:30
Anand Doshi
53ecddd612 [fix] [communication] on communication send, update status 2013-09-04 17:52:27 +05:30
Anand Doshi
d01f0cb46e [fix] [communication] on communication send, update status 2013-09-04 17:38:29 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Rushabh Mehta
98429afe91 [communication] [minor] 2013-09-02 18:52:27 +05:30
Rushabh Mehta
0f2b684a45 [communication] [minor] 2013-09-02 18:47:34 +05:30
Rushabh Mehta
57e47cd93d [communication] [minor] 2013-09-02 18:45:11 +05:30
Rushabh Mehta
a2d0da8840 [communication] [minor] 2013-09-02 18:27:29 +05:30
Rushabh Mehta
8f04d119bb [communication] [minor 2013-09-02 17:39:59 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Anand Doshi
4b29c89692 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-29 13:59:23 +05:30
Anand Doshi
1c8ec406ae [fix] [minor] lead validate 2013-08-29 13:58:47 +05:30
Rushabh Mehta
46ec268e9b [communications] [minor] Code cleanup so it can be extended by custom script 2013-08-29 13:53:36 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Rushabh Mehta
ed186b719e [demo] [minor] Started make_demo.py 2013-07-30 16:19:40 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Anand Doshi
63d844b2d2 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/quotation/quotation.py
	utilities/transaction_base.py
 2013-07-10 20:55:15 +05:30
Anand Doshi
2ac0a83bd8 [webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order 2013-07-10 20:49:44 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Nabin Hait
fcd9434daf [mapper] 2013-07-06 18:25:36 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Anand Doshi
8aaccf7269 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/lead/lead.txt
 2013-07-04 17:18:45 +05:30
Anand Doshi
99100a4135 [webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation 2013-07-04 17:13:53 +05:30
Rushabh Mehta
212de6a084 [mapper] added sales order > material request, added postprocess function 2013-07-04 16:29:03 +05:30