Add issue5042.diff

stock - Add do button to stock move
This commit is contained in:
Raimon Esteve 2016-09-09 08:27:36 +02:00
parent a236615be0
commit 999a609fa2
2 changed files with 60 additions and 0 deletions

59
issue5042.diff Normal file
View File

@ -0,0 +1,59 @@
diff -r af6a1f8a401c move.py
--- a/trytond/trytond/modules/stock/move.py Thu Sep 08 15:52:00 2016 +0200
+++ b/trytond/trytond/modules/stock/move.py Thu Sep 08 15:55:56 2016 +0200
@@ -238,6 +238,9 @@
unit_price_required = fields.Function(
fields.Boolean('Unit Price Required'),
'on_change_with_unit_price_required')
+ assignation_required = fields.Function(
+ fields.Boolean('Assignation Required'),
+ 'on_change_with_assignation_required')
@classmethod
def __setup__(cls):
@@ -299,6 +302,9 @@
},
'do': {
'invisible': ~Eval('state').in_(['draft', 'assigned']),
+ 'readonly': (Eval('shipment')
+ | (Eval('assignation_required', True)
+ & (Eval('state') == 'draft'))),
},
})
@@ -461,6 +467,11 @@
return True
return False
+ @fields.depends('from_location')
+ def on_change_with_assignation_required(self, name=None):
+ if self.from_location:
+ return self.from_location.type == 'storage'
+
@staticmethod
def _get_shipment():
'Return list of Model names for shipment Reference'
diff -r af6a1f8a401c view/move_form.xml
--- a/trytond/trytond/modules/stock/view/move_form.xml Thu Sep 08 15:52:00 2016 +0200
+++ b/trytond/trytond/modules/stock/view/move_form.xml Thu Sep 08 15:55:56 2016 +0200
@@ -30,7 +30,9 @@
<group col="20" colspan="2" id="buttons">
<button name="cancel" string="Cancel" icon="tryton-cancel"/>
<button name="draft" string="Reset to Draft" icon="tryton-clear"/>
+ <button name="do" string="Do" icon="tryton-go-next"/>
</group>
<field name="unit_price_required" invisible="1" colspan="4"/>
<field name="unit_digits" invisible="1" colspan="4"/>
+ <field name="assignation_required" invisible="1" colspan="4"/>
</form>
diff -r af6a1f8a401c view/move_tree.xml
--- a/trytond/trytond/modules/stock/view/move_tree.xml Thu Sep 08 15:52:00 2016 +0200
+++ b/trytond/trytond/modules/stock/view/move_tree.xml Thu Sep 08 15:55:56 2016 +0200
@@ -13,5 +13,7 @@
<field name="state"/>
<button name="cancel" string="Cancel"/>
<button name="draft" string="Reset to Draft"/>
+ <button name="do" string="Do"/>
<field name="unit_digits" tree_invisible="1"/>
+ <field name="assignation_required" tree_invisible="1"/>
</tree>

1
series
View File

@ -58,3 +58,4 @@ party_check_vies.diff
#025476_5154_5155_5456_optimize_move_write_assign.diff
#do_not_lock_on_assign_try.diff
#limit_invoices_in_creit_note_action_by_domain.diff
issue5042.diff