diff options
| author | Frédéric van der Essen <fvdessen@gmail.com> | 2014-12-10 00:13:48 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fvdessen@gmail.com> | 2014-12-10 00:13:48 +0100 |
| commit | dc560a4dd0b6c109eede6b30c02ae4b34ca77c38 (patch) | |
| tree | 789ba27f8b598d5133bfe2dbb2f78c9143fb09ea /addons/web/static/src | |
| parent | b5164698f255633e68e6c3b75f30eae8492326dc (diff) | |
| parent | c15f748be05b3709f5e16680569abdc2949468e2 (diff) | |
Merge branch 'master-pos-wms-fva'
Big Point of Sale Update !
==========================
- Loyalty module for loyalty cards and loyalty rewards
- Restaurant module has floor plans, and floor plan editor
- Restaurant module has orderline notes ( Bloody / Well Cooked ... )
- Customers can be created from the point of sale
* You can take customers picture from Android / iOS
- In-progress orders are kept between crashes and restarts
- Barcode Nomenclatures support complex and custom barcode systems
* Shared configuration with the WMS.
* Product weight support in the WMS UI.
* Multiple barcodes for the same product via barcode aliases
* EAN-13 constraint removed, no more internal-code hacks.
- Cashier Login / Logout from the point of sale with pin codes
* a JS sudo() interface to help integrators customize the point
of sale security:
this.pos.sudo().then(function(){
... // only POS Managers can do this.
});
- QWeb receipt customisation for header and footers :
* You can now include barcodes & other complex info, without
new modules with the `<!DOCTYPE QWEB>` prefix in textareas :
<!DOCTYPE QWEB>
<div>
<t t-esc="Math.random() + 'foobar'" />
...
</div>
- Lots of fixes & Usability improvements from customer feedback.
- New demo data will come in a later commit.
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 6 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c573e5cb53a..dab5a783e40 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -8,6 +8,7 @@ font-weight: normal; font-style: normal; } + @font-face { font-family: "EntypoRegular"; src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); @@ -2025,6 +2026,10 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } +.openerp .oe_form .oe_form_field_image img { + max-width: 256px; + max-height: 256px; +} .openerp .oe_fileupload { display: inline-block; clear: both; @@ -2763,6 +2768,7 @@ top: 0px; } } + .kitten-mode-activated { background-size: cover; background-attachment: fixed; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eeea472a5b0..fa37c1c1617 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1693,6 +1693,9 @@ $sheet-padding: 16px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block + img + max-width: 256px + max-height: 256px .oe_fileupload display: inline-block clear: both |