summaryrefslogtreecommitdiff
path: root/addons/purchase/views/purchase_views.xml
diff options
context:
space:
mode:
authormcm-odoo <mcm@odoo.com>2019-08-07 09:56:12 +0000
committermcm-odoo <mcm@odoo.com>2019-08-29 14:14:50 +0000
commit9bfab43d9266f8f778c7ddd30fa1c1ca2f3e8d8b (patch)
tree06b0597b1fb28883eccebff2988f11f865dd9d07 /addons/purchase/views/purchase_views.xml
parent1c34882478926e2923ec45523bc3e7c18067d5e3 (diff)
[IMP] payment,sale: clean Payment Method in onboarding
The modifications are applied in account, sale and website_sale - Changed description to "Choose your default customer payment method." - Removed the "Pay with" from labels in Modal - In sale: Renamed "Confirmation & Payment" to "Payment Method" task-2032586
Diffstat (limited to 'addons/purchase/views/purchase_views.xml')
-rw-r--r--addons/purchase/views/purchase_views.xml9
1 files changed, 2 insertions, 7 deletions
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 01fcf1f8d3f..8bf7e32695f 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -335,13 +335,8 @@
</group>
<group name="other_info">
<field name="user_id"/>
-<<<<<<< 94a25d7f9c38a94e3b203d227502c37c3283637b
- <field name="invoice_status"/>
- <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
-=======
<field name="invoice_status" attrs="{'invisible': [('state', 'in', ('draft', 'sent', 'to approve', 'cancel'))]}"/>
- <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}"/>
->>>>>>> [IMP] account: improve account views
+ <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
<field name="fiscal_position_id" options="{'no_create': True}" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}"/>
</group>
</group>
@@ -407,7 +402,7 @@
<separator/>
<filter name="not_invoiced" string="Waiting Bills" domain="[('invoice_status', '=', 'to invoice')]" help="Purchase orders that include lines not invoiced."/>
<filter name="invoiced" string="Bills Received" domain="[('invoice_status', '=', 'invoiced')]" help="Purchase orders that have been invoiced."/>
- <separator/>
+ <separator/>
<filter name="order_date" string="Order Date" date="date_order"/>
<separator/>
<filter invisible="1" string="Late Activities" name="activities_overdue"