pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX & IMP] purchase: Remove weird domain in attrs & add purchase order on account move line.

Browse Source 
This commit removes "state = purchase" in account move attrs domain. The purchase state doesn't exist.
This commit adds a related field to purchase order in account move line.

Task ID: 2312024

closes odoo/odoo#55611

Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
This commit is contained in:
Florian Gilbert
2020-08-14 12:02:38 +00:00
parent 98b64be59f
commit 65bf6988f9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/models/account_invoice.py
+1
View File
@@ -131,6 +131,7 @@ class AccountMoveLine(models.Model):
_inherit = 'account.move.line'
purchase_line_id = fields.Many2one('purchase.order.line', 'Purchase Order Line', ondelete='set null', index=True)
purchase_order_id = fields.Many2one('purchase.order', 'Purchase Order', related='purchase_line_id.order_id', readonly=True)
def _copy_data_extend_business_fields(self, values):
# OVERRIDE to copy the 'purchase_line_id' field as well.
addons/purchase/views/account_move_views.xml
+3 -2
View File
@@ -10,9 +10,9 @@
<field name="invoice_vendor_bill_id" position="after">
<field name="purchase_id" invisible="1"/>
<label for="purchase_vendor_bill_id" string="Auto-Complete" class="oe_edit_only"
attrs="{'invisible': ['|', '|', ('state','not in',['draft']), ('state', '=', 'purchase'), ('move_type', '!=', 'in_invoice')]}" />
attrs="{'invisible': ['|', ('state','!=','draft'), ('move_type', '!=', 'in_invoice')]}" />
<field name="purchase_vendor_bill_id" nolabel="1"
attrs="{'invisible': ['|', '|', ('state','not in',['draft']), ('state', '=', 'purchase'), ('move_type', '!=', 'in_invoice')]}"
attrs="{'invisible': ['|', ('state','!=','draft'), ('move_type', '!=', 'in_invoice')]}"
class="oe_edit_only"
domain="[('company_id', '=', company_id), ('partner_id','child_of', [partner_id])]"
placeholder="Select a purchase order or an old bill"
@@ -28,6 +28,7 @@
<!-- Add link to purchase_line_id to account.move.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"/>