Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,876 Commits 3 Branches 0 Tags 1 GiB
81284b73ef
Commit Graph

552 Commits

Author SHA1 Message Date
Anand Doshi
25647c4375 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2013-07-29 13:31:00 +05:30
Anand Doshi
d5d39ac5ec [fix] [minor] sales and purchase get_queries 2013-07-29 13:28:37 +05:30
Nabin Hait
90d74d4bfa [minor] sales invoice to delivery note mapping and prevdoc validation 2013-07-29 13:27:18 +05:30
Anand Doshi
5491332772 [fix] [minor] use wn.defaults.get_default instead of sys_defaults 2013-07-26 13:02:18 +05:30
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Anand Doshi
52b049145b [fix] [minor] call refresh_fields after cur_frm.call when doc is passed 2013-07-25 19:13:45 +05:30
Rushabh Mehta
c97fe01837 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:14:18 +05:30
Nabin Hait
ea51b41239 [fix] [minor] allowed territory group in all transactions 2013-07-25 18:01:13 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Rushabh Mehta
1875fd177a [minor] [fix] missing icons in reports #589 2013-07-25 16:05:02 +05:30
Nabin Hait
23a64d7f9d [minor] removed customer validation between quotation and SO 2013-07-24 16:19:54 +05:30
Anand Doshi
ba8ea7dbfd [minor] [fix] fetch contact details 2013-07-24 12:08:42 +05:30
Nabin Hait
deff57826a [minor] [fix] fetch contact details 2013-07-24 11:30:35 +05:30
Nabin Hait
64a9d0ccef Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 15:31:57 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
ed69892a0a [minor] [query] sales person 2013-07-23 15:16:50 +05:30
Anand Doshi
1dc95ed865 [minor] [selling] [fix] fetch available qty for given warehouse 2013-07-23 13:36:38 +05:30
Anand Doshi
2fdd874cae Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 11:02:22 +05:30
Anand Doshi
f577b09b3b [minor] [fix] sales and purchase analytics 2013-07-23 11:01:27 +05:30
Nabin Hait
5fa994f7a1 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 17:15:16 +05:30
Nabin Hait
d351318014 [minor] [fix] employee field while new sales person created from tree 2013-07-22 17:15:01 +05:30
Anand Doshi
7dd5034b03 [minor] [fix] [issue] #624 2013-07-22 16:36:11 +05:30
Rushabh Mehta
b54cd9967e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 15:59:48 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Nabin Hait
50f5fd13c7 [feature] [selling] customer discount item_group wise 2013-07-22 13:10:13 +05:30
Anand Doshi
95391b176a [minor] [fix] [issue] #618 2013-07-19 16:48:00 +05:30
Anand Doshi
648fd16e98 [minor] [fix] #616 2013-07-19 14:15:58 +05:30
Anand Doshi
573b423a6c Merge branch 'master' of github.com:webnotes/erpnext 2013-07-18 13:26:53 +05:30
Anand Doshi
61cad5076b [minor] [fix] opportunity form, queries, stock uom replace utility 2013-07-18 13:26:27 +05:30
Nabin Hait
55b5dd2f10 [fix] [mapper] 2013-07-18 13:05:14 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Anand Doshi
80166e26cc [minor] [selling/buying] use script_manager.trigger instead of calling cscript function directly post item details fetch, so that custom code can be executed 2013-07-17 14:49:13 +05:30
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +05:30
Anand Doshi
cefccb921e [minor] [webshop] [fix] 2013-07-15 18:28:14 +05:30
Nabin Hait
40cb8fb193 [fix] [minor] Installation Note: pulling from DN and code cleanup 2013-07-15 17:23:49 +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
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
 2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +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
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Rushabh Mehta
919b9fcccf [cleanup] Maintenance Schedule, Maintenance Visit 2013-07-10 13:06:14 +05:30
Rushabh Mehta
f9404ba89f [feature] Added Section Breaks to Grids for better visual hierarchy 2013-07-10 12:07:45 +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
c120776931 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
 2013-07-09 13:10:15 +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
Nabin Hait
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +05:30
Anand Doshi
6172b6ffb8 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 19:47:55 +05:30
Anand Doshi
3c6d440f09 [bean] [mandatory] fixes in test cases 2013-07-08 19:47:37 +05:30
Nabin Hait
a131c0aa5e [fixed conflict] 2013-07-08 19:01:41 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +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
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +05:30
Rushabh Mehta
b4c68531ea [pull-mappers] sales order 2013-07-08 15:58:50 +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
Anand Doshi
0f21b324c9 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
 2013-07-08 11:53:35 +05:30
Nabin Hait
70eda07bcf [report] deleted duplicate report 2013-07-08 11:33:09 +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
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Nabin Hait
2b3ca41450 [mapper] support 2013-07-07 12:32:01 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Nabin Hait
fcd9434daf [mapper] 2013-07-06 18:25:36 +05:30
Nabin Hait
2d2d800f0f Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 18:34:10 +05:30
Nabin Hait
126aedda08 [mapper] 2013-07-05 18:30:16 +05:30
Anand Doshi
29ea5d014e [sales common] [fix] calculate outstanding amount only for docstatus=0 on client side 2013-07-05 17:23:14 +05:30
Nabin Hait
1bec8012d2 [conflict] fixed 2013-07-05 15:25:58 +05:30
Nabin Hait
eb883ee7a3 [mapper] purchase cycle 2013-07-05 15:23:47 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Anand Doshi
a749996747 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-04 18:30:44 +05:30
Nabin Hait
bc9cf1549f Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:56:51 +05:30
Rushabh Mehta
be2016ba41 [mapper] sales order-sales invoice added condition 2013-07-04 17:52:03 +05:30
Nabin Hait
df1fca9f65 [mapper] material request to purchase order 2013-07-04 17:50:06 +05:30
Rushabh Mehta
8fe97fcbe1 [mapper] sales order-sales invoice 2013-07-04 17:31: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
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
37805ca415 [mapper] sales order-delivery note, added postprocess function in each doc for mapper.py 2013-07-04 17:03:02 +05:30
Rushabh Mehta
212de6a084 [mapper] added sales order > material request, added postprocess function 2013-07-04 16:29:03 +05:30
Rushabh Mehta
080fcc8fcd [mapper] quotation-sales order for mapping in parent + child items 2013-07-04 15:27:04 +05:30
Rushabh Mehta
8aded138c7 [buying] started cleanup, [mapper] started rewrite 2013-07-04 12:50:52 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Rushabh Mehta
9a04b19160 [form] [legacy-js] removed old Dialog, PageHeader etc., cleanup Opportunity and Quotation 2013-07-03 13:27:39 +05:30
Rushabh Mehta
78979dca9b [form] added icon in section break 2013-07-03 10:32:33 +05:30
Rushabh Mehta
e6bf83e653 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-02 18:14:07 +05:30
Rushabh Mehta
2eb7ceabda [forms] cleanup, fixing usability and added form dashboard 2013-07-02 18:13:26 +05:30
Anand Doshi
15db6c4659 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py
 2013-07-02 11:50:32 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Anand Doshi
169cfafe13 [customer] [fix] link customer in lead's address when creating customer from lead 2013-06-29 17:24:27 +05:30
Anand Doshi
8f9f8a43c7 [lead] [address] store lead address in Address doctype, with link field=lead 2013-06-28 19:18:33 +05:30