skema bills and requisition

3 files changed, 51 insertions, 5 deletions

diff --git a/fixco_custom/views/account_move.xml b/fixco_custom/views/account_move.xml
index c77d046..1c55831 100644
--- a/fixco_custom/views/account_move.xml
+++ b/fixco_custom/views/account_move.xml
@@ -6,20 +6,66 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
-                <!-- <field name="ref" position="after">
-                    <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
-                </field> -->
+    
                 <field name="payment_reference" position="after">
                     <field name="invoice_marketplace" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
                     <field name="transaction_type" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
                 </field>
+    
                 <field name="partner_id" position="after">
                     <field name="address" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
                 </field>
+    
                 <field name="invoice_date" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
                     <field name="picking_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
                 </field>
+    
+                <!-- ✅ Add the new Many2many field after invoice_vendor_bill_id -->
+                <field name="invoice_vendor_bill_id" position="after">
+                    <field name="purchase_id" invisible="1"/>
+    
+                    <label for="purchase_vendor_bill_ids" string="Auto-Complete" class="oe_edit_only"
+                        attrs="{'invisible': ['|', ('state','!=','draft'), ('move_type', '!=', 'in_invoice')]}" />
+    
+                    <field name="purchase_vendor_bill_ids" nolabel="1"
+                        attrs="{'invisible': ['|', ('state','!=','draft'), ('move_type', '!=', 'in_invoice')]}"
+                        domain="partner_id and [('company_id', '=', company_id), ('partner_id.commercial_partner_id', '=', commercial_partner_id)] or [('company_id', '=', company_id)]"
+                        placeholder="Select purchase orders or past bills"
+                        context="{'show_total_amount': True}"
+                        options="{'no_create': True, 'no_open': True}"/>
+                </field>
+    
+                <!-- Purchase line_id on invoice line -->
+                <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='company_id']" position="after">
+                    <field name="purchase_line_id" invisible="1"/>
+                    <field name="purchase_order_id"
+                        attrs="{'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}"
+                        optional="hide"/>
+                </xpath>
+    
+                <xpath expr="//field[@name='line_ids']/tree/field[@name='company_id']" position="after">
+                    <field name="purchase_line_id" invisible="1"/>
+                </xpath>
+    
+            </field>
+        </record>
+
+        <record id="account_move_inherit_purchase_inherit" model="ir.ui.view">
+            <field name="name">Account Move</field>
+            <field name="model">account.move</field>
+            <field name="inherit_id" ref="purchase.view_move_form_inherit_purchase"/>
+            <field name="arch" type="xml">
+                <field name="purchase_line_id" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                    <attribute name="optional">hide</attribute>
+                    <attribute name="attrs">
+                        {'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}
+                    </attribute>
+                </field>
+                <field name="quantity" position="after">
+                    <field name="qty_outstanding" optional="hide"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/fixco_custom/views/purchase_order.xml b/fixco_custom/views/purchase_order.xml
index 1aa438c..de8c7bb 100644
--- a/fixco_custom/views/purchase_order.xml
+++ b/fixco_custom/views/purchase_order.xml
@@ -7,7 +7,9 @@
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
+                    <field name="sale_order_id" readonly="1"/>
                     <field name="biaya_lain_lain"/>
+                    <field name="source"/>
                 </field>
                 <field name="amount_untaxed" position="after">
                     <field name="amount_discount" class="oe_currency_line"/>
diff --git a/fixco_custom/views/requisition.xml b/fixco_custom/views/requisition.xml
index 957113a..3648401 100644
--- a/fixco_custom/views/requisition.xml
+++ b/fixco_custom/views/requisition.xml
@@ -19,7 +19,6 @@
         <field name="model">requisition.line</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="brand_id"/>
                 <field name="product_id"/>
                 <field name="partner_id"/>
                 <field name="qty_purchase"/>
@@ -94,7 +93,6 @@
                                         <field name="price_unit" required="1" />
                                         <field name="taxes_id" readonly="1" />
                                         <field name="subtotal" readonly="1" />
-                                        <field name="brand_id" />
                                     </tree>
                                 </field>
                             </page>