From eca8e9e1dcb055081ac99b1c262c4f21cf0a7a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 19 Aug 2018 20:02:58 +0200 Subject: [PATCH] Use material design icons issue474 review60291002 --- configuration.xml | 3 +-- icons/tryton-sale.svg | 4 ++++ sale.py | 5 +++-- sale.xml | 7 ++++++- setup.py | 2 +- view/sale_form.xml | 14 ++++++-------- 6 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 icons/tryton-sale.svg diff --git a/configuration.xml b/configuration.xml index 0c165f65fb..5e80dbc9da 100644 --- a/configuration.xml +++ b/configuration.xml @@ -3,8 +3,7 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/icons/tryton-sale.svg b/icons/tryton-sale.svg new file mode 100644 index 0000000000..cecd62e71b --- /dev/null +++ b/icons/tryton-sale.svg @@ -0,0 +1,4 @@ + + + + diff --git a/sale.py b/sale.py index d01e77a7c8..2d55f42167 100644 --- a/sale.py +++ b/sale.py @@ -254,8 +254,9 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin): 'draft': { 'invisible': ~Eval('state').in_( ['cancel', 'quotation', 'confirmed']), - 'icon': If(Eval('state') == 'cancel', 'tryton-clear', - 'tryton-go-previous'), + 'icon': If(Eval('state') == 'cancel', + 'tryton-undo', + 'tryton-back'), 'depends': ['state'], }, 'quote': { diff --git a/sale.xml b/sale.xml index 9d14ada3f3..3838349a7d 100644 --- a/sale.xml +++ b/sale.xml @@ -27,7 +27,12 @@ this repository contains the full copyright notices and license terms. --> - + + tryton-sale + icons/tryton-sale.svg + + + diff --git a/setup.py b/setup.py index 0a0234e540..7b595dbc45 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ setup(name=name, package_data={ 'trytond.modules.sale': (info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt', - 'tests/*.rst']), + 'tests/*.rst', 'icons/*.svg']), }, classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/view/sale_form.xml b/view/sale_form.xml index d2b71898f9..2ee2506dee 100644 --- a/view/sale_form.xml +++ b/view/sale_form.xml @@ -46,15 +46,13 @@ this repository contains the full copyright notices and license terms. -->