Skip to content

Commit

Permalink
fixup!
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdriaGForgeFlow
AdriaGForgeFlow committed Nov 4, 2019
1 parent 128d8d6 commit 48061db
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 15 deletions.
20 changes: 19 additions & 1 deletion stock_barcodes/static/src/js/basic_field.js → stock_barcodes/static/src/js/basic_fields.js
View file
Expand Up @@ -23,6 +23,24 @@ odoo.define('stock_barcodes.FieldFloatNumericMode', function (require) {
return $input_numeric;
},
});

var FieldBarcodeBooleanToggle = basic_fields.BooleanToggle.extend({
/*
This is needed because, whenever we click the checkbox to enter data manually, the checkbox will be
focused causing that when we scan the barcode afterwards, it will not perform the python on_barcode_scanned
function.
*/
_onClick: function (event) {
this._super.apply(this, arguments);
$(this.el).find("input").blur()
},
});

field_registry.add('FieldFloatNumericMode', FieldFloatNumericMode);
return FieldFloatNumericMode;
field_registry.add('barcode_boolean_toggle', FieldBarcodeBooleanToggle);

return {
FieldFloatNumericMode: FieldFloatNumericMode,
FieldBarcodeBooleanToggle: FieldBarcodeBooleanToggle,
}
});
6 changes: 3 additions & 3 deletions stock_barcodes/tests/test_stock_barcodes_picking.py
View file
Expand Up @@ -17,8 +17,8 @@ def setUp(self):
self.supplier_location = self.env.ref('stock.stock_location_suppliers')
self.customer_location = self.env.ref('stock.stock_location_customers')
self.stock_location = self.env.ref('stock.stock_location_stock')
self.categ_unit = self.env.ref('product.product_uom_categ_unit')
self.categ_kgm = self.env.ref('product.product_uom_categ_kgm')
self.categ_unit = self.env.ref('uom.product_uom_categ_unit')
self.categ_kgm = self.env.ref('uom.product_uom_categ_kgm')
self.picking_out_01 = self.env['stock.picking'].with_context(
planned_picking=True
).create({
Expand Down Expand Up @@ -94,7 +94,7 @@ def test_wiz_picking_values(self):
self.assertEqual(self.wiz_scan_picking.res_id,
self.picking_in_01.id)
self.assertEqual(self.wiz_scan_picking.display_name,
'Barcode reader - %s - Administrator' % (
'Barcode reader - %s - OdooBot' % (
self.picking_in_01.name))

def test_picking_wizard_scan_product(self):
Expand Down
2 changes: 1 addition & 1 deletion stock_barcodes/views/assets.xml
View file
Expand Up @@ -6,7 +6,7 @@
<script type="application/javascript"
src="/stock_barcodes/static/src/js/stock_barcodes.js"/>
<script type="application/javascript"
src="/stock_barcodes/static/src/js/basic_field.js"/>
src="/stock_barcodes/static/src/js/basic_fields.js"/>
<link rel="stylesheet" href="/stock_barcodes/static/src/css/stock.css"/>
</xpath>
</template>
Expand Down
10 changes: 6 additions & 4 deletions stock_barcodes/views/stock_picking_views.xml
View file
Expand Up @@ -25,10 +25,12 @@
<field name="inherit_id" ref="stock.stock_picking_type_kanban"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('o_kanban_card_content')]" position="after">
<div class="row text-center" t-if="['incoming', 'outgoing', 'internal'].indexOf(record.code.raw_value) > -1">
<button name="action_barcode_scan" type="object" class="btn btn-info">
<i class="fa fa-barcode fa-2x"/>
</button>
<div class="container o_kanban_card_content o_visible">
<div class="text-center" t-if="['incoming', 'outgoing', 'internal'].indexOf(record.code.raw_value) > -1">
<button name="action_barcode_scan" type="object" class="btn btn-info">
<i class="fa fa-barcode fa-2x"/>
</button>
</div>
</div>
</xpath>
</field>
Expand Down
4 changes: 2 additions & 2 deletions stock_barcodes/wizard/stock_barcodes_read_picking.py
View file
Expand Up @@ -266,13 +266,13 @@ class WizCandidatePicking(models.TransientModel):
wiz_picking_id = fields.Many2one(
comodel_name='stock.picking',
related='wiz_barcode_id.picking_id',
string='Picking',
string='Wizard Picking',
readonly=True,
)
name = fields.Char(
related='picking_id.name',
readonly=True,
string='Picking',
string='Candidate Picking',
)
partner_id = fields.Many2one(
comodel_name='res.partner',
Expand Down
2 changes: 1 addition & 1 deletion stock_barcodes/wizard/stock_barcodes_read_picking_views.xml
View file
Expand Up @@ -79,7 +79,7 @@
<label for="confirmed_moves">
Confirmed moves allowed
</label>
<field name="confirmed_moves" widget="boolean_toggle"/>
<field name="confirmed_moves" widget="barcode_boolean_toggle"/>
</xpath>
<field name="location_id" position="before">
<field name="picking_type_code" invisible="1" force_save="1"/>
Expand Down
6 changes: 3 additions & 3 deletions stock_barcodes/wizard/stock_barcodes_read_views.xml
View file
Expand Up @@ -27,7 +27,7 @@
<label for="manual_entry">
Manual entry data
</label>
<field name="manual_entry" widget="boolean_toggle"/>
<field name="manual_entry" widget="barcode_boolean_toggle"/>
</div>
<field name="message_type" invisible="1" />
<field name="barcode" invisible="1" force_save="1"/>
Expand Down Expand Up @@ -90,13 +90,13 @@
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card">
<div class="row">
<div class="col-xs-8">
<div class="col-8">
<strong>
<span><t t-esc="record.create_date.value"/></span>
<span><t t-esc="record.create_uid.value"/></span>
</strong>
</div>
<div class="col-xs-4">
<div class="col-4">
<strong>
<span class="pull-right text-right">
<t t-esc="record.product_qty.value"/>
Expand Down

0 comments on commit 48061db

Please sign in to comment.