diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2022-08-23 09:29:19 +0700 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2022-08-23 09:29:19 +0700 |
| commit | c369d67e08b50350705011e01b3f5ec78dcb7d11 (patch) | |
| tree | ff62225d7d409a2dc7c62f12a3be8944d4247649 /indoteknik_custom/views | |
| parent | 055e68b5c1c20795c569d67d6bf7363c90182470 (diff) | |
| parent | 2d82c8d8baf38be2349a87c9f8e9919c9e9de78a (diff) | |
Merge branch 'development' of bitbucket.org:altafixco/indoteknik-addons into development
# Conflicts:
# indoteknik_custom/models/__init__.py
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/account_asset_views.xml | 18 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_monitoring.xml | 4 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_monitoring_detail.xml | 4 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 8 |
4 files changed, 30 insertions, 4 deletions
diff --git a/indoteknik_custom/views/account_asset_views.xml b/indoteknik_custom/views/account_asset_views.xml new file mode 100644 index 00000000..90c53623 --- /dev/null +++ b/indoteknik_custom/views/account_asset_views.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<odoo> + <data> + <record id="account_asset_form_view_inherit" model="ir.ui.view"> + <field name="name">Account Asset</field> + <field name="model">account.asset.asset</field> + <field name="inherit_id" ref="base_accounting_kit.view_account_asset_asset_form"/> + <field name="arch" type="xml"> + <button name="set_to_draft" position="after"> + <button name="action_close_asset" + string="Close Asset" + type="object" + /> + </button> + </field> + </record> + </data> +</odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml index 15b55e2e..e4139677 100755 --- a/indoteknik_custom/views/sale_monitoring.xml +++ b/indoteknik_custom/views/sale_monitoring.xml @@ -7,6 +7,8 @@ <tree create="false"> <field name="date_order"/> <field name="sale_order_id"/> + <field name="partner_id"/> + <field name="user_id"/> <field name="qty_so"/> <field name="qty_po"/> <field name="qty_po_received"/> @@ -32,6 +34,8 @@ <group> <group> <field name="sale_order_id"/> + <field name="partner_id"/> + <field name="user_id"/> <field name="status" widget="badge" decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'" diff --git a/indoteknik_custom/views/sale_monitoring_detail.xml b/indoteknik_custom/views/sale_monitoring_detail.xml index 3a3ea787..9e4734d3 100755 --- a/indoteknik_custom/views/sale_monitoring_detail.xml +++ b/indoteknik_custom/views/sale_monitoring_detail.xml @@ -7,6 +7,8 @@ <tree create="false"> <field name="date_order"/> <field name="sale_order_id"/> + <field name="partner_id"/> + <field name="user_id"/> <field name="product_id"/> <field name="qty_so"/> <field name="qty_po"/> @@ -33,6 +35,8 @@ <group> <group> <field name="sale_order_id"/> + <field name="partner_id"/> + <field name="user_id"/> <field name="product_id"/> <field name="status" widget="badge" diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index e0b4ab4d..82058837 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -7,10 +7,10 @@ <field name="inherit_id" ref="sale.view_order_form"/> <field name="arch" type="xml"> <button id="action_confirm" position="after"> - <button name="sale_order_approve" - string="Ask Approval" - type="object" - /> +<!-- <button name="sale_order_approve"--> +<!-- string="Ask Approval"--> +<!-- type="object"--> +<!-- />--> </button> <field name="payment_term_id" position="after"> <field name="approval_status" /> |