Suraj Shetty
00cced12a0
Success Action ( #13666 )
...
* success action config for sales invoice
* remove "Notification Control" doctype and its usage
* add default success action after_install or while migration (patch)
* rename for_doctype to ref_doctype
* case change
* minor fix
* Remove unnecessary code
* Replace message with translatable message
* Fix 'cannot import error'
2018-05-03 19:06:32 +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
Shreya Shah
8d9edbf133
Letterhead in user progress ( #11679 )
...
* added letter-head to user progress slides
* added letterhead action to patch
* improvised
* added date in patches.txt
2017-11-28 16:09:58 +05:30
Manas Solanki
966f141f62
Rename schools to Education ( #11524 )
...
* renaming for the docs, demo data and patch
* changes in the doctypes and reports
* rename the config file
* Few name changes in messages and license
* rename the school settings to education settings
* changes in the documentation
* added the setup file for the fixtures
* corrected the ui tests file path
* fix the codacy
* add the patch for renaming few doctypes and fields
* changes in the patch
2017-11-23 15:22:10 +05:30
Britlog
2a89a502f0
[Website] Items list and stock ( #11480 )
...
* Add stock availability in items list and a parameter to set the number of products per page
* Substract reserved_qty from actual_qty for website stock
2017-11-17 11:41:07 +05:30
Faris Ansari
fd345f8e90
Hub ( #10934 )
...
* [WIP]Hub
* [listing] Show items, users and item_groups
* Show filters
* [start] cart, api for rfq and opp
* rfq working
* [wip] keys
* wip quotes
* [hub] register/unregister
* [hub] rename password to access_token, remove passed company field
* [hub] publishing cases, api call wrapper
* [hub] add and remove fields working
* [hub] fix flags, update on client save working
* [hub] new hub page, client item CUD at hub working
* listing, standard rate, local site hack
* item listing, item page, search, back to home
* [hub] implement hub company
* [hub] company filter
* [hub] basic rfq-ing, item page cleanup
* categories wip
* [hub] use get_doc_before_save()
* [hub] send opportunity message to hub, api to make locally
* [hub] enqueueing in hub api request wrapper
* cleanup
* [hub] refactor shopping cart's product.py to reuse
* sync dynamic item fields daily
* Scheduler heartbeat check
* [wip] hub categories
* [hub] wip enqueued callbacks
* [hub] outgoing messages, fixing callback loop
* [hub] bug: callback save after primary save
* [hub] pricing, stock, currency
* [hub] replace send_hub_request with make_and_enqueue
* add hub.less, refactor code
* Remove template html files, add styling for hub item cards
* fix paging
* add breadcrumb
* Add sidebar
* [hub] add company page, change country
* [hub] order_by filters
* [hub] make hub category a tree
* [hub] enqueue batched item enqueueing
* [hub] requested products page
* [minor]
* update hub url
* [fix] url
* [fix] more reform
* fix recursion
* [hub] data migration plans as jsons
* Hub register, create data connector, sync with run
* [add] user registration by session user
* Removed hub_message
* Remove sync code from hub_settings
* Remove hub methods from item.py
* Update Hub Sync plan
* Hub unregister
* Update Hub connector on reregister
* Dont delete Hub Connector on unregister
* Enable hub on success response
* Add new hub whitelisted methods
* [hub] list working
* Hub register from hub page
* [hub] Add hub logo in desk icon, link to page
* [hub] hide page head on empty state
* [hub] make rfq
* [hub] push opportunity doc, poll for opportunity docs
* add fields to item mapping
* update hub mappings
* Make RFQ
* [hub] item, home routing
* Make rfq and send opportunity refactor
* [hub][fix] remote lead data
* images passed as base64
* set default company on register
* Revert "images passed as base64"
This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4.
* Add sync to hub page
* Prompt for publish items to hub
* add post process to hub document to lead
* Rename Hub document to Hub message, create opportunity in post process
2017-10-05 11:17:30 +05:30
Nabin Hait
945f502748
Fixes for updating item variant from template ( #10975 )
...
* Fixes for updating item variant from template
* More fixes for test cases
2017-09-29 15:11:50 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Prateeksha Singh
9b4f3cf9de
Leaderboard cleanup ( #10638 )
...
* [leaderboard] wip
* [leaderboard] filter for selecting leaderboard criteria, single col
* [leaderboard] doctypes in sidebar
* hide graph if no results
2017-09-18 16:41:04 +05:30
Makarand Bauskar
5ac01a2bf7
[minor] translate the action name in get_slide_settings ( #10740 ) ( #10790 )
2017-09-15 12:10:29 +05:30
Prateeksha Singh
242218d2b7
Progress fixes ( #10710 )
...
* [progress] sales target slide
* [fix] rerun patch for sales target slide
2017-09-13 18:41:01 +05:30
Prateeksha Singh
95d8fd38f5
User Progress ( #10336 )
...
* [user-progress] first cut
* [user-progress] Add users slide, remove taxes, make sample data
* wip tests
* [setup-wiz] UI test
* [user-progress] notif test, docs trim
* wip
* [user-progress] Setup Progress single to update action states, fixtures
* setup progress actions patch
* rename sales_target field patch
* [progress] wip reform slide data
* [progress] remove slide data
* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Ayush Shukla
a111f78566
Leaderboard of customers, items, suppliers and sales partner ( #9354 )
...
* First commit leaderboard working
* Styling and added href
* Changed timeline string
* Changes in item
* Cleanup
* Fix
* made changes to currency column
* Code cleanup for codacy
* Sorting bug fixed and formatting done
* Changed type to isinstance
2017-06-20 13:04:45 +05:30
Sagar Vora
67fe1010c7
[minor] set_posting_time=1 only when imported data contains posting date. ( #9349 )
2017-06-19 12:12:22 +05:30
Rushabh Mehta
b7b49f6da7
[fixes] fix message and type conversion;
2017-06-19 09:59:09 +05:30
Rushabh Mehta
65a27395fe
[minor] remove student batch name from activation.py
2017-05-19 14:53:32 +05:30
Saurabh
f4ee682400
[fix] pass company filter as string in get_value ( #8823 )
2017-05-16 08:30:27 +05:30
Makarand Bauskar
b0df661e81
[minor] set set_posting_time to 1 while data import ( #8835 )
2017-05-16 07:59:58 +05:30
Saurabh
45540569ff
[fix] rename Student Batch to Student Batch Name in activation check
2017-05-13 06:30:41 +05:30
Rushabh Mehta
e385b5b97b
[enhance] automatic batch creation, move and split
2017-04-24 10:28:38 +05:30
Rushabh Mehta
131866a11a
[fixes] for tests
2017-03-14 21:06:15 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
312498060f
changed doctype name userrole to has role
2017-03-06 14:24:39 +05:30
Nabin Hait
834d616c60
Merge branch 'master' into develop
2017-03-02 12:38:15 +05:30
Rushabh Mehta
7067ff026a
[minor] add progress in desktop help message
2017-03-02 11:14:09 +05:30
Rushabh Mehta
e7900b24a0
[minor] add progress in desktop help message
2017-03-02 11:13:18 +05:30
Nabin Hait
18b7364a81
Merge branch 'master' into develop
2017-02-28 18:56:26 +05:30
Rushabh Mehta
f8b19e07cf
[minor] activation messages only for non activated users
2017-02-28 18:54:07 +05:30
Nabin Hait
b9741b6ed5
Merge branch 'master' into develop
2017-02-27 15:41:44 +05:30
Nabin Hait
a2afc4e11c
Update activation.py
2017-02-27 15:39:29 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Rushabh Mehta
05ce7ec7bb
[enhance] desktop messages
2017-02-22 16:15:43 +05:30
Nabin Hait
de45b0eddc
Merge branch 'master' into develop
2017-02-16 15:59:59 +05:30
Rushabh Mehta
6dd461fec4
[add] site activation level
2017-02-16 14:53:21 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
7fa039f15c
[fixes] delete company transaction and other minor fixes
2017-01-30 10:45:28 +05:30
Rushabh Mehta
d14a6c058a
[fix] stop recursion while adding role
2017-01-17 18:46:37 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Nabin Hait
a9ecc0b700
Merge branch 'master' into develop
2016-12-14 14:33:06 +05:30
Nabin Hait
80cea9795e
Address naming if multiple address for same type
2016-12-13 14:50:35 +05:30
Rushabh Mehta
81af229466
[minor] google analytics id in docs and minor fixes to web forms
2016-12-09 17:29:36 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Nabin Hait
f89f17cdde
Merge branch 'master' into develop
2016-11-23 16:00:22 +05:30
Nabin Hait
297d74a997
Unlink payment entries on cancellation of invoice
2016-11-23 15:59:00 +05:30
Nabin Hait
46753de6d7
fixed merge conflict
2016-11-17 15:55:11 +05:30
Saurabh
1d210968de
[fix] on advance payment entry cancellation delink invoice and pyament entry references
2016-11-17 15:21:46 +05:30
Saurabh
8adbfa8a09
[test-case] test cases for delinking advance payments
2016-11-16 13:43:01 +05:30
Saurabh
866c295989
[fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice
2016-11-16 13:43:01 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rushabh Mehta
24f658d633
[fix] [minor] accounts receivable not translated ( #6943 )
2016-11-16 11:13:46 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Nabin Hait
256a3fef95
Fixed multiple minor issues
2016-11-14 11:10:50 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Serpent Consulting Services Pvt Ltd
8b231f7256
Pythonic corrections
2016-10-18 17:30:24 +05:30
Rushabh Mehta
769dda0874
[translation] [fixes] #5860
2016-09-15 15:17:04 +05:30
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Saurabh
bce02c4364
set addr_list and contact_list attr #5635
2016-07-04 18:28:20 +05:30
Kanchan Chauhan
1605ff02c6
[WIP] Address view fixed
2016-07-04 15:41:07 +05:30
Saurabh
b6d6b8420d
[fix] add filters and child doc name in previous link mapper
2016-06-27 14:48:26 +05:30
Saurabh
8f24ecb173
[fix] set previous doc links for document flow
2016-06-27 12:28:55 +05:30
Anand Doshi
f576f3b17b
implemented get_site_info for erpnext and patch to move setup complete to system settings
2016-06-25 19:52:26 +05:30
Rushabh Mehta
bd9680f82e
[added] web-forms
2016-06-24 16:41:33 +05:30
RobertSchouten
f28a5da952
[fix] show company in list view
...
allows address and contact to only contain company not customer or supplier or sales partner
2016-06-07 17:03:41 +08:00
Nabin Hait
4eaeda710d
Tax Rule based on County
2016-06-01 12:54:26 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Rushabh Mehta
621283c5c5
[enhancement] stock balance page
2016-04-21 19:00:34 +05:30
Rushabh Mehta
c65726bf07
[patch] hide new icons if equivalent old ones are set
2016-04-15 12:51:28 +05:30
Rushabh Mehta
6fe962e6ad
[test] fixed circular dependencies
2016-04-08 17:55:11 +05:30
Rushabh Mehta
bdefa2414f
[test] [fix] test-dependency
2016-04-08 17:40:06 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
2016-04-04 16:57:56 +05:30
Rushabh Mehta
b04409746e
[fix] tests
2016-03-31 16:55:21 +05:30
Rushabh Mehta
2d985e1973
[fix] edit-profile in frappe;
2016-03-30 17:15:33 +05:30
Rushabh Mehta
7a1b5da830
[cleanup] request for quotation cleanup
2016-03-29 16:04:43 +05:30
Rushabh Mehta
3117b4b8d6
[fix] minor for quick-entry
2016-03-29 11:53:17 +05:30
Rushabh Mehta
fe027b34a9
[bot] first bot
2016-03-28 13:21:48 +05:30
Rushabh Mehta
813b9efe28
[fix] [minor] address.py
2016-03-17 15:36:30 +05:30
Nabin Hait
6221117069
[fix] shipping address position in document
2016-03-16 16:23:30 +05:30
Nabin Hait
cd6c09fbee
[fix] shipping address in purchasee cycle
2016-03-16 16:23:30 +05:30
Saurabh
14d646f636
[fixes] shipping address on purchase flow
2016-03-16 16:23:30 +05:30
shreyas
26bb6f37bc
[Partial] Fix to add Shipping address in Purchase order
2016-03-16 16:23:29 +05:30
shreyas
77d23824df
[Partial]Some more changes to enable shipping address to be displayed in PO
2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82
[Partial] Fix to add Shipping address in Purchase order
2016-03-16 16:23:29 +05:30
Anand Doshi
acd1bcffde
[fix] changed field type to Code
2016-02-24 12:38:08 +05:30
Rushabh Mehta
a064e3a200
[minor] validate address template before saving
2016-02-08 14:51:14 +05:30
Anand Doshi
cc24d28ddc
[fix] address creation for new user
2015-12-08 12:34:13 +05:30
Rushabh Mehta
ba2596a7e0
[minor] validate email id before inviting user
2015-12-03 10:35:11 +05:30
Rushabh Mehta
afacc3d779
[minor] catch illegal reference, via error report
2015-12-01 15:53:07 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
Rushabh Mehta
33ebaf479d
[feature] rename via console merge with frappe/frappe#1349
2015-10-21 12:26:37 +05:30
Anand Doshi
17dc249841
[fix] rollback if exception in bulk rename
2015-10-20 12:11:26 +05:30
Anand Doshi
12af47918d
[fix] rename tool
2015-10-20 12:02:39 +05:30
Anand Doshi
1d093a4039
[fix] change attach fields to small text
2015-10-19 12:56:29 +05:30
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Rushabh Mehta
73e73795f1
[minor] Added 'Invite User' in Contact
2015-10-14 16:20:39 +05:30