summaryrefslogtreecommitdiff
path: root/indoteknik_custom/views/stock_picking.xml
diff options
context:
space:
mode:
authorIndoteknik . <it@fixcomart.co.id>2025-07-26 11:58:32 +0700
committerIndoteknik . <it@fixcomart.co.id>2025-07-26 11:58:32 +0700
commite09e59db22d65fa144c2a43cd8f6959fada49484 (patch)
tree0567b1a8f0c8c57efb2d0d38ae489da26a55c245 /indoteknik_custom/views/stock_picking.xml
parentfff5507cf7c0f360a5c68068e77fa84b1d6340c5 (diff)
parent77e76f376b78733cad58aa196e3ead3c6a04ff42 (diff)
(andri) fix conflict
Diffstat (limited to 'indoteknik_custom/views/stock_picking.xml')
-rw-r--r--indoteknik_custom/views/stock_picking.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 5e33e4c7..f9200dfa 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -50,11 +50,11 @@
type="object"
attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}"
/>
- <button name="ask_return_approval"
- string="Ask Return/Acc"
- type="object"
- attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"
- />
+<!-- <button name="ask_return_approval"-->
+<!-- string="Ask Return/Acc"-->
+<!-- type="object"-->
+<!-- attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"-->
+<!-- />-->
<button name="action_create_invoice_from_mr"
string="Create Bill"
type="object"