diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-06-16 11:09:00 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-06-16 11:09:00 +0700 |
| commit | 2ef1e9e44ba6b8efa301dbe58c61352389aac55f (patch) | |
| tree | e78b44c739a9be23d6b845db99ea3c1311a4b52e | |
| parent | 777d925ec89357b0f5bd11faa8bfb5adfcd6b151 (diff) | |
| parent | ad2e6cc9d119e0b72ccdb353eb8a2e0fa304e359 (diff) | |
Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release
| -rwxr-xr-x | indoteknik_custom/models/sale_order.py | 4 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_monitoring.xml | 15 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_monitoring_detail.xml | 16 |
3 files changed, 33 insertions, 2 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index cbc6a60a..52b959db 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -336,8 +336,8 @@ class SaleOrder(models.Model): raise UserError("Invoice harus di Cancel dahulu") elif self.have_outstanding_picking: raise UserError("DO harus di Cancel dahulu") - elif self.have_outstanding_po: - raise UserError("PO harus di Cancel dahulu") + # elif self.have_outstanding_po: + # raise UserError("PO harus di Cancel dahulu") self.approval_status = False return super(SaleOrder, self).action_cancel() diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml index 956e4a24..0a9a5aa5 100755 --- a/indoteknik_custom/views/sale_monitoring.xml +++ b/indoteknik_custom/views/sale_monitoring.xml @@ -63,10 +63,25 @@ </field> </record> + <record id="view_monitoring_filter" model="ir.ui.view"> + <field name="name">sale.monitoring.list.select</field> + <field name="model">sale.monitoring</field> + <field name="priority" eval="15"/> + <field name="arch" type="xml"> + <search string="Search Monitoring"> + <field name="sale_order_id"/> + <field name="partner_id"/> + <field name="user_id"/> + <field name="status"/> + </search> + </field> + </record> + <record id="sale_monitoring_action" model="ir.actions.act_window"> <field name="name">Sale Monitoring</field> <field name="type">ir.actions.act_window</field> <field name="res_model">sale.monitoring</field> + <field name="search_view_id" ref="view_monitoring_filter"/> <field name="view_mode">tree,form</field> </record> diff --git a/indoteknik_custom/views/sale_monitoring_detail.xml b/indoteknik_custom/views/sale_monitoring_detail.xml index 736920b3..824e65e8 100755 --- a/indoteknik_custom/views/sale_monitoring_detail.xml +++ b/indoteknik_custom/views/sale_monitoring_detail.xml @@ -61,10 +61,26 @@ </field> </record> + <record id="view_monitoring_detail_filter" model="ir.ui.view"> + <field name="name">sale.monitoring.detail.list.select</field> + <field name="model">sale.monitoring.detail</field> + <field name="priority" eval="15"/> + <field name="arch" type="xml"> + <search string="Search Monitoring"> + <field name="sale_order_id"/> + <field name="partner_id"/> + <field name="user_id"/> + <field name="product_id"/> + <field name="status"/> + </search> + </field> + </record> + <record id="sale_monitoring_detail_action" model="ir.actions.act_window"> <field name="name">Sale Monitoring Detail</field> <field name="type">ir.actions.act_window</field> <field name="res_model">sale.monitoring.detail</field> + <field name="search_view_id" ref="view_monitoring_detail_filter"/> <field name="view_mode">tree,form</field> </record> |