devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #765 from expsa/membership_task 

Membership task
This commit is contained in:
zainab2097 2024-08-15 17:10:07 +03:00 committed by GitHub
parent 5d3bf8a840 ccc0d761c4
commit 0b846465d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
odex25_sales/dev_membership/views/partner_extended.xml
View File

@ -186,21 +186,23 @@
</xpath>
<xpath expr="//field[@name='title']" position="replace"></xpath>
<xpath expr="//div/h1" position="replace">
<h1 class="o_addressformat">
<div class="o_address_row" style="display: flex; justify-content: flex-start; align-items: center;">
<!-- Title Field -->
<div attrs="{'invisible': [('company_type', '=', 'company')]}" style="flex: 0 0 auto; margin-right: 10px;">
<div attrs="{'invisible': [('company_type', '=', 'company')]}"
style="flex: 0 0 auto; margin-right: 10px;">
<field widget="selection" name="title" placeholder="Title"
options="{'no_quick_create': True}"
attrs="{'invisible': [('company_type', '=', 'company')]}"/>
</div>
<!-- Separator -->
<div attrs="{'invisible': [('company_type', '=', 'company')]}" style="flex: 0 0 auto; margin: 0 10px;">
/
</div>
<!-- Separator -->
<div attrs="{'invisible': [('company_type', '=', 'company')]}"
style="flex: 0 0 auto; margin: 0 10px;">
/
</div>
<!-- Name Field -->
<div style="flex: 0 0 auto;">
<field name="name" default_focus="1" placeholder="e.g. Lumber Inc"
@ -233,30 +235,30 @@
</xpath>
<xpath expr="//field[@name='function']" position="after">
</xpath>
<xpath expr="//field[@name='function']"position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='street']"position="attributes">
<xpath expr="//field[@name='function']" position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='street2']"position="attributes">
<xpath expr="//field[@name='street']" position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='city']"position="attributes">
<xpath expr="//field[@name='street2']" position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='state_id']"position="attributes">
<xpath expr="//field[@name='city']" position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='zip']"position="attributes">
<xpath expr="//field[@name='state_id']" position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='zip']" position="attributes">
<attribute name="attrs">{'required':[('is_member','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='vat']" position="attributes">
<attribute name="attrs">{'invisible':[('company_type','!=','company')]}</attribute>

10
odex25_sales/membership_card_odoo/report/membership_card_reports.xml
View File

@ -33,12 +33,12 @@
<!-- Header -->
<style>
@font-face {font-family: "Sakkal Majalla"; src:
url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot"); src:
url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot?#iefix")
url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot); src:
url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot?#iefix)
format("embedded-opentype"),
url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff2") format("woff2"),
url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff") format("woff"),
url("/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.ttf") format("truetype");
url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff2) format("woff2"),
url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff) format("woff"),
url(/membership_card_odoo/static/fonts/ce7b5754581057e6f7444e2192850cc8.ttf) format("truetype");
}
#font{
font-family: Sakkal Majalla;