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

138 Commits

Author SHA1 Message Date
Anand Doshi
a295bf5421 [minor] don't rollback when running all tests, fixed test cases 2013-10-15 19:52:29 +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
Akhilesh Darjee
1797cfef63 [fix] removed validation of conversion rate equals 1 from all transaction 2013-10-11 13:34:10 +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
17c8b940e3 [minor] [fix] removed contact_date_ref 2013-10-09 14:52:18 +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
Akhilesh Darjee
2428e8d1b7 [pos] [minor] fix for cur_frm 2013-09-27 12:32:26 +05:30
Akhilesh Darjee
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +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
1b2d84db0d [fix] [minor] print hide communication table 2013-09-10 10:46:56 +05:30
Rushabh Mehta
090d410498 [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:18 +05:30
Anand Doshi
3139973662 [fix] [minor] quotation to sales order, if not able to create customer, show message 2013-09-03 15:41:31 +05:30
Anand Doshi
627c42bdb6 [fix] [minor] quotation to sales order, if not able to create customer, show message 2013-09-03 15:34:24 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +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
7cfefbced5 [bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder 2013-08-07 17:46:35 +05:30
Rushabh Mehta
5eedde191f [mapper] [minor] idx fix for multiple pulls webnotes/erpnext#651 2013-08-06 12:40:23 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Anand Doshi
9b4961400a [minor] [fix] get queries 2013-07-11 19:13:58 +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
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
38683718e1 [get_query] to server side 2013-07-09 16:34:50 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Anand Doshi
bdee6e074a [cleanup] moved company to top section, hide company if only one exists, changed field labels 2013-07-09 13:03:39 +05:30
Anand Doshi
615701d3ae Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	stock/doctype/material_request/material_request.txt
 2013-07-08 18:54:00 +05:30
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Rushabh Mehta
862a02b8d2 [pull-mappers] no fields via custom button, started with quotation, material request, purchase order 2013-07-08 15:52:24 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Nabin Hait
df1fca9f65 [mapper] material request to purchase order 2013-07-04 17:50:06 +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