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 |
|