Merge pull request #19 from yvaucher/8.0-constraint-on-delivery-date

add constraint on delivery date to forbid asking goods before requisition
OCA · Nov 8, 2014 · 48915fe · 48915fe
2 parents 8a7f766 + 9ce2cfd
commit 48915fe
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 0 deletions.
diff --git a/logistic_budget/test/requisition_create_cost_estimate.yml b/logistic_budget/test/requisition_create_cost_estimate.yml
@@ -4,6 +4,7 @@
   !record {model: logistic.requisition, id: logistic_requisition_cost_estimate_01}:
     partner_id: base.res_partner_4
     consignee_id: base.res_partner_3
+    date: !eval "time.strftime('%Y-%m-%d')"
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
     incoterm_id: stock.incoterm_FCA

diff --git a/logistic_budget/tests/test_purchase_split_requisition.py b/logistic_budget/tests/test_purchase_split_requisition.py
@@ -73,6 +73,7 @@ def setUp(self):
         vals = {
             'partner_id': self.partner_4.id,
             'consignee_id': self.partner_3.id,
+            'date': time.strftime(D_FMT),
             'date_delivery': time.strftime(D_FMT),
             'user_id': self.user_demo.id,
             'pricelist_id': self.pricelist_sale.id,

diff --git a/logistic_requisition/model/logistic_requisition.py b/logistic_requisition/model/logistic_requisition.py
@@ -171,6 +171,9 @@ def get_partner_requisition(self):
         ('name_uniq',
          'unique(name)',
          'Logistics Requisition Reference must be unique!'),
+        ('check_date_delivery',
+         'check(date::date <= date_delivery)',
+         'Desired delivery date must be on or after Requisition date.'),
     ]
 
     @api.multi

diff --git a/logistic_requisition/test/line_assigned.yml b/logistic_requisition/test/line_assigned.yml
@@ -4,6 +4,7 @@
   !record {model: logistic.requisition, id: logistic_requisition_assign_01}:
     partner_id: base.res_partner_4
     consignee_id: base.res_partner_3
+    date: !eval "time.strftime('%Y-%m-%d')"
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
     pricelist_id: product.list0

diff --git a/logistic_requisition/test/logistic_requisition_report_test.yml b/logistic_requisition/test/logistic_requisition_report_test.yml
@@ -6,6 +6,7 @@
   !record {model: logistic.requisition, id: logistic_requisition_test_report}:
     partner_id: base.res_partner_4
     consignee_id: base.res_partner_3
+    date: !eval "time.strftime('%Y-%m-%d')"
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
     pricelist_id: product.list0

diff --git a/logistic_requisition/test/requisition_cancel_reason.yml b/logistic_requisition/test/requisition_cancel_reason.yml
@@ -10,6 +10,7 @@
   !record {model: logistic.requisition, id: logistic_requisition_cancel_01}:
     partner_id: base.res_partner_4
     consignee_id: base.res_partner_3
+    date: !eval "time.strftime('%Y-%m-%d')"
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
     pricelist_id: product.list0

diff --git a/logistic_requisition/test/requisition_create_cost_estimate.yml b/logistic_requisition/test/requisition_create_cost_estimate.yml
@@ -4,6 +4,7 @@
   !record {model: logistic.requisition, id: logistic_requisition_cost_estimate_01}:
     partner_id: base.res_partner_4
     consignee_id: base.res_partner_3
+    date: !eval "time.strftime('%Y-%m-%d')"
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
     incoterm_id: stock.incoterm_FCA

diff --git a/logistic_requisition/test/requisition_sourcing_with_tender.yml b/logistic_requisition/test/requisition_sourcing_with_tender.yml
@@ -4,6 +4,7 @@
   !record {model: logistic.requisition, id: logistic_requisition_tender_11}:
     partner_id: base.res_partner_4
     consignee_id: base.res_partner_3
+    date: !eval "time.strftime('%Y-%m-%d')"
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
     incoterm_id: stock.incoterm_FCA

diff --git a/logistic_requisition/tests/test_mto_workflow.py b/logistic_requisition/tests/test_mto_workflow.py
@@ -91,6 +91,7 @@ def setUp(self):
         self.vals = {
             'partner_id': self.partner_4.id,
             'consignee_id': self.partner_3.id,
+            'date': time.strftime(D_FMT),
             'date_delivery': time.strftime(D_FMT),
             'user_id': self.user_demo.id,
             'pricelist_id': self.pricelist_sale.id,

diff --git a/logistic_requisition/tests/test_multicurrency_update_po_line.py b/logistic_requisition/tests/test_multicurrency_update_po_line.py
@@ -58,6 +58,7 @@ def setUp(self):
         self.vals = {
             'partner_id': self.partner_4.id,
             'consignee_id': self.partner_3.id,
+            'date': time.strftime(D_FMT),
             'date_delivery': time.strftime(D_FMT),
             'user_id': self.user_demo.id,
             'currency_id': self.lr_currency_usd.id,

diff --git a/logistic_requisition/tests/test_purchase_split_requisition.py b/logistic_requisition/tests/test_purchase_split_requisition.py
@@ -72,6 +72,7 @@ def setUp(self):
         vals = {
             'partner_id': self.partner_4.id,
             'consignee_id': self.partner_3.id,
+            'date': time.strftime(D_FMT),
             'date_delivery': time.strftime(D_FMT),
             'user_id': self.user_demo.id,
             'pricelist_id': self.pricelist_sale.id,

diff --git a/logistic_requisition/tests/test_sale_order_from_lr_confirm.py b/logistic_requisition/tests/test_sale_order_from_lr_confirm.py
@@ -57,6 +57,7 @@ def setUp(self):
         self.vals = {
             'partner_id': self.partner_4.id,
             'consignee_id': self.partner_3.id,
+            'date': time.strftime(D_FMT),
             'date_delivery': time.strftime(D_FMT),
             'user_id': self.user_demo.id,
             'pricelist_id': self.pricelist_sale.id,