diff options
| author | Priyanka Kakadiya <pka@odoo.com> | 2019-02-06 12:48:13 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-02-06 12:58:58 +0000 |
| commit | 152af348f3ee7f320dec23eac98fd3903a56eb97 (patch) | |
| tree | db4bb468cc83f96e9cc7c7b73f1187e9f9efb423 | |
| parent | b6839a969d7fd6924c5f373977a961f65dd42ac1 (diff) | |
[IMP] sale: Improve tour + Move icon to sale_management
- Move application icon to sale_management
- Improve tour
Task: 1920454
| -rw-r--r-- | addons/sale/static/description/icon.png | bin | 9214 -> 0 bytes | |||
| -rw-r--r-- | addons/sale/static/description/icon.svg | 1 | ||||
| -rw-r--r-- | addons/sale/static/src/js/tour.js | 16 | ||||
| -rw-r--r-- | addons/sale/views/sale_views.xml | 2 | ||||
| -rw-r--r-- | addons/sale_management/static/description/icon.png | bin | 9260 -> 9214 bytes | |||
| -rw-r--r-- | addons/sale_management/static/description/icon.svg | 2 |
6 files changed, 8 insertions, 13 deletions
diff --git a/addons/sale/static/description/icon.png b/addons/sale/static/description/icon.png Binary files differdeleted file mode 100644 index 343c9f7e065..00000000000 --- a/addons/sale/static/description/icon.png +++ /dev/null diff --git a/addons/sale/static/description/icon.svg b/addons/sale/static/description/icon.svg deleted file mode 100644 index 97a19c021dc..00000000000 --- a/addons/sale/static/description/icon.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M56.243 52.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 23.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 41.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 37.664 55 20l-16 3.025z"/><path id="e" d="M56.243 50.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 21.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 39.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 35.664 55 18l-16 3.025z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M45.243 69H4c-2 0-4-.146-4-4.077V35.315L13 16h3v26.5l15-14.27.974.024L40 21.096l13 14.27-18 18.346h22L45.243 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file diff --git a/addons/sale/static/src/js/tour.js b/addons/sale/static/src/js/tour.js index 8b82c091cee..2e6639cf6d3 100644 --- a/addons/sale/static/src/js/tour.js +++ b/addons/sale/static/src/js/tour.js @@ -10,12 +10,12 @@ tour.register('sale_tour', { url: "/web", }, [tour.STEPS.SHOW_APPS_MENU_ITEM, { trigger: '.o_app[data-menu-xmlid="sale.sale_menu_root"]', - content: _t('Organize your sales activities with the <b>Sales Management app</b>.'), + content: _t('Open Sales app to send your first quotation in a few clicks.'), position: 'right', edition: 'community' }, { trigger: '.o_app[data-menu-xmlid="sale.sale_menu_root"]', - content: _t('Organize your sales activities with the <b>Sales Management app</b>.'), + content: _t('Open Sales app to send your first quotation in a few clicks.'), position: 'bottom', edition: 'enterprise' }, { @@ -24,13 +24,11 @@ tour.register('sale_tour', { content: _t("Let's create a new quotation.<br/><i>Note that colored buttons usually point to the next logical actions.</i>"), position: "bottom", }, { - trigger: ".o_form_editable .o_field_many2one[name='partner_id']", + trigger: ".o_form_editable .o_field_many2one[name='partner_id'] input", extra_trigger: ".o_sale_order", content: _t("Write the name of your customer to create one on the fly, or select an existing one."), position: "bottom", - run: function (actions) { - actions.text("Agrolait", this.$anchor.find("input")); - }, + run: 'text Agrolait' }, { trigger: ".ui-menu-item > a", auto: true, @@ -41,13 +39,11 @@ tour.register('sale_tour', { content: _t("Click here to add some products or services to your quotation."), position: "bottom", }, { - trigger: ".o_form_editable .o_field_many2one[name='product_id']", + trigger: ".o_form_editable .o_field_many2one[name='product_id'] input", extra_trigger: ".o_sale_order", content: _t("Select a product, or create a new one on the fly."), position: "right", - run: function (actions) { - actions.text("Chair", this.$anchor.find("input")); - }, + run: 'text DESK0001' }, { trigger: ".ui-menu-item > a", auto: true, diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 3abaf475dcc..47a44c89547 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -4,7 +4,7 @@ <!-- Top menu item --> <menuitem id="sale_menu_root" name="Sales" - web_icon="sale,static/description/icon.png" + web_icon="sale_management,static/description/icon.png" active="False" sequence="7"/> diff --git a/addons/sale_management/static/description/icon.png b/addons/sale_management/static/description/icon.png Binary files differindex 87fbb5a7784..343c9f7e065 100644 --- a/addons/sale_management/static/description/icon.png +++ b/addons/sale_management/static/description/icon.png diff --git a/addons/sale_management/static/description/icon.svg b/addons/sale_management/static/description/icon.svg index 3531f448e49..97a19c021dc 100644 --- a/addons/sale_management/static/description/icon.svg +++ b/addons/sale_management/static/description/icon.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient><path id="d" d="M56.79 41.23l-2.056-1.873V21.762a2 2 0 0 0-2-2H17.649a2 2 0 0 0-2 2V51.24a2 2 0 0 0 2 2h26.632l2.541 1.762h-31.23a2 2 0 0 1-2-2V20a2 2 0 0 1 2-2h39.199a2 2 0 0 1 2 2v21.23zM34.44 29.125L47 26.75l-1.57 13.866-3.94-4.028-7.502 8.524a.757.757 0 0 1-1.168 0l-3.814-4.332-5.64 6.409c-.323.374-.852.367-1.175-.008l-1.958-2.295c-.316-.367-.31-.96.014-1.32l8.175-9.195a.75.75 0 0 1 1.162 0l3.82 4.34 4.946-5.69-3.91-3.896zM58.724 49.47l1.179.68a.333.333 0 0 1 .15.388 6.851 6.851 0 0 1-1.512 2.617.332.332 0 0 1-.41.062l-1.179-.68a5.3 5.3 0 0 1-1.681.972v1.36c0 .156-.108.29-.26.325a6.916 6.916 0 0 1-3.022 0 .333.333 0 0 1-.26-.324V53.51a5.3 5.3 0 0 1-1.681-.972l-1.178.68a.332.332 0 0 1-.41-.062 6.852 6.852 0 0 1-1.514-2.617.333.333 0 0 1 .151-.387l1.18-.68a5.353 5.353 0 0 1 0-1.943l-1.18-.68a.333.333 0 0 1-.15-.388 6.851 6.851 0 0 1 1.512-2.617.332.332 0 0 1 .41-.062l1.179.68a5.3 5.3 0 0 1 1.681-.972v-1.36c0-.156.108-.29.26-.325a6.916 6.916 0 0 1 3.022 0c.152.034.26.169.26.324v1.361a5.3 5.3 0 0 1 1.681.972l1.178-.68a.332.332 0 0 1 .41.062 6.852 6.852 0 0 1 1.514 2.617.333.333 0 0 1-.151.387l-1.18.68c.12.643.12 1.301 0 1.943zm-3.01-.971c0-1.22-.993-2.214-2.214-2.214-1.22 0-2.214.993-2.214 2.214 0 1.22.993 2.214 2.214 2.214 1.22 0 2.214-.993 2.214-2.214z"/><path id="e" d="M56.79 39.23l-2.056-1.873V19.762a2 2 0 0 0-2-2H17.649a2 2 0 0 0-2 2V49.24a2 2 0 0 0 2 2h26.632l2.541 1.762h-31.23a2 2 0 0 1-2-2V18a2 2 0 0 1 2-2h39.199a2 2 0 0 1 2 2v21.23zM34.44 27.125L47 24.75l-1.57 13.866-3.94-4.028-7.502 8.524a.757.757 0 0 1-1.168 0l-3.814-4.332-5.64 6.409c-.323.374-.852.367-1.175-.008l-1.958-2.295c-.316-.367-.31-.96.014-1.32l8.175-9.195a.75.75 0 0 1 1.162 0l3.82 4.34 4.946-5.69-3.91-3.896zM58.724 47.47l1.179.68a.333.333 0 0 1 .15.388 6.851 6.851 0 0 1-1.512 2.617.332.332 0 0 1-.41.062l-1.179-.68a5.3 5.3 0 0 1-1.681.972v1.36c0 .156-.108.29-.26.325a6.916 6.916 0 0 1-3.022 0 .333.333 0 0 1-.26-.324V51.51a5.3 5.3 0 0 1-1.681-.972l-1.178.68a.332.332 0 0 1-.41-.062 6.852 6.852 0 0 1-1.514-2.617.333.333 0 0 1 .151-.387l1.18-.68a5.353 5.353 0 0 1 0-1.943l-1.18-.68a.333.333 0 0 1-.15-.388 6.851 6.851 0 0 1 1.512-2.617.332.332 0 0 1 .41-.062l1.179.68a5.3 5.3 0 0 1 1.681-.972v-1.36c0-.156.108-.29.26-.325a6.916 6.916 0 0 1 3.022 0c.152.034.26.169.26.324v1.361a5.3 5.3 0 0 1 1.681.972l1.178-.68a.332.332 0 0 1 .41.062 6.852 6.852 0 0 1 1.514 2.617.333.333 0 0 1-.151.387l-1.18.68c.12.643.12 1.301 0 1.943zm-3.01-.971c0-1.22-.993-2.214-2.214-2.214-1.22 0-2.214.993-2.214 2.214 0 1.22.993 2.214 2.214 2.214 1.22 0 2.214-.993 2.214-2.214z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-.146-4-4.077V35.315L15 16h41l.758 23.122-2.424 4.183L59 50.654 45.243 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M56.243 52.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 23.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 41.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 37.664 55 20l-16 3.025z"/><path id="e" d="M56.243 50.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 21.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 39.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 35.664 55 18l-16 3.025z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M45.243 69H4c-2 0-4-.146-4-4.077V35.315L13 16h3v26.5l15-14.27.974.024L40 21.096l13 14.27-18 18.346h22L45.243 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file |
