Merge pull request #5470 from expsa/feature/purchase-request-comprehensive-fixes-20251120-172303
Comprehensive UI/UX improvements for Purchase Request module
This commit is contained in:
Mohamed Eltayar
GitHub
commit
72397f5b61
|
|
@ -2397,7 +2397,7 @@ msgstr "عدد الرسائل غير المقروءة"
|
|||
#. module: purchase_requisition_custom
|
||||
#: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_request__use_analytic
|
||||
msgid "Use Analytic"
|
||||
msgstr "استخدام حساب تحليلى (بند موازنة) اخر"
|
||||
msgstr "حساب تحليلي آخر؟"
|
||||
|
||||
#. module: purchase_requisition_custom
|
||||
#: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_requisition__is_analytic
|
||||
|
|
@ -2991,6 +2991,16 @@ msgstr "المورد المقترح لهذا الطلب"
|
|||
msgid "Analytic account for budget tracking"
|
||||
msgstr "الحساب التحليلي لتتبع الموازنة"
|
||||
|
||||
#. module: purchase_requisition_custom
|
||||
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_form
|
||||
msgid "Other Details"
|
||||
msgstr "تفاصيل أخرى"
|
||||
|
||||
#. module: purchase_requisition_custom
|
||||
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_form
|
||||
msgid "Warehouse Management"
|
||||
msgstr "إدارة المستودعات"
|
||||
|
||||
#. module: purchase_requisition_custom
|
||||
#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_form
|
||||
msgid "Request Lines"
|
||||
|
|
|
|||
|
|
@ -83,20 +83,22 @@
|
|||
<field name="purchase_purpose" required="1"
|
||||
attrs="{'readonly':[('state' , '!=' , 'draft')]}"
|
||||
placeholder="Enter purchase request justifications..."/>
|
||||
</group>
|
||||
<group string="Vendor and Accounting">
|
||||
<field name="partner_id"
|
||||
domain="[('supplier_rank','>', 0)]"
|
||||
options="{'no_create' : True , 'no_edit' : True ,'no_open' : True}"
|
||||
attrs="{'readonly':['|',('edit_partner_id' , '=' , False),('state' , '!=' , 'waiting')]}"
|
||||
help="Suggested vendor for this purchase request"/>
|
||||
</group>
|
||||
<group string="Other Details">
|
||||
<field name="use_analytic"/>
|
||||
<field name="account_analytic_id"
|
||||
options="{'no_create' : True , 'no_edit' : True ,'no_open' : True}"
|
||||
attrs="{'invisible':[('use_analytic' , '=' , False)],'required':[('use_analytic' , '=' , True)],'readonly':[('state' , '!=' , 'draft')]}"
|
||||
help="Analytic account for budget tracking"/>
|
||||
</group>
|
||||
<field name="picking_type_id" invisible="1"/>
|
||||
<group string="Warehouse Management">
|
||||
<field name="picking_type_id"/>
|
||||
</group>
|
||||
<field name="purchase_create" invisible="1"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="edit_partner_id" invisible="1"/>
|
||||
|
|
@ -151,7 +153,8 @@
|
|||
<field name="state" string="State" widget="badge"
|
||||
decoration-muted="state == 'draft'"
|
||||
decoration-warning="state in ['direct_manager', 'wait_for_send']"
|
||||
decoration-info="state in ['waiting', 'warehouse', 'initial', 'employee']"
|
||||
decoration-info="state in ['waiting', 'warehouse', 'initial']"
|
||||
decoration-primary="state == 'employee'"
|
||||
decoration-success="state == 'done'"
|
||||
decoration-danger="state in ['cancel', 'refuse']"/>
|
||||
<field name="purchase_state_summary" optional="show" widget="badge" string="Purchase State"/>
|
||||
|
|
|
|||
|
|
@ -181,13 +181,13 @@
|
|||
<!-- attrs="{'invisible':['|',('requisition_id','=',False),'|','&',('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_select" groups="purchase_requisition_custom.committe_member"
|
||||
<button type="object" name="action_select" groups="purchase_requisition_custom.committe_member"
|
||||
attrs="{'invisible':['|', ('state','in',['done','purchase','waiting','cancel']),('can_committee_vote', '=', False)]}"
|
||||
string="Select"/>
|
||||
string="Select" class="btn-primary"/>
|
||||
|
||||
<button type="object" name="action_refuse" groups="purchase_requisition_custom.committe_member"
|
||||
attrs="{'invisible':['|',('state','in',['done','purchase','waiting','cancel']),('can_committee_vote', '=', False)]}"
|
||||
string="Refuse"/>
|
||||
string="Refuse" class="btn-danger"/>
|
||||
<button type="object" name="action_recommend"
|
||||
groups="purchase_requisition_custom.group_select_recommended_offer"
|
||||
confirm="Are you sure you want to process ?"
|
||||
|
|
@ -203,7 +203,8 @@
|
|||
attrs="{'invisible':[('hide_action_budget_button', '=', True)]}"/>
|
||||
<button name="action_skip_budget" type="object" string="Skip Budget"
|
||||
attrs="{'invisible':[('hide_action_budget_button', '=', True)]}"
|
||||
groups="purchase_requisition_custom.group_skip_purchase_budget"/>
|
||||
groups="purchase_requisition_custom.group_skip_purchase_budget"
|
||||
class="btn-warning"/>
|
||||
<!-- <button name="button_draft" states="cancel" string="Set to Draft" type="object"/>-->
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='button_approve']" position="replace">
|
||||
|
|
@ -392,7 +393,8 @@
|
|||
|
||||
<button name="action_skip_purchase_budget" type="object" string="Skip Budget"
|
||||
attrs="{'invisible':['|', ('state','!=', 'purchase_manager'),('is_purchase_budget','=',False)]}"
|
||||
groups="purchase_requisition_custom.group_skip_purchase_budget"/>
|
||||
groups="purchase_requisition_custom.group_skip_purchase_budget"
|
||||
class="btn-warning"/>
|
||||
|
||||
<button type="object" groups="purchase_requisition_custom.group_approve_purchase_requisition"
|
||||
name="action_approve" string="Approve" states="checked" class="btn-primary"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue