diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-11-13 15:10:42 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-11-13 15:10:42 +0700 |
| commit | 769d986194421f04b1ac06309d9a8cb64bcc6144 (patch) | |
| tree | a1897e679f6408bb24c0dda8ab52dcb662216468 | |
| parent | 405da89e61fc9d1278d37fbd9793f5578992f1c1 (diff) | |
| parent | 770c6506de7ba5b1a3430695298f1001f6e9d48e (diff) | |
Merge branch 'production' of bitbucket.org:altafixco/indoteknik-addons into production
| -rw-r--r-- | indoteknik_custom/models/sales_order_fullfillment.py | 1 | ||||
| -rw-r--r-- | indoteknik_custom/models/user_company_request.py | 2 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 11 |
3 files changed, 8 insertions, 6 deletions
diff --git a/indoteknik_custom/models/sales_order_fullfillment.py b/indoteknik_custom/models/sales_order_fullfillment.py index 42544c15..05a0641c 100644 --- a/indoteknik_custom/models/sales_order_fullfillment.py +++ b/indoteknik_custom/models/sales_order_fullfillment.py @@ -21,6 +21,7 @@ class SalesOrderFullfillmentV2(models.Model): po_ids = fields.Many2many('purchase.order', string='Purchase Order', help='PO yang dibuat, bisa lebih dari satu') po_qty = fields.Float(string='PO Qty', help='Totalan dari semua PO Outstanding') received_qty = fields.Float(string='Received Qty', help='Totalan dari barang yang diterima dari PO tsb') + purchaser = fields.Char(string='Purchaser') class SalesOrderFullfillment(models.Model): diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py index 86e66934..dd9a35c1 100644 --- a/indoteknik_custom/models/user_company_request.py +++ b/indoteknik_custom/models/user_company_request.py @@ -74,7 +74,7 @@ class UserCompanyRequest(models.Model): if not self.is_approve and is_approve: if is_approve == 'approved': - self.user_id.parent_id = self.user_company_id.id + self.user_id.parent_id = vals.get('user_company_id') if vals.get('user_company_id') else self.user_company_id.id self.user_id.customer_type = self.user_company_id.customer_type self.user_id.npwp = self.user_company_id.npwp self.user_id.sppkp = self.user_company_id.sppkp diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 02531966..b8f2d08d 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -353,12 +353,13 @@ <field name="arch" type="xml"> <tree editable="top" create="false"> <field name="product_id" readonly="1"/> - <field name="so_qty" readonly="1" optional="hide"/> - <field name="reserved_stock_qty" readonly="1" optional="hide"/> + <field name="so_qty" readonly="1" optional="show"/> + <field name="reserved_stock_qty" readonly="1" optional="show"/> <field name="delivered_qty" readonly="1" optional="hide"/> - <field name="po_ids" widget="many2many_tags" readonly="1" optional="hide"/> - <field name="po_qty" readonly="1" optional="hide"/> - <field name="received_qty" readonly="1" optional="hide"/> + <field name="po_ids" widget="many2many_tags" readonly="1" optional="show"/> + <field name="po_qty" readonly="1" optional="show"/> + <field name="received_qty" readonly="1" optional="show"/> + <field name="purchaser" readonly="1" optional="hide"/> </tree> </field> </record> |