Zlash65
890707854d
config/utility level changes
2018-05-14 11:45:38 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Zlash65
fa5ecb066e
typo fix in leaderboard
2018-04-22 12:11:01 +05:30
Zarrar
92109b01fd
translate while creating items from user progress ( #13530 )
2018-04-06 10:27:55 +05:30
Prateeksha Singh
b60a52b194
Hub Market ( #13325 )
...
* [hub] enable hub with OAuth token from user's client ID
* [hub] settings schema for adding users
* [hub] image view style listing
* [hub] broken image link fallback
* [wip]
* [hub] bootstrap timeline
* [hub] setup quick view
* [hub] reformat ratings, add companies autocomplete filter
* [hub] common listing frames
* [hub] setup sort selector
* [hub] timeline
* [hub] customize list header
* [hub] genuine form fieldtypes
* [hub] review products
* [hub] suggest missing categories remotely
* [hub] Wishlist; header and title templates
* [hub] link wishlist, remove company migration
* [hub] calculate ratings
2018-04-03 10:44:13 +05:30
Britlog
e3a9b9fe49
[Website] Price in items list and sales uom management ( #13335 )
...
* Price in items list and sales uom management
* Price in product search page
* Display website stock in sales uom
* Add set_product_info_for_website to avoid duplicate code
* Add price uom in item list and page
* Update product.py
2018-03-20 14:28:44 +05:30
Achilles Rasquinha
ecc4fdd3ef
Check Set Sales Target Item exists in User Slides
2018-03-19 22:21:45 +05:30
Achilles Rasquinha
d0786b45c3
fix issue
2018-03-19 22:17:37 +05:30
Zarrar
0702f29860
Add Ends-On field in the Lead doctype ( #13147 )
...
* add ends_on date in lead to be mapped with calendar event
* set default ends_on to 1 hour from contact_time
2018-03-12 18:49:54 +05:30
Prateeksha Singh
9362cf37e0
[charts] update charts API
2018-03-12 09:54:56 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
rohitwaghchaure
0df95fa781
Multi-UOM for sales/purchase return ( #13132 )
...
* Multi-UOM for sales/purchase return
* Update sales_and_purchase_return.py
2018-03-01 11:31:33 +05:30
Zarrar
6578bc11b6
wrong query formed to delete events ( #13119 )
2018-03-01 10:54:55 +05:30
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Nabin Hait
0e3db275e5
Merge branch 'master' into develop
2018-02-22 18:10:39 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
tundebabzy
c15978fca0
fix indentation
2018-02-22 09:50:49 +01:00
Nabin Hait
7d862276af
Cleanup and fixes on leaderboard
2018-02-22 13:59:41 +05:30
Nabin Hait
e4fe2d9603
Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard
2018-02-22 11:35:10 +05:30
Shreya Shah
0bde9e11c7
clear log if no attachments ( #13023 )
2018-02-22 10:55:40 +05:30
vishdha
09d56754ea
[fix] Codacy issue
2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19
[fix] Sales partner details get from sales Order and company currency details from selected company
2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e
[fix] Codacy Issue
2018-02-21 15:35:58 +05:30
vishdha
d4491d361f
[new] Filter based on company:
2018-02-21 15:35:58 +05:30
vishdha
09acb779d7
[new] Leader board
2018-02-21 15:35:58 +05:30
Zarrar
bc5515651b
[Hotfix] Selecting create on blank field throws error ( #13014 )
...
* selecting create on blank field error fix
* error when fetching default_print_format
2018-02-21 11:13:14 +05:30
Achilles Rasquinha
1697a7aa81
replaced string_types with basestring
2018-02-15 11:39:45 +05:30
Faris Ansari
d53b149828
[deadlock fix] Save if not set ( #12896 )
2018-02-13 16:31:00 +05:30
Faris Ansari
f0056f7338
[deadlock fix] Save if not set
2018-02-13 12:18:24 +05:30
Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
tundebabzy
5df64d84a1
code review fix
2018-02-01 17:05:54 +01:00
tundebabzy
29c8142678
refactor adjust_for_expired_items and others as per code review
...
use get_all instead of get_list
rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`
2018-01-31 10:51:06 +01:00
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
tundebabzy
c7c1defe64
after adjusting stock_qty for expired, set in_stock flag
2018-01-27 12:16:13 +01:00
tundebabzy
c14f1f145b
adjust stock_qty for expired quantities
...
adjust based on warehouse
add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base
2018-01-27 12:16:13 +01:00
Prateeksha Singh
4c58299eb0
[fix] encode if letterhead
2018-01-25 17:29:57 +05:30
Rohit Waghchaure
abc0632925
Merge branch 'master' into develop
2018-01-19 15:49:29 +05:30
Rohit Waghchaure
c987500e08
Merge branch 'master' into develop
2018-01-19 13:29:57 +05:30
Manas Solanki
c6d5611408
Issue in the data import while importing the invoice
2018-01-18 11:20:24 +05:30
Faris Ansari
00e547d319
Encode letterhead filename ( #12525 )
2018-01-18 09:28:13 +05:30
Saurabh
4b0dd8a159
Merge branch 'master' into develop
2018-01-15 18:36:35 +05:30
Faris Ansari
184491bbbe
[hotfix] Validate posting_time ( #12484 )
2018-01-15 14:18:53 +05:30
Nabin Hait
cb495fb33b
Merge branch 'master' into develop
2018-01-05 13:17:00 +05:30
Manas Solanki
a521efc990
fix for the non stock items for the shopping cart ( #12294 )
2018-01-05 12:47:20 +05:30
Shreya Shah
48351e0339
cancelled sales invoice totals shouldn't be reflected in leaderboard for customer ( #12292 )
2018-01-05 12:45:43 +05:30
Manas Solanki
1f4b530e68
remove the print statements
2017-12-21 12:57:43 +05:30
Prateeksha Singh
9a57049faa
Merge pull request #12113 from pratu16x7/leaderboard
...
Add Leaderboard to desktop
2017-12-20 11:39:05 +05:30
Prateeksha Singh
04c4ce353c
Add leaderboard to desktop
2017-12-20 10:51:25 +05:30
Prateeksha Singh
3942cd353a
create item price only if item created, fixes #12041
2017-12-19 12:53:39 +05:30
Prateeksha Singh
7351709980
[multicheck] Select multiple domains in setup ( #11709 )
...
* [multicheck] select multiple domains in setup
* use multiple domains in make_sample_data
* revert to setting in domains child table
* domains slide validation
* update setup wizard test
2017-12-06 13:28:06 +05:30
