diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-15 17:52:49 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-15 17:52:49 +0200 |
| commit | dc8b473a0332fa4b0e06a53a393abccc4b88c18a (patch) | |
| tree | aba5f20eed903ab54d1b162c4b980a2cddef9cee /addons | |
| parent | 625c0d5d8eb2c196ffcb04304a3ec7cfc48027ac (diff) | |
| parent | dd7b2556c6f9e1d87db3dc6b82c0815049cbf508 (diff) | |
[MERGE] forward port branch saas-11 up to dd7b2556c6f
Diffstat (limited to 'addons')
3 files changed, 12 insertions, 5 deletions
diff --git a/addons/l10n_fr_certification/models/account.py b/addons/l10n_fr_certification/models/account.py index 8d1a26d0ad6..ecb0f5aff8b 100644 --- a/addons/l10n_fr_certification/models/account.py +++ b/addons/l10n_fr_certification/models/account.py @@ -16,8 +16,8 @@ LINE_FIELDS = ['debit', 'credit', 'account_id', 'move_id', 'partner_id'] class AccountMove(models.Model): _inherit = "account.move" - l10n_fr_secure_sequence_number = fields.Integer(readonly=True) - l10n_fr_hash = fields.Char(readonly=True) + l10n_fr_secure_sequence_number = fields.Integer(readonly=True, copy=False) + l10n_fr_hash = fields.Char(readonly=True, copy=False) l10n_fr_string_to_hash = fields.Char(compute='_compute_string_to_hash', readonly=True, store=False) def _get_new_hash(self, secure_seq_number): diff --git a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/xdg/openbox/autostart b/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/xdg/openbox/autostart index e2b61e2f591..15908b4c5aa 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/xdg/openbox/autostart +++ b/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/xdg/openbox/autostart @@ -3,4 +3,11 @@ xset s off xset -dpms export HOME=/tmp -/usr/bin/firefox http://localhost:8069/point_of_sale/display & + +DISPLAY_URL='http://localhost:8069/point_of_sale/display' + +# wait until odoo is ready, otherwise you will have to plug a +# keyboard into the posbox just to refresh firefox +until wget -q "${DISPLAY_URL}" -O /dev/null ; do sleep 1 ; done + +/usr/bin/firefox "${DISPLAY_URL}" & diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml index 6a5b21a329b..2f4cdd42ce1 100644 --- a/addons/point_of_sale/views/pos_order_view.xml +++ b/addons/point_of_sale/views/pos_order_view.xml @@ -38,7 +38,7 @@ <field name="price_unit" widget="monetary"/> <field name="discount" widget="monetary"/> <field name="tax_ids_after_fiscal_position" widget="many2many_tags"/> - <field name="tax_ids" invisible="1"/> + <field name="tax_ids" widget="many2many_tags" invisible="1"/> <field name="price_subtotal" widget="monetary"/> <field name="price_subtotal_incl" widget="monetary"/> </tree> @@ -51,7 +51,7 @@ <field name="price_subtotal" invisible="1" widget="monetary"/> <field name="price_subtotal_incl" invisible="1" widget="monetary"/> <field name="tax_ids_after_fiscal_position" widget="many2many_tags"/> - <field name="tax_ids" invisible="1"/> + <field name="tax_ids" widget="many2many_tags" invisible="1"/> <field name="notice"/> </group> </form> |