diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/web/static/src/xml/base.xml | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2cce789480c..f37c282b01c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -40,7 +40,7 @@ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 class="modal-title"><t t-raw="title"/></h3> </div> - <div class="modal-body" style="overflow-y: auto;"> + <div class="modal-body"> </div> </div> </div> @@ -85,7 +85,7 @@ </div> </div> <p class="oe_grey" style="margin: 10px"> - Fill in this form to create an OpenERP database. You can + Fill in this form to create an Odoo database. You can create databases for different companies or for different goals (testing, production). Once the database is created, you will be able to install your first application. @@ -112,7 +112,7 @@ <td class="oe_form_group_cell"> <span class="oe_form_field oe_form_field_boolean oe_grey" > <input type="checkbox" name="demo_data" /> - Check this box to evaluate OpenERP. + Check this box to evaluate Odoo. </span> </td> </tr> @@ -372,7 +372,7 @@ <div class="oe_bottom"> <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br /> - OpenERP is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p> + Odoo is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p> <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p> <p>For more information visit <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo.com</a></p> </div> @@ -1053,14 +1053,15 @@ <t t-name="web.datepicker"> <span> <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/> - <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/> - <input type="text" - t-att-name="widget.name" - t-att-placeholder="placeholder" - class="oe_datepicker_master" - /><img class="oe_input_icon oe_datepicker_trigger" draggable="false" - t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"' - title="Select date" width="16" height="16" border="0"/> + <div class="oe_datepicker_main input-group"> + <input type="text" + t-att-name="widget.name" + t-att-placeholder="placeholder" + class="oe_datepicker_master" + /><span><img class="oe_input_icon oe_datepicker_trigger datepickerbutton" draggable="false" + t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"' + title="Select date" width="16" height="16" border="0"/></span> + </div> </span> </t> <t t-name="FieldDate"> @@ -1768,6 +1769,8 @@ <button class="oe_button" id="add_field">Add</button> <button class="oe_button" id="remove_field">Remove</button> <button class="oe_button" id="remove_all_field">Remove All</button> + <button class="oe_button" id="move_up">Move Up</button> + <button class="oe_button" id="move_down">Move Down</button> </td> <td class="oe_export_fields_selector_right"> <select name="fields_list" id="fields_list" |