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

732 Commits

Author SHA1 Message Date
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
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
7339ca50f4 Fix translate territory_target_variance_item_group_wise.js 2013-09-30 17:53:05 -03:00
Bárbara Perretti
633e3729f4 fix translate sales_person_wise_transaction_summary.js 2013-09-30 17:51:14 -03:00
Bárbara Perretti
af9f4ed7fb Fix translate sales_person_target_variance_item_group_wise.js 2013-09-30 17:48:51 -03:00
Bárbara Perretti
c5fe86c773 Fix Translate Sales_Analytics.js 2013-09-27 17:21:47 -03:00
Bárbara Perretti
4098c2675f Fix translate Sales_Common.js 2013-09-27 17:05:17 -03:00
Bárbara Perretti
97bf1f79db Fix translate Sales_bom.js 2013-09-27 15:28:53 -03:00
Bárbara Perretti
49ad416843 Fix translate Quotation.js 2013-09-27 15:01:14 -03:00
Bárbara Perretti
55fbeb9e93 Fix translate Lead.js 2013-09-27 14:40:54 -03:00
Bárbara Perretti
8e14a9cb93 Fix translate Sales_Order.js 2013-09-27 14:33:18 -03:00
Nabin Hait
164d39d12f Merge pull request #883 from akhileshdarjee/master 
[feature] pos view added in all sales & purchase cycle
 2013-09-27 00:05:15 -07:00
Akhilesh Darjee
2428e8d1b7 [pos] [minor] fix for cur_frm 2013-09-27 12:32:26 +05:30
Nabin Hait
f6dd28c157 Merge pull request #905 from MaxMorais/patch-1 
Fix Translation in Sales Order.js
 2013-09-26 23:02:45 -07:00
Bárbara Perretti
dc3ab5c8de Fixin translation in Opportunity.js 2013-09-26 19:12:31 -03:00
Bárbara Perretti
629a032a74 Fix translate Customer.js 2013-09-26 18:41:42 -03:00
Bárbara Perretti
dcec039da5 Fixin translation in selling/page/sales_browser/sales_browser.js 2013-09-26 18:24:15 -03:00
Bárbara Perretti
bc32535668 Fixin translation in selling/page/selling_home/selling_home.js 2013-09-26 18:18:22 -03:00
Maxwell
18762925bc Fix translation in Customer.js 
I'll be fixing some points that I miss translation.
 2013-09-26 17:54:46 -03:00
Maxwell
6111b1edb6 Fix Translation in Sales Order.js 
I'll be fixing some points that I miss translation.
 2013-09-26 17:49:53 -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
6ec4b0c52a [fix] [minor] display product image in shopping cart 2013-09-26 15:45:44 +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
Akhilesh Darjee
10dce341c8 [pos] pos view fixed for all purchase & sales cycle 2013-09-25 11:09:33 +05:30
Anand Doshi
de8b6aadaf [minor] fixes for import conf 2013-09-24 17:17:39 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Nabin Hait
ac030a57c2 [minor] [cleanup] removed banner from lead 2013-09-23 16:27:18 +05:30
Akhilesh Darjee
e318c93405 [fix] patch merge conflict fixed 2013-09-23 12:34:22 +05:30
Anand Doshi
12144f339e Merge branch 'website-wip' 2013-09-19 12:27:11 +05:30
Nabin Hait
aa67e7ed29 [minor] field reordered in lead 2013-09-19 10:39:59 +05:30
Akhilesh Darjee
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +05:30
Anand Doshi
e122121dc4 [fix] [minor] stock uom and price list currency in webshop 2013-09-18 17:28:06 +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
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Anand Doshi
8c002491d0 [fix] [minor] show missing currency message in shopping cart settings 2013-09-17 15:57:17 +05:30
Akhilesh Darjee
6773bc2512 [pos] [minor] added pos in sales order for testing 2013-09-17 11:56:17 +05:30
Anand Doshi
ad0b05060a Merge branch 'master' of github.com:webnotes/erpnext into website-wip 2013-09-17 11:00:24 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Akhilesh Darjee
c96c13af4e [fix] make demo for price list 2013-09-12 19:19:46 +05:30
Anand Doshi
3a6f4f882a [fix] [minor] communication related cleanup 2013-09-12 19:10:05 +05:30
Anand Doshi
1be5bb7e6a [portal] [minor] show status for order and invoice 2013-09-12 15:25:47 +05:30
Anand Doshi
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Anand Doshi
429fd1d3d8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 12:54:10 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Anand Doshi
1b2d84db0d [fix] [minor] print hide communication table 2013-09-10 10:46:56 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Nabin Hait
ce4be997ab Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 17:38:52 +05:30
Nabin Hait
63b5ef7ecf [fix] [minor] is_pos zero when mapping 2013-09-05 17:38:24 +05:30
Anand Doshi
d983aca567 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 13:31:46 +05:30
Anand Doshi
c28f84298f [fix] [minor] opportunity to quotation - load price list values 2013-09-05 13:31:20 +05:30
Akhilesh Darjee
a7b7d2559e [fix] merge conflict 2013-09-05 13:18:22 +05:30
Akhilesh Darjee
38e8f989fa [fix] [patch] fixed paid_amount & patch for default pos view check in features setup 2013-09-05 12:59:33 +05:30
Anand Doshi
512113ae51 Merge branch 'customer-login' 2013-09-05 12:21:29 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +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