Rename field quantity_resulting to total_quantity
issue7871 review60431002
This commit is contained in:
1 parent
93f3022413
commit
9804855bc3
4 files changed
+10
-8
No files matched your search
@@ -1,3 +1,5 @@
|
||||
* Rename inventory count quantity_resulting to total_quantity
|
||||
|
||||
Version 5.0.0 - 2018-10-01
|
||||
* Bug fixes (see mercurial logs for details)
|
||||
* Add count wizard on inventory
|
||||
|
||||
+2
-2
@@ -615,7 +615,7 @@ class CountQuantity(ModelView):
|
||||
uom = fields.Many2One('product.uom', "UOM", readonly=True,
|
||||
help="The unit in which the quantities are specified.")
|
||||
quantity_resulting = fields.Float(
|
||||
"Resulting Quantity", digits=(16, Eval('unit_digits', 2)),
|
||||
"Total Quantity", digits=(16, Eval('unit_digits', 2)),
|
||||
readonly=True, depends=['unit_digits'],
|
||||
help="The total amount of the line counted so far.")
|
||||
|
||||
@@ -629,5 +629,5 @@ class CountQuantity(ModelView):
|
||||
@fields.depends('quantity_added', 'line')
|
||||
def on_change_quantity_added(self):
|
||||
if self.line:
|
||||
self.quantity_resulting = (
|
||||
self.total_quantity = (
|
||||
(self.line.quantity or 0) + (self.quantity_added or 0))
|
||||
@@ -84,13 +84,13 @@ Count inventory::
|
||||
>>> count.execute('quantity')
|
||||
>>> count.form.quantity_added
|
||||
1
|
||||
>>> count.form.quantity_resulting
|
||||
>>> count.form.total_quantity
|
||||
1
|
||||
>>> count.execute('add')
|
||||
|
||||
>>> count.form.search = product
|
||||
>>> count.execute('quantity')
|
||||
>>> count.form.quantity_resulting
|
||||
>>> count.form.total_quantity
|
||||
2.0
|
||||
>>> count.execute('add')
|
||||
|
||||
@@ -100,9 +100,9 @@ Count inventory::
|
||||
... inventory.id, product2.id)).save()
|
||||
>>> count.execute('quantity')
|
||||
>>> count.form.quantity_added
|
||||
>>> count.form.quantity_resulting
|
||||
>>> count.form.total_quantity
|
||||
>>> count.form.quantity_added = 10
|
||||
>>> count.form.quantity_resulting
|
||||
>>> count.form.total_quantity
|
||||
10.0
|
||||
>>> count.execute('add')
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<label name="product"/>
|
||||
<field name="product"/>
|
||||
<newline/>
|
||||
<label name="quantity_resulting"/>
|
||||
<field name="quantity_resulting"/>
|
||||
<label name="total_quantity"/>
|
||||
<field name="total_quantity"/>
|
||||
<label name="uom"/>
|
||||
<field name="uom"/>
|
||||
<label name="quantity_added"/>
|
||||
|
||||
Reference in new issue
Block a user