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 |
|
Saurabh
|
d6cc5cd08f
|
[Trends Teports] cleanup
|
2013-06-28 10:09:46 +05:30 |
|
Anand Doshi
|
77cd10b10a
|
[selling] added shipping rule link besides taxes master link field
|
2013-06-27 12:17:34 +05:30 |
|
Akhilesh Darjee
|
89bd216a0c
|
[Fix] SMS Center
|
2013-06-26 18:28:54 +05:30 |
|
Anand Doshi
|
70902da4da
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/december_2012/deprecate_tds.py
patches/june_2012/reports_list_permission.py
selling/doctype/sales_bom/locale/_messages_doc.json
selling/doctype/sales_bom/locale/ar-doc.json
selling/doctype/sales_bom/locale/de-doc.json
selling/doctype/sales_bom/locale/es-doc.json
selling/doctype/sales_bom/locale/fr-doc.json
selling/doctype/sales_bom/locale/hi-doc.json
selling/doctype/sales_bom/locale/hr-doc.json
selling/doctype/sales_bom/locale/nl-doc.json
selling/doctype/sales_bom/locale/pt-BR-doc.json
selling/doctype/sales_bom/locale/pt-doc.json
selling/doctype/sales_bom/locale/sr-doc.json
selling/doctype/sales_bom/locale/ta-doc.json
selling/doctype/sales_bom/locale/th-doc.json
selling/doctype/sales_bom_item/locale/_messages_doc.json
selling/doctype/sales_bom_item/locale/ar-doc.json
selling/doctype/sales_bom_item/locale/de-doc.json
selling/doctype/sales_bom_item/locale/es-doc.json
selling/doctype/sales_bom_item/locale/fr-doc.json
selling/doctype/sales_bom_item/locale/hi-doc.json
selling/doctype/sales_bom_item/locale/hr-doc.json
selling/doctype/sales_bom_item/locale/nl-doc.json
selling/doctype/sales_bom_item/locale/pt-BR-doc.json
selling/doctype/sales_bom_item/locale/pt-doc.json
selling/doctype/sales_bom_item/locale/sr-doc.json
selling/doctype/sales_bom_item/locale/ta-doc.json
selling/doctype/sales_bom_item/locale/th-doc.json
|
2013-06-26 14:07:29 +05:30 |
|
Anand Doshi
|
8bef70cceb
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 13:53:17 +05:30 |
|
Anand Doshi
|
bd7218979e
|
[shipping rule] added doctypes shipping rule and shipping rule conditions
|
2013-06-26 13:53:01 +05:30 |
|
Nabin Hait
|
e26acffcfe
|
[report] available qty for packing items
|
2013-06-26 13:47:11 +05:30 |
|
Akhilesh Darjee
|
e05e6a114e
|
[Fix]SMS Center Cell Number
|
2013-06-25 18:00:30 +05:30 |
|
Rushabh Mehta
|
e08f1bc034
|
[email] [fix] decode subject
|
2013-06-25 16:21:58 +05:30 |
|
Rushabh Mehta
|
9132de5e4c
|
[global defaults] breakup added buying settings and selling settings
|
2013-06-25 11:54:37 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Akhilesh Darjee
|
78e622ef5c
|
Deleted search criteria
|
2013-06-25 11:08:19 +05:30 |
|
Akhilesh Darjee
|
a19014a846
|
Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report
|
2013-06-24 19:05:16 +05:30 |
|
Rushabh Mehta
|
7a93d5de30
|
[bug fixes] [global defaults] [cleanup]
|
2013-06-24 18:18:46 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Nabin Hait
|
82366d3bb8
|
[report] deleted old reports based on search_criteria
|
2013-06-24 14:31:56 +05:30 |
|
Nabin Hait
|
4cd977a2a9
|
[fixes] pull previous doc details
|
2013-06-24 12:20:35 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Nabin Hait
|
99fd749334
|
[report][cleanup] pending so items for purchase request
|
2013-06-21 16:56:32 +05:30 |
|
Saurabh
|
36cb3caaa7
|
[Pending so Items for purchase receipt]
|
2013-06-21 16:25:28 +05:30 |
|
Akhilesh Darjee
|
64c8e28423
|
[Fixed] Merge conflict fixed
|
2013-06-21 13:09:18 +05:30 |
|
Akhilesh Darjee
|
1ded5c618e
|
[Report]Cleanup of territory target variance, sales person target variance & budget variance reports
|
2013-06-21 12:47:51 +05:30 |
|
Anand Doshi
|
d52b03a8cc
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/search_criteria/trend_analyzer/trend_analyzer.py
buying/doctype/purchase_common/purchase_common.js
|
2013-06-21 12:22:52 +05:30 |
|
Saurabh
|
7989deda20
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-21 10:54:12 +05:30 |
|
Saurabh
|
f8f68c54d9
|
[trends analyzer] cleanup completed
|
2013-06-20 18:52:31 +05:30 |
|
Nabin Hait
|
0930b94264
|
[target report] cleanup
|
2013-06-20 16:35:09 +05:30 |
|
Nabin Hait
|
739a7fdf74
|
Merge pull request #494 from akhileshdarjee/master
[Report] Completed Territory Target Variance & Sales Person Target Variance reports
|
2013-06-20 02:53:31 -07:00 |
|
Akhilesh Darjee
|
e6974d10c2
|
Fixed conflict merge
|
2013-06-20 15:22:04 +05:30 |
|
Nabin Hait
|
b8ebbcafa9
|
[trend analyzer] cleanup
|
2013-06-20 13:03:10 +05:30 |
|
Nabin Hait
|
616657d4a2
|
Merge pull request #495 from saurabh6790/master
[erpnext][reports][Trend Analyzer]
|
2013-06-19 22:18:44 -07:00 |
|
Akhilesh Darjee
|
92571c6929
|
[Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report
|
2013-06-19 18:15:20 +05:30 |
|
Anand Doshi
|
c2a352711f
|
[shopping cart] show items, editable qty and show amount for that item
|
2013-06-19 17:19:20 +05:30 |
|
Akhilesh Darjee
|
4ddc2618e8
|
[Report] Completed Sales Person Target Variance (Item-Group wise)
|
2013-06-18 18:46:02 +05:30 |
|
Anand Doshi
|
ca628d9f54
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/sales_order/sales_order.txt
|
2013-06-18 18:30:41 +05:30 |
|
Anand Doshi
|
3c6c3cf5ee
|
[sales order] [shipping address] allow to edit shipping address
|
2013-06-18 18:26:30 +05:30 |
|
Akhilesh Darjee
|
2967581102
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-17 19:27:30 +05:30 |
|
Akhilesh Darjee
|
f841a7bc14
|
Completed territory_target_variance(item_group_wise) report
|
2013-06-17 19:25:48 +05:30 |
|
Anand Doshi
|
e81321219e
|
[webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods
|
2013-06-17 15:42:38 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +05:30 |
|
Saurabh
|
feb8669cbd
|
[Reports][Validation changes in Purchase and Sales trends]
|
2013-06-14 17:40:48 +05:30 |
|
Saurabh
|
606d8383ff
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-14 16:48:41 +05:30 |
|
Saurabh
|
1848b71a0a
|
[Reports][Sales and Purchase Trends][Completed]
|
2013-06-14 15:03:45 +05:30 |
|
Rushabh Mehta
|
37982a6a1f
|
[contact/address] fixed auto setting closes #475 (erpnext)
|
2013-06-14 13:29:20 +05:30 |
|
Saurabh
|
0326f5414e
|
[reports][purchase and sales trends]
|
2013-06-13 19:17:56 +05:30 |
|
Saurabh
|
f9966f44cd
|
[Report][Quotation Trend Complete]
|
2013-06-12 17:55:19 +05:30 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Saurabh
|
bcbd9a4800
|
[Report][Quotation Trend]
|
2013-06-11 18:06:58 +05:30 |
|
Anand Doshi
|
3daf45fcd8
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-11 17:34:18 +05:30 |
|
Anand Doshi
|
2e0cc41fc6
|
[chart of accounts/cost center] [add account/cost center] fix in permission issue
|
2013-06-11 17:33:37 +05:30 |
|
Anand Doshi
|
3b867f7377
|
[cleanup] [fix] removed amendment_date
|
2013-06-11 17:21:11 +05:30 |
|
Anand Doshi
|
b53b9dcff4
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-11 16:23:45 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
f85368ec5e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-11 16:07:44 +05:30 |
|
Anand Doshi
|
618edee8b7
|
[search criteria] [cleanup] removed search criteria folders and files
|
2013-06-11 15:04:37 +05:30 |
|
Anand Doshi
|
5c069050d5
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-11 14:34:45 +05:30 |
|
Anand Doshi
|
433047b2e2
|
[customer] [permlevel] changed fields/perms with permlevel 2 to permlevel 1
|
2013-06-11 14:28:42 +05:30 |
|
Rushabh Mehta
|
0b61c2e10f
|
[docs] added readme for selling
|
2013-06-11 14:24:25 +05:30 |
|
Rushabh Mehta
|
3c8cffb69b
|
[cleanup] removed Shipping Address, Communication Log
|
2013-06-11 14:23:59 +05:30 |
|
Akhilesh Darjee
|
85e1026325
|
Fixed selling_home.js conflicted during merge
|
2013-06-11 11:17:56 +05:30 |
|
Akhilesh Darjee
|
458bed193f
|
ERPNext Update
|
2013-06-11 10:56:22 +05:30 |
|
Akhilesh Darjee
|
f75ebb5a1b
|
Report partially completed - Territory Target Variance(Item-Group Wise)
|
2013-06-11 10:23:10 +05:30 |
|
Anand Doshi
|
097ac352d6
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:38:31 +05:30 |
|
Anand Doshi
|
670199b9c6
|
[patch] [fix] event for project, oppty, lead
|
2013-06-10 15:38:01 +05:30 |
|
Anand Doshi
|
7e2010a649
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-10 15:25:07 +05:30 |
|
Anand Doshi
|
e53a81dcea
|
[event] [lead, opportunity, project] [fix] create events
|
2013-06-10 15:15:40 +05:30 |
|
Anand Doshi
|
b2dc1aeca9
|
[lead] [next contact] [fix] create event
|
2013-06-10 12:34:31 +05:30 |
|
Saurabh
|
66f10cd14f
|
Quotation Trend
|
2013-06-07 18:05:16 +05:30 |
|
Saurabh
|
d9bf642447
|
[Report][Changes made in Customers Not Buying Since Long Time.py]
|
2013-06-07 15:28:43 +05:30 |
|
Saurabh
|
5b1e899250
|
[Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level]
|
2013-06-07 13:34:16 +05:30 |
|
Saurabh
|
1efc8b3734
|
[Reprots][No Sales Order From Customer] and [Item Reorder Level]
|
2013-06-06 19:31:14 +05:30 |
|
Anand Doshi
|
9d04924bc2
|
[selling] [cleanup] rearranged fields
|
2013-06-05 20:46:56 +05:30 |
|
Saurabh
|
7b48218b6f
|
[Reports][Reorder Level] and [No Sales Order from Customer]
|
2013-06-05 18:17:28 +05:30 |
|
Anand Doshi
|
12cea9587f
|
[terms and conditions] removed terms html and added terms and conditions to purchase invoice
|
2013-06-05 14:59:28 +05:30 |
|
Anand Doshi
|
bf3e54a45b
|
[issues #437] [fix] pulling terms and conditions
|
2013-06-05 14:11:32 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
0feebc1a67
|
[status updater] managed by controllers and commonified for sales and purchase
|
2013-06-03 16:45:38 +05:30 |
|
Anand Doshi
|
ecc28f0311
|
[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice
|
2013-05-30 17:43:30 +05:30 |
|
Anand Doshi
|
200c8f7980
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
selling/doctype/sales_common/sales_common.py
|
2013-05-29 12:30:54 +05:30 |
|
Nabin Hait
|
df33532280
|
[fixes] pulling available qty on selection of item in case of pos
|
2013-05-29 11:03:11 +05:30 |
|
Anand Doshi
|
5d74c82c06
|
Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.js
|
2013-05-28 17:46:50 +05:30 |
|
Anand Doshi
|
923d41dfd2
|
[selling/buying] [fixes] fixes in client side code, server side code, print formats
|
2013-05-28 17:23:36 +05:30 |
|
Nabin Hait
|
34d1b1415e
|
[report] filter added base on territory in sales personwise transaction summary
|
2013-05-28 12:32:21 +05:30 |
|
Nabin Hait
|
77a2ee01e2
|
[rename][fixes] do not update customer name of renaming of customer
|
2013-05-28 11:56:48 +05:30 |
|
Anand Doshi
|
fc77718a3d
|
[selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying
|
2013-05-27 19:29:07 +05:30 |
|
Anand Doshi
|
3543f30046
|
[calculations] [client/server] first cut
|
2013-05-24 19:25:01 +05:30 |
|
Rushabh Mehta
|
126f2c62f2
|
[merge] merge with master
|
2013-05-24 16:09:13 +05:30 |
|
Anand Doshi
|
2168e39bf3
|
[selling/buying] set dynamic labels
|
2013-05-23 19:25:08 +05:30 |
|
Rushabh Mehta
|
b394a25904
|
[ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9
|
2013-05-23 16:03:49 +05:30 |
|
Anand Doshi
|
4543884021
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
selling/doctype/quotation/quotation.txt
selling/doctype/quotation_item/quotation_item.txt
selling/doctype/sales_order_item/sales_order_item.txt
stock/doctype/delivery_note_item/delivery_note_item.txt
stock/doctype/item/item.txt
|
2013-05-23 15:22:47 +05:30 |
|
Anand Doshi
|
aabe11b689
|
[sales order] [validate] validate item details specifically when submitting
|
2013-05-23 12:59:12 +05:30 |
|
Nabin Hait
|
66928243c1
|
[fixes] removed communication section break from quotation
|
2013-05-22 16:55:10 +05:30 |
|
Nabin Hait
|
b7e07ac6a5
|
[fixes] updated no_copy field
|
2013-05-22 12:10:16 +05:30 |
|
Rushabh Mehta
|
4a2f0f8c36
|
[js-libs] upgraded to latest bootstrap and font-awesome
|
2013-05-22 11:57:05 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +05:30 |
|
Anand Doshi
|
aab81626ce
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-10 18:12:24 +05:30 |
|
Anand Doshi
|
21f4ea36b2
|
[selling] [calculations] server side calculations, test cases and rounding based on currency number format
|
2013-05-10 18:08:32 +05:30 |
|
Anand Doshi
|
2186e83670
|
[lead to customer] [fix] fix for creating customer from lead when there are restrictive permissions based on company for creating customer
|
2013-05-10 00:39:15 +05:30 |
|
Anand Doshi
|
ef06a4b349
|
[autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype
|
2013-05-09 15:13:47 +05:30 |
|
Anand Doshi
|
bddd5d9b0c
|
[rename] [fix] merge should be passed to on_rename method of controller for further processing
|
2013-05-09 12:45:18 +05:30 |
|
Rushabh Mehta
|
f514998011
|
merge
|
2013-05-09 11:42:35 +05:30 |
|
Anand Doshi
|
c414175a44
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-05-08 11:45:32 +05:30 |
|
Nabin Hait
|
620576080a
|
[fixes][currency symbol] fieldtype in report
|
2013-05-07 12:03:33 +05:30 |
|
Rushabh Mehta
|
08332ddacd
|
[form] [scripting] fixes and cleanups for new triggering system
|
2013-05-06 12:46:13 +05:30 |
|
Anand Doshi
|
4cea651a36
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-05-06 11:36:51 +05:30 |
|
Nabin Hait
|
dc992824d0
|
Merge branch 'master' into edge
|
2013-05-03 15:42:03 +05:30 |
|
Nabin Hait
|
c51c0ce3e9
|
[fixes] salary slip
|
2013-05-03 15:40:26 +05:30 |
|
Nabin Hait
|
9c7eb486ed
|
[Query Report] Item-wise Sales History
|
2013-05-03 14:50:12 +05:30 |
|
Anand Doshi
|
cba730c7bd
|
[sales common] [fix] minor fix in validation message
|
2013-05-03 14:47:59 +05:30 |
|
Nabin Hait
|
fdd919a1d3
|
[report] sales personwise transaction summary
|
2013-05-03 14:24:24 +05:30 |
|
Rushabh Mehta
|
d3e00995db
|
[conflicts] [merged]
|
2013-05-02 16:02:59 +05:30 |
|
Rushabh Mehta
|
3aeed95e0a
|
[customer/supplier] [address] extended list to 5
|
2013-05-02 11:39:46 +05:30 |
|
Rushabh Mehta
|
cc32b65b66
|
[toolbars] [design] commonified into common toolbar
|
2013-04-19 13:01:32 +05:30 |
|
Rushabh Mehta
|
d6c8235fb5
|
[style] [upgrade] moved to bootstrap 3
|
2013-04-18 17:43:21 +05:30 |
|
Rushabh Mehta
|
651ce05fcc
|
[merge master
]
|
2013-04-18 10:37:16 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|