diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2018-01-07 19:28:03 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2018-01-07 19:28:03 +0100 |
| commit | b341b5ca73dafa94a305f8be82a5dd5d9ed3fe1e (patch) | |
| tree | 1fa61c811d5b5b8de6ee58a26fbb6e7e03399123 /addons/point_of_sale | |
| parent | 4ae5a3affa1d9ba61cec6e1a84e00db32ba26d39 (diff) | |
| parent | 564988f58db57209365767314e17df20a3c21422 (diff) | |
[IMP] Remove duplicate fields names
Diffstat (limited to 'addons/point_of_sale')
| -rw-r--r-- | addons/point_of_sale/models/pos_order.py | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/report/pos_order_report.py | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/views/pos_order_view.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index e7ce561d56f..d6af6b54a47 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -864,7 +864,7 @@ class PosOrderLine(models.Model): order_id = fields.Many2one('pos.order', string='Order Ref', ondelete='cascade') create_date = fields.Datetime(string='Creation Date', readonly=True) tax_ids = fields.Many2many('account.tax', string='Taxes', readonly=True) - tax_ids_after_fiscal_position = fields.Many2many('account.tax', compute='_get_tax_ids_after_fiscal_position', string='Taxes') + tax_ids_after_fiscal_position = fields.Many2many('account.tax', compute='_get_tax_ids_after_fiscal_position', string='Taxes to Apply') pack_lot_ids = fields.One2many('pos.pack.operation.lot', 'pos_order_line_id', string='Lot/serial Number') @api.model diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py index 67e3620ccb2..d4ad5a0bdf4 100644 --- a/addons/point_of_sale/report/pos_order_report.py +++ b/addons/point_of_sale/report/pos_order_report.py @@ -26,7 +26,7 @@ class PosOrderReport(models.Model): average_price = fields.Float(string='Average Price', readonly=True, group_operator="avg") location_id = fields.Many2one('stock.location', string='Location', readonly=True) company_id = fields.Many2one('res.company', string='Company', readonly=True) - nbr_lines = fields.Integer(string='# of Lines', readonly=True, oldname='nbr') + nbr_lines = fields.Integer(string='Sale Line Count', readonly=True, oldname='nbr') product_qty = fields.Integer(string='Product Quantity', readonly=True) journal_id = fields.Many2one('account.journal', string='Journal') delay_validation = fields.Integer(string='Delay Validation') diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml index ae6bd51b754..c5c0fc1ddc6 100644 --- a/addons/point_of_sale/views/pos_order_view.xml +++ b/addons/point_of_sale/views/pos_order_view.xml @@ -37,7 +37,7 @@ <field name="qty"/> <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_after_fiscal_position" widget="many2many_tags" string="Taxes"/> <field name="tax_ids" widget="many2many_tags" invisible="1"/> <field name="price_subtotal" widget="monetary"/> <field name="price_subtotal_incl" widget="monetary"/> @@ -50,7 +50,7 @@ <field name="price_unit" widget="monetary"/> <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_after_fiscal_position" widget="many2many_tags" string="Taxes"/> <field name="tax_ids" widget="many2many_tags" invisible="1"/> <field name="notice"/> </group> |