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 #5476 from expsa/feature/final-button-fixes-and-colors-20251121-004728 

Final Comprehensive Button Styling Fixes with Logical Color Scheme
This commit is contained in:
Mohamed Eltayar 2025-11-21 00:51:11 +03:00 committed by GitHub
parent eb9fa22d64 d861659473
commit 25dd3a55fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 104 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
odex25_purchase/odex25_purchase_coc/views/views.xml
View File

@ -50,15 +50,15 @@
type="object"
string="Manager Approve"
states="manager"
class="oe_highlight"
class="btn-primary" icon="fa-check-circle"
groups="odex25_purchase_coc.group_purchase_coc_direct_manager"
/>
<button name="action_manager_reject"
<button name="action_manager_reject"
type="object"
string="Manager Reject"
states="manager"
class="oe_highlight"
class="btn-danger" icon="fa-times-circle"
groups="odex25_purchase_coc.group_purchase_coc_direct_manager"
/>

4
odex25_purchase/odex25_taqeem_purchase/views/direct_purchase.xml
View File

@ -32,7 +32,7 @@
<xpath expr="//button[@name='action_pc_confirm']" position="replace">
<button name="action_pc_confirm"
groups="governmental_purchase.executive_director_of_purchase_and_contract" type="object"
string="Approve" states="budget_approve" class="oe_highlight"/>
string="Approve" states="budget_approve" class="btn-primary" icon="fa-check-circle"/>
<button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse"
states="budget_approve" type="action"
groups="governmental_purchase.executive_director_of_purchase_and_contract" class="btn-danger" icon="fa-times-circle"/>
@ -45,7 +45,7 @@
</xpath>
<xpath expr="//button[@name='action_confirm']" position="replace">
<button name="action_confirm" groups="purchase_requisition_custom.group_direct_manger" type="object"
string="Submit" class="oe_highlight"
string="Submit" class="btn-primary" icon="fa-send"
attrs="{'invisible': ['|',('check_chief_executive','=',False),('state','!=', 'dm')]}"/>
</xpath>
<xpath expr="//page[@name='base_info_dep_use']" position="replace"/>

4
odex25_purchase/odex25_taqeem_purchase/views/purchase_less_thirty_view.xml
View File

@ -29,14 +29,14 @@
</xpath>
<xpath expr="//button[@name='action_confirm']" position="replace">
<button name="action_confirm" groups="purchase_requisition_custom.group_direct_manger" type="object"
string="Submit" class="oe_highlight"
string="Submit" class="btn-primary" icon="fa-send"
attrs="{'invisible': ['|',('check_chief_executive','=',False),('state','!=', 'dm')]}"/>
</xpath>
<xpath expr="//button[@name='action_pc_confirm']" position="replace">
<button name="action_pc_confirm"
groups="governmental_purchase.executive_director_of_purchase_and_contract" type="object"
string="Approve" states="budget_approve" class="oe_highlight"/>
string="Approve" states="budget_approve" class="btn-primary" icon="fa-check-circle"/>
<button name="%(purchase_requisition_custom.purchase_request_cancel_wizard_action)d" string="Refuse"

2
odex25_purchase/online_tendering/views/purchase_requsition_veiw.xml
View File

@ -61,7 +61,7 @@
</group>
<footer>
<div>
<button name="action_extend" string="Extend" type="object" default_focus="1" class="oe_highlight"/>
<button name="action_extend" string="Extend" type="object" default_focus="1" class="btn-primary" icon="fa-clock-o"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</div>

80
odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
View File

@ -3021,6 +3021,86 @@ msgstr "تم التسليم"
msgid "Create Asset Custody"
msgstr "إنشاء عهدة أصول"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Purchase State"
msgstr "حالة الشراء"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "State"
msgstr "الحالة"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Categories"
msgstr "الفئات"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Branch"
msgstr "الفرع"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Department"
msgstr "القسم"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Employee"
msgstr "الموظف"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Date"
msgstr "التاريخ"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_tree
msgid "Request Number"
msgstr "رقم الطلب"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
msgid "Approve Order"
msgstr "موافقة الطلب"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
msgid "PO To Contract"
msgstr "تحويل إلى عقد"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
msgid "Sign"
msgstr "توقيع"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
msgid "Choose All"
msgstr "اختيار الكل"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
msgid "Send To Committee"
msgstr "إرسال للجنة"
#. module: purchase_requisition_custom
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
msgid "Confirm Purchase"
msgstr "تأكيد الشراء"
#. module: odex25_purchase_coc
#: model_terms:ir.ui.view,arch_db:odex25_purchase_coc.purchase_coc_form_view
msgid "Manager Approve"
msgstr "موافقة المدير"
#. module: odex25_purchase_coc
#: model_terms:ir.ui.view,arch_db:odex25_purchase_coc.purchase_coc_form_view
msgid "Manager Reject"
msgstr "رفض المدير"
#. module: vendor_evaluation
#: model_terms:ir.ui.view,arch_db:vendor_evaluation.vendor_evaluation_wizard_view
msgid "Evaluate"

26
odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
View File

@ -171,15 +171,15 @@
<field name="requisition_state" invisible="1"/>
<field name="requisition_type_exclusive" invisible="1"/>
<!-- <button type="object" name="action_to_approve" class="oe_highlight" states="to approve" string="Approve"/>-->
<button type="object" name="action_sign" class="oe_highlight"
<button type="object" name="action_sign" class="btn-primary"
groups="purchase_requisition_custom.group_sign_purchase_order"
attrs="{'invisible':['|',('requisition_id','=',False),
'|', ('state','in',['sign','purchase','to approve','done',
'cancel','budget_rejected','wait_for_send','waiting']), ('is_signed', '=', True)]}"
string="Sign"/>
string="Sign" icon="fa-signature"/>
<!-- <button type="object" name="action_approve_po" string="Confirm Purchase" class="oe_highlight"-->
<!-- attrs="{'invisible':['|',('requisition_id','=',False),'|','&amp;',('requisition_type_exclusive', '!=','exclusive'),('is_purchase_budget','=',False),('state','not in',('to approve'))]}"/>-->
<button type="object" name="action_approve_po" string="Confirm Purchase" class="oe_highlight" invisible="1"/>
<button type="object" name="action_approve_po" string="Confirm Purchase" class="btn-primary" invisible="1" icon="fa-check-circle"/>
<button type="object" name="action_select" groups="purchase_requisition_custom.committe_member"
attrs="{'invisible':['|', ('state','in',['done','purchase','waiting','cancel']),('can_committee_vote', '=', False)]}"
@ -210,16 +210,17 @@
<xpath expr="//button[@name='button_approve']" position="replace">
<button name="button_approve" type="object"
attrs="{'invisible':['|',('requisition_id','!=',False),('state','not in',('to approve'))]}"
string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
string="Approve Order" class="btn-primary" groups="purchase.group_purchase_manager" icon="fa-check-circle"/>
</xpath>
<xpath expr="//button[@name='button_draft']" position="after">
<button string='PO To Contract' name="open_convert_po_contract" type="object"
class="oe_highlight" groups="purchase.group_purchase_manager"
class="btn-info" groups="purchase.group_purchase_manager" icon="fa-file-contract"
attrs="{'invisible':[('state','in',('draft','wait','wait_for_send','sent','to approve','sign','waiting','purchase','cancel'))]}"/>
</xpath>
<xpath expr="//button[@name='button_draft']" position="attributes">
<attribute name="class">oe_highlight</attribute>
<attribute name="class">btn-warning</attribute>
<attribute name="icon">fa-undo</attribute>
</xpath>
<xpath expr="//field[@name='date_order']" position="after">
<field name="type"/>
@ -234,7 +235,8 @@
<xpath expr="/form/header/button[@id='draft_confirm']" position="attributes">
<attribute name="groups">purchase.group_purchase_manager</attribute>
<attribute name="states">draft</attribute>
<attribute name="class">oe_highlight</attribute>
<attribute name="class">btn-primary</attribute>
<attribute name="icon">fa-check-circle</attribute>
</xpath>
<!-- ('is_purchase_budget', '=', False)-->
<xpath expr="/form/header/button[@id='bid_confirm']" position="attributes">
@ -311,9 +313,9 @@
<field name="purpose" attrs="{'readonly': [('state','in',['done','cancel'])]}"/>
</xpath>
<xpath expr="//field[@name='order_line']" position="before">
<button name="action_select_all" class="oe_highlight" type="object"
<button name="action_select_all" class="btn-info" type="object"
attrs="{'invisible':[('state','in',('done','cancel','waiting', 'sign','purchase'))]}"
string="Choose All"/>
string="Choose All" icon="fa-check-square"/>
</xpath>
<xpath expr="//field[@name='order_line']/tree//field[@name='name']" position="after">
@ -382,7 +384,7 @@
<button type="object" groups="purchase_requisition_custom.group_accept_purchase_requisition"
name="action_accept" string="Accept"
attrs="{'invisible':['|',('state','!=','in_progress'),('type','!=','project')]}"
class="oe_highlight"/>
class="btn-primary" icon="fa-check-circle"/>
<button type="object" groups="purchase_requisition_custom.group_quotation_purchase_requisition"
name="action_quotation" string="Quotation"
attrs="{'invisible':['&amp;','|',('state','!=','accept'),('type','!=','project'),'|',('state','not in',('in_progress', 'ongoing','rejected_by_committee')),('type','!=','operational')]}"
@ -404,9 +406,9 @@
<button type="object" groups="purchase_requisition_custom.purchase_requisition_third_approve"
name="third_approve" string="Approve" states="third_approve" class="btn-primary"/>
<button name="to_committee" class="oe_highlight"
<button name="to_committee" class="btn-info"
attrs="{'invisible' : ['|','|',('order_count','=', 0),('purchase_commitee','=',False),'&amp;',('purchase_commitee','=',True),('sent_to_commitee','=', True)]}"
type="object" string="Send To Committee"
type="object" string="Send To Committee" icon="fa-users"
groups="purchase_requisition_custom.purchase_rfq_send_to_committee"/>
<field name="sent_to_commitee" invisible="1"/>

2
odex25_purchase/purchase_requisition_custom/wizards/cancel_purchase_request.xml
View File

@ -10,7 +10,7 @@
<field name="user_id" invisible="1"/>
<field name="reason"/>
<footer>
<button string='Save' name="request_cancel_reason" type="object" class="oe_highlight"/>
<button string='Save' name="request_cancel_reason" type="object" class="btn-primary" icon="fa-save"/>
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>

2
odex25_purchase/purchase_requisition_custom/wizards/convert_to_contract.xml
View File

@ -21,7 +21,7 @@
</group>
<footer>
<button string='Save' name="action_create_contract" type="object" class="oe_highlight"/>
<button string='Save' name="action_create_contract" type="object" class="btn-primary" icon="fa-save"/>
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>