summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMqdd <ahmadmiqdad27@gmail.com>2026-01-29 14:39:51 +0700
committerMqdd <ahmadmiqdad27@gmail.com>2026-01-29 14:39:51 +0700
commitd7ac6d38a2ed648eca863fc168a7cff9290d597e (patch)
tree23c227dba9381cf6a701de8051b32ac0d3716c6a
parentb5a327c9ded0655613af30ad032b22c338b16fb3 (diff)
parent45f6be90d1e5f620df1480eb8eefc24dfd552c43 (diff)
Merge branch 'main' of bitbucket.org:altafixco/fixco-addons
merge
-rw-r--r--fixco_custom/models/reordering_rule.py6
-rw-r--r--fixco_custom/views/upload_payments.xml1
2 files changed, 4 insertions, 3 deletions
diff --git a/fixco_custom/models/reordering_rule.py b/fixco_custom/models/reordering_rule.py
index 9f37da6..49a5fab 100644
--- a/fixco_custom/models/reordering_rule.py
+++ b/fixco_custom/models/reordering_rule.py
@@ -107,13 +107,13 @@ class ReorderingRule(models.Model):
WHEN (
COALESCE(SUM(sq.quantity), 0.0)
+ vmsbm.incoming_qty - vmsbm.outgoing_qty
- ) < vmsbm.min_stock
+ ) <= vmsbm.min_stock
THEN 'BUY'
WHEN (
COALESCE(SUM(sq.quantity), 0.0)
+ vmsbm.incoming_qty - vmsbm.outgoing_qty
- ) > vmsbm.min_stock
+ ) >= vmsbm.min_stock
THEN 'HOLD'
WHEN (
@@ -121,7 +121,7 @@ class ReorderingRule(models.Model):
+ vmsbm.incoming_qty - vmsbm.outgoing_qty
) > vmsbm.buffer_stock
THEN 'READY STOCK'
-
+
ELSE 'READY STOCK'
END AS stock_status
diff --git a/fixco_custom/views/upload_payments.xml b/fixco_custom/views/upload_payments.xml
index 1a25960..fbb7aa5 100644
--- a/fixco_custom/views/upload_payments.xml
+++ b/fixco_custom/views/upload_payments.xml
@@ -9,6 +9,7 @@
<field name="number"/>
<field name="date_upload"/>
<field name="user_id"/>
+ <field name="state"/>
</tree>
</field>
</record>