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

[MERGE] merged the usability branch

Browse Source 
bzr revid: qdp-launchpad@tinyerp.com-20101012170546-qrtnb10w1mkxontb
This commit is contained in:
qdp-launchpad@tinyerp.com
2010-10-12 19:05:46 +02:00
parent 4ac173c566 fc3b34ccc0
commit cd14eb5ed4
61 changed files with 198 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+1 -1
View File
@@ -209,8 +209,8 @@
<field name="state"/>
<field name="residual"/>
<group col="6" colspan="4">
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
addons/account/account_view.xml
+7 -7
View File
@@ -482,8 +482,8 @@
<field name="balance_end_real"/>
<field name="balance_end" invisible="1"/>
<field name="state"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
</tree>
</field>
</record>
@@ -564,9 +564,9 @@
<group col="8" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -596,9 +596,9 @@
<group col="8" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -1334,8 +1334,8 @@
<field name="narration" colspan="4" nolabel="1" height="50"/>
<group col="4" colspan="4">
<field name="state" select="1"/>
<button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
</group>
</page>
</notebook>
@@ -1481,9 +1481,9 @@
<group col="7" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -2466,9 +2466,9 @@
<field name="balance_end_real"/>
<field name="balance_end"/>
<field name="state"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
<button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
</tree>
</field>
</record>
@@ -2570,9 +2570,9 @@
</group>
<group col="8" colspan="4">
<field name="state" colspan="4"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
<button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
<button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
</group>
</form>
</field>
addons/account/wizard/account_invoice_state_view.xml
+1 -1
View File
@@ -33,8 +33,8 @@
<form string="Cancel Selected Invoices">
<separator string="Cancel Selected Invoices" colspan="4"/>
<group colspan="4" col="6">
<button icon="terp-dialog-close" special="cancel" string="Close"/>
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
<button icon="terp-dialog-close" special="cancel" string="Close"/>
</group>
</form>
</field>
addons/account_budget/account_budget_view.xml
+1 -1
View File
@@ -147,10 +147,10 @@
</field>
<field name="state" select="1"/>
<group col="4" colspan="2">
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
<button string="Done" name="done" states="validate" type="workflow" icon="gtk-jump-to" />
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
<button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
</group>
addons/account_voucher/account_voucher_view.xml
+1 -1
View File
@@ -77,9 +77,9 @@
<group col="10" colspan="4">
<field name="state"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
<button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
</group>
</form>
</field>
addons/auction/auction_view.xml
+1 -1
View File
@@ -123,7 +123,7 @@
</group>
<separator string="" colspan="4"/>
<field name="state"/>
<button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="gtk-yes"/>
<button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="terp-gtk-go-back-rtl"/>
</page>
<page string="Accounting" >
<group colspan="4" col="4">
addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<group colspan="4" col="6">
<label string=" " colspan="2"/>
<button icon="gtk-close" special="cancel" string="Close"/>
<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
<button icon="terp-gtk-go-back-rtl" string="Create invoices" name="makeInvoices" type="object"/>
</group>
</form>
</field>
addons/auction/wizard/auction_lots_make_invoice_view.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<group colspan="2" col="2"/>
<group colspan="2" col="2">
<button icon="gtk-close" special="cancel" string="Close"/>
<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
<button icon="terp-gtk-go-back-rtl" string="Create invoices" name="makeInvoices" type="object"/>
</group>
</form>
</field>
addons/base_calendar/base_calendar_view.xml
+6 -6
View File
@@ -313,6 +313,11 @@
<separator colspan="4" string="" />
<group col="5" colspan="4">
<field name="state" select="2" />
<button name="do_cancel"
string="Cancel"
states="tentative,confirmed"
type="object"
icon="gtk-cancel" />
<button name="do_tentative"
states="confirmed,cancelled"
string="Uncertain"
@@ -323,11 +328,6 @@
states="tentative,cancelled"
type="object"
icon="gtk-apply" />
<button name="do_cancel"
string="Cancel"
states="tentative,confirmed"
type="object"
icon="gtk-cancel" />
</group>
</page>
<page string="Invitation Detail">
@@ -475,7 +475,7 @@
<separator orientation="vertical" />
<filter string="Date" icon="terp-go-month"
domain="[]" context="{'group_by':'date'}" />
</group>
</search>
</field>
addons/crm/crm_meeting_view.xml
+4 -4
View File
@@ -36,7 +36,7 @@
<field name="date" string="Start Date" required="1"
on_change="onchange_dates(date,duration,False,allday)" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)" />
on_change="onchange_dates(date,duration,False,allday)" readonly="1" />
<field name="date_deadline" string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)" />
<field name="location" />
@@ -244,6 +244,9 @@
<field name="state" groups="base.group_extended"/>
<field name="user_id" invisible="1"/>
<field name="show_as" invisible="1" string="Show time as"/>
<button name="case_cancel" string="Cancel"
states="draft,open" type="object"
icon="gtk-cancel" />
<button name="case_reset" string="Reset to Unconfirmed"
states="open,done,cancel" type="object"
icon="gtk-convert" />
@@ -253,9 +256,6 @@
<button name="case_close" string="Done"
states="open" type="object"
icon="gtk-jump-to" />
<button name="case_cancel" string="Cancel"
states="draft,open" type="object"
icon="gtk-cancel" />
</tree>
</field>
</record>
addons/crm/crm_phonecall_view.xml
+4 -4
View File
@@ -40,10 +40,10 @@
states="draft,open,pending" icon="gtk-redo"
name="action_make_meeting" type="object" />
<field name="state"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
<button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
</tree>
</field>
</record>
@@ -105,6 +105,9 @@
<separator colspan="4" />
<group col="8" colspan="4">
<field name="state" select="1" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -116,9 +119,6 @@
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object"
icon="gtk-convert" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
</group>
</form>
</field>
addons/crm/res_partner_view.xml
+4 -4
View File
@@ -26,6 +26,9 @@
invisible="context.get('invisible_section', True)" />
<field name="user_id" />
<field name="state" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -39,9 +42,6 @@
<button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object"
icon="gtk-go-up" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
</tree>
</field>
<field name="meeting_ids" colspan="4" nolabel="1" >
@@ -59,10 +59,10 @@
<field name="categ_id"/>
<field name="user_id"/>
<field name="state"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
<button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
</tree>
</field>
</page>
addons/crm_claim/crm_claim_view.xml
+6 -6
View File
@@ -53,6 +53,9 @@
<field name="categ_id" string="Type" select="1"/>
<field name="stage_id" invisible="1"/>
<field name="state"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -62,9 +65,6 @@
<button name="case_close" string="Close"
states="open,draft,pending" type="object"
icon="gtk-close" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object" icon="gtk-convert" />
</tree>
@@ -130,6 +130,9 @@
<separator colspan="4" string=""/>
<group col="8" colspan="4">
<field name="state" select="1"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -139,9 +142,6 @@
<button name="case_close" string="Done"
states="open,draft,pending" type="object"
icon="gtk-jump-to" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_reset"
string="Reset to Draft" states="done,cancel"
type="object" icon="gtk-convert" />
addons/crm_fundraising/crm_fundraising_view.xml
+6 -6
View File
@@ -54,6 +54,9 @@
<field name="user_id" />
<field name="state" />
<field name="partner_id" invisible="1"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -66,9 +69,6 @@
<button name="case_close" string="Done"
states="open,draft,pending" type="object"
icon="gtk-close" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object" icon="gtk-convert" />
</tree>
@@ -115,6 +115,9 @@
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -128,9 +131,6 @@
<button name="case_close" string="Done"
states="open,draft,pending" type="object"
icon="gtk-close" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_reset"
string="Reset to Draft" states="done,cancel"
type="object" icon="gtk-convert" />
addons/crm_helpdesk/crm_helpdesk_view.xml
+6 -6
View File
@@ -69,6 +69,9 @@
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state" select="1"/>
<button name="case_cancel"
states="draft,open,pending" string="Cancel"
type="object" icon="gtk-cancel" />
<button name="case_open"
states="draft,pending" string="Open"
type="object" icon="gtk-go-forward" />
@@ -82,9 +85,6 @@
<button name="case_close"
states="open,draft,pending" string="Close"
type="object" icon="gtk-jump-to" />
<button name="case_cancel"
states="draft,open,pending" string="Cancel"
type="object" icon="gtk-cancel" />
<button name="case_reset"
states="done,cancel"
string="Reset to Draft" type="object"
@@ -187,6 +187,9 @@
<field name="section_id"/>
<field name="priority"/>
<field name="state"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -200,9 +203,6 @@
<button name="case_close" string="Done"
states="open,draft,pending" type="object"
icon="gtk-close" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object" icon="gtk-convert" />
</tree>
addons/crm_partner_assign/res_partner_view.xml
+3 -3
View File
@@ -100,6 +100,9 @@
invisible="context.get('invisible_section', True)" />
<field name="user_id" />
<field name="state" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
@@ -113,9 +116,6 @@
<button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object"
icon="gtk-go-up" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
</tree>
</field>
</page>
addons/hr/hr_data.xml
+5
View File
@@ -16,5 +16,10 @@
<field name="name">Widower</field>
</record>
<record id="employee" model="hr.employee">
<field name="name">Administrator</field>
<field name="user_id" ref="base.user_root"/>
</record>
</data>
</openerp>
addons/hr_expense/hr_expense_view.xml
+1 -1
View File
@@ -145,12 +145,12 @@
<field name="date" select='1'/>
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
<filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
</field>
<field name="name" select='1'/>
<field name="user_id" string="User" invisible="True">
<filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
string="Expenses of My Department"/>
</field>
</field>
</group>
<newline />
<group expand="0" string="Group By...">
addons/hr_holidays/hr_holidays_view.xml
+6 -6
View File
@@ -90,8 +90,8 @@
<newline/>
<field name="state" colspan="2"/>
<group colspan="2">
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
@@ -133,11 +133,11 @@
<newline/>
<field name="state" colspan="2"/>
<group colspan="2">
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
</group>
</page>
@@ -161,11 +161,11 @@
<field name="user_id" invisible="1"/>
<!--field name="type"/-->
<field name="state"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
</tree>
</field>
@@ -191,10 +191,10 @@
<newline/>
<field name="state" colspan="2"/>
<group colspan="2">
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
<button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
</group>
</page>
@@ -221,10 +221,10 @@
<field name="manager_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="state"/>
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
</tree>
</field>
@@ -248,10 +248,10 @@
<field name="user_id" invisible="1"/>
<!--field name="type"/-->
<field name="state"/>
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
</tree>
</field>
addons/hr_payroll/hr_payroll_view.xml
+1 -1
View File
@@ -985,11 +985,11 @@
</notebook>
<group col="8" colspan="4">
<field name="state"/>
<button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
<button string="Compute" name="compute_sheet" states="new" icon="terp-document-new" type="object"/>
<button string="Verify Sheet" icon="gtk-ok" name="verify_sheet" states="draft" type="object"/>
<button string="Complete HR Checking" icon="gtk-apply" name="final_verify_sheet" type="object" states="hr_check"/>
<button string="Pay Salary" icon="gtk-apply" name="process_sheet" states="confirm" type="object" />
<button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" />
</group>
</form>
addons/hr_timesheet/hr_timesheet.py
+25
View File
@@ -33,6 +33,31 @@ class hr_employee(osv.osv):
'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal')
}
def _getAnalyticJournal(self, cr, uid, context=None):
if context is None:
context = {}
id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
if id:
journal = self.browse(cr, uid, id[0], context=context)
if journal.journal_id:
return journal.journal_id.id
return False
def _getEmployeeProduct(self, cr, uid, context=None):
if context is None:
context = {}
id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
if id:
prod = self.browse(cr, uid, id[0], context=context)
if prod.product_id:
return prod.product_id.id
return False
_defaults = {
'journal_id' : _getAnalyticJournal,
'product_id' : _getEmployeeProduct
}
hr_employee()
addons/hr_timesheet/hr_timesheet_view.xml
+1 -1
View File
@@ -111,7 +111,7 @@
<page string="Categories" position="after">
<page string="Timesheets">
<field name="product_id" domain="[('type','=','service')]"/>
<field name="journal_id"/>
<field name="journal_id" widget="selection"/>
</page>
</page>
</field>
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+2 -2
View File
@@ -80,7 +80,7 @@
<field name="arch" type="xml">
<filter name="others" position="after">
<separator orientation="vertical"/>
<filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-sale"/>
<filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
</filter>
</field>
</record>
@@ -112,7 +112,7 @@
<!-- Menus -->
<record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
<field name="name">Costs to Invoice</field>
<field name="name">Bill Tasks Works</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
</group>
</form>
</field>
@@ -46,4 +46,4 @@
</record>
</data>
</openerp>
</openerp>
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+12 -8
View File
@@ -10,13 +10,17 @@
<form string="Invoice analytic lines">
<notebook colspan="4">
<page string="Billing Data">
<separator string="Do you want to show details of work in invoice ?" colspan="4"/>
<field name="date"/>
<field name="time"/>
<field name="name"/>
<field name="price"/>
<separator string="Force to use a specific product" colspan="4"/>
<field name="product"/>
<group col="4" colspan="4">
<separator string="Do you want to show details of work in invoice ?" colspan="4"/>
<field name="date"/>
<field name="time"/>
<field name="name"/>
<field name="price"/>
</group>
<group col="2" colspan="4" groups="base.group_extended">
<separator string="Force to use a specific product" colspan="4" />
<field name="product"/>
</group>
</page>
<page string="Filter on Accounts" groups="base.group_extended">
<separator string="Choose accounts you want to invoice" colspan="4"/>
@@ -26,7 +30,7 @@
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
</group>
</form>
</field>
addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+2 -2
View File
@@ -71,8 +71,8 @@
string="Done"
domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="user_id" />
<field name="employee_id" />
<field name="account_id" groups="analytic.group_analytic_accounting"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
addons/idea/idea_view.xml
+5 -4
View File
@@ -65,7 +65,7 @@
</record>
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
<menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
@@ -90,7 +90,8 @@
<menuitem name="Give Vote" parent="menu_ideas1"
id="menu_give_vote"
action="action_idea_select"/>
action="action_idea_select"
groups="base.group_tool_user"/>
<!-- Open Ideas Action -->
@@ -382,12 +383,12 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager,base.group_tool_user"/>
<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
<menuitem name="Vote Statistics" parent="menu_idea_reporting"
id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
<!-- Vote For Idea Action -->
<record model="ir.actions.act_window" id="action_idea_vote">
addons/idea/report/report_vote_view.xml
+1 -1
View File
@@ -91,7 +91,7 @@
<field name="context">{'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}</field>
</record>
<menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
<menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager"/>
</data>
</openerp>
addons/idea/security/idea_security.xml
-5
View File
@@ -2,10 +2,6 @@
<openerp>
<data>
<record id="base.group_sale_salesman" model="res.groups">
<field name="name">Sales / User</field>
</record>
<record model="res.groups" id="base.group_tool_manager">
<field name="name">Tools / Manager</field>
</record>
@@ -13,7 +9,6 @@
<field name="name">Tools / User</field>
</record>
</data>
</openerp>
addons/idea/security/ir.model.access.csv
-18
View File
@@ -1,26 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_idea_category","idea.category","model_idea_category","base.group_user",1,1,1,1
"access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
"access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,1,1,1
"access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
"access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
"access_idea_comment_base_user","idea.comment.base.user","model_idea_comment","base.group_user",1,1,1,1
"access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,1,1,1
"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,1,1,1
"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
"access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
"access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
"access_idea_comment_manager","idea.comment.manager","model_idea_comment","base.group_tool_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
access_idea_category idea.category model_idea_category base.group_user 1 1 1 1
access_idea_idea idea.idea model_idea_idea base.group_user 1 1 1 1
access_idea_vote idea.vote model_idea_vote base.group_user 1 1 1 1
access_idea_vote_stat idea.vote.stat model_idea_vote_stat base.group_user 1 1 1 1
access_idea_category_system idea.category system model_idea_category base.group_system 1 1 1 1
access_idea_comment idea.comment model_idea_comment base.group_system 1 1 1 1
access_idea_comment_base_user idea.comment.base.user model_idea_comment base.group_user 1 1 1 1
access_report_vote report.vote model_report_vote base.group_user 1 1 1 1
access_idea_idea_sale_salesman idea.idea.sale model_idea_idea base.group_sale_salesman 1 1 1 1
access_idea_vote_sale_salesman idea.vote.sale model_idea_vote base.group_sale_salesman 1 1 1 1
2 access_idea_category_user idea.category user model_idea_category base.group_tool_user 1 1 1 1
3 access_idea_idea_user idea.idea user model_idea_idea base.group_tool_user 1 1 1 1
4 access_idea_vote_user idea.vote user model_idea_vote base.group_tool_user 1 1 1 1
access_idea_category_manager idea.category manager model_idea_category base.group_tool_manager 1 1 1 1
access_idea_idea_manager idea.idea manager model_idea_idea base.group_tool_manager 1 1 1 1
5 access_idea_vote_manager idea.vote manager model_idea_vote base.group_tool_manager 1 1 1 1
6 access_idea_vote_stat_user idea.vote.stat user model_idea_vote_stat base.group_tool_user 1 1 1 1
7 access_idea_comment_user idea.comment user model_idea_comment base.group_tool_user 1 1 1 1
8 access_report_vote_manager report.vote manager model_report_vote base.group_tool_manager 1 1 1 1
access_idea_idea_system idea.idea system model_idea_idea base.group_system 1 0 0 0
access_idea_vote_system idea.vote system model_idea_vote base.group_system 1 0 0 0
access_report_vote_system report.vote system model_report_vote base.group_system 1 0 0 0
access_idea_vote_stat_manager idea.vote.stat manager model_idea_vote_stat base.group_tool_manager 1 1 1 1
access_idea_vote_stat_system idea.vote.stat system model_idea_vote_stat base.group_system 1 1 1 1
access_idea_comment_manager idea.comment.manager model_idea_comment base.group_tool_manager 1 1 1 1
addons/lunch/lunch_view.xml
+2 -2
View File
@@ -6,14 +6,14 @@
id="menu_lunch" sequence="1" />
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6" groups="base.group_system,base.group_tool_manager"/>
id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
<menuitem name="Lunch Orders"
parent="base.menu_lunch_reporting"
id="menu_lunch_reporting_order" sequence="1" />
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
<menuitem name="Lunch" parent="base.menu_lunch_survey_root"
id="menu_lunch_category_root_configuration" sequence="1" />
addons/lunch/security/ir.model.access.csv
+1 -13
View File
@@ -1,20 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
"access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
"access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
"access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,1,1,1
"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,1,1,1
"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
"access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
"access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
"access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
"access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
"access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
"access_lunch_category_manager","lunch.category.user","model_lunch_category","base.group_tool_user",1,1,1,1
"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
access_lunch_category lunch.category model_lunch_category base.group_user 1 1 1 1
access_lunch_product lunch.product model_lunch_product base.group_user 1 1 1 1
access_lunch_cashbox lunch.cashbox model_lunch_cashbox base.group_user 1 1 1 1
access_lunch_order lunch.order model_lunch_order base.group_user 1 1 1 1
access_report_lunch_amount report.lunch.amount model_report_lunch_amount base.group_user 1 1 1 1
access_lunch_order_sale_salesman lunch.order.sale model_lunch_order base.group_sale_salesman 1 1 1 1
2 access_lunch_order_user lunch.order user model_lunch_order base.group_tool_user 1 1 1 1
access_lunch_order_manager lunch.order manager model_lunch_order base.group_tool_manager 1 1 1 1
3 access_lunch_cashmove_user lunch.cashmove user model_lunch_cashmove base.group_tool_user 1 1 1 1
access_lunch_cashmove_manager lunch.cashmove manager model_lunch_cashmove base.group_tool_manager 1 1 1 1
4 access_report_lunch_amount_manager report.lunch.amount manager model_report_lunch_amount base.group_tool_manager 1 1 1 1
5 access_lunch_category_system access_lunch_category_manager lunch.category system lunch.category.user model_lunch_category base.group_system base.group_tool_user 1 1 1 1
access_lunch_product_system lunch.product system model_lunch_product base.group_system 1 1 1 1
access_lunch_cashbox_system lunch.cashbox system model_lunch_cashbox base.group_system 1 1 1 1
access_lunch_order_system lunch.order system model_lunch_order base.group_system 1 0 0 0
access_lunch_cashmove_system lunch.cashmove system model_lunch_cashmove base.group_system 1 0 0 0
6 access_report_lunch_order_manager report.lunch.order manager model_report_lunch_order base.group_tool_manager 1 1 1 1
7 access_lunch_product_user lunch.product user model_lunch_product base.group_tool_user 1 1 1 1
8 access_lunch_cashbox_user lunch.cashbox user model_lunch_cashbox base.group_tool_user 1 1 1 1
addons/lunch/security/lunch_security.xml
-3
View File
@@ -2,9 +2,6 @@
<openerp>
<data noupdate="0">
<record id="base.group_sale_salesman" model="res.groups">
<field name="name">Sales / User</field>
</record>
<record model="res.groups" id="base.group_tool_manager">
<field name="name">Tools / Manager</field>
</record>
addons/lunch/wizard/lunch_order_cancel_view.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order"
res_model="lunch.order.cancel" src_model="lunch.order"
view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
view_mode="form" target="new" view_type="form"/>
</data>
</openerp>
addons/lunch/wizard/lunch_order_confirm_view.xml
+1 -1
View File
@@ -36,7 +36,7 @@
<act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order"
res_model="lunch.order.confirm" src_model="lunch.order"
view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
view_mode="form" target="new" view_type="form"/>
</data>
</openerp>
addons/marketing_campaign/marketing_campaign_view.xml
+3 -3
View File
@@ -36,10 +36,10 @@
<separator string="" colspan="4" />
<group col="10" colspan="4">
<field name="state" readonly="1" />
<button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
<button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
<button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
<button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
<button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
</group>
</form>
</field>
@@ -161,9 +161,9 @@
<separator string="" colspan="4"/>
<group col="6" colspan="4">
<field name="state" readonly="1"/>
<button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
<button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
<button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
<button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
<button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
</group>
</form>
@@ -382,9 +382,9 @@
<separator string="" colspan="4"/>
<group colspan="4" col="11">
<field name="state" readonly="True"/>
<button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
<button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
<button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
<button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
</group>
</form>
</field>
addons/mrp/mrp_view.xml
+1 -1
View File
@@ -627,12 +627,12 @@
<separator colspan="4"/>
<group col="9" colspan="4">
<field name="state"/>
<button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
<button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
<button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
<button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
<button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
<button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
<button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
</group>
</page>
addons/mrp_operations/mrp_operations_view.xml
+3 -3
View File
@@ -14,10 +14,10 @@
<xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
<group colspan="8" col="8">
<field name="state"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
<button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
</group>
@@ -32,10 +32,10 @@
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
<field name="state"/>
@@ -114,10 +114,10 @@
<separator string="" colspan="4"/>
<group colspan="8" col="8">
<field name="state"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
<button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
</group>
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<button icon="gtk-stop" special="cancel"
string="Cancel" />
<button name="make_invoices" string="Create Invoice"
colspan="1" type="object" icon="terp-dolar" />
colspan="1" type="object" icon="terp-gtk-go-back-rtl" />
</group>
</form>
</field>
addons/procurement/procurement_view.xml
+1 -1
View File
@@ -72,9 +72,9 @@
<field colspan="4" name="message" readonly="1"/>
<field name="state" readonly="1"/>
<group col="7" colspan="2">
<button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
<button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
<button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
<button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
<button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
</group>
</page>
addons/product/product.py
+1
View File
@@ -308,6 +308,7 @@ class product_template(osv.osv):
'uos_coeff' : lambda *a: 1.0,
'mes_type' : lambda *a: 'fixed',
'categ_id' : _default_category,
'type' : lambda *a: 'consu',
}
def _check_uom(self, cursor, user, ids):
addons/product/product_view.xml
+2 -4
View File
@@ -9,10 +9,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Product">
<filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
<filter icon="terp-accessories-archiver" string="Consumable"
domain="[('type','=', 'consumable')]"/>
<filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
<filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
<filter string="Consumable/Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
<separator orientation="vertical"/>
<filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
<filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
addons/project/project_view.xml
+7 -7
View File
@@ -46,11 +46,11 @@
<separator colspan="4"/>
<group col="9" colspan="8">
<field name="state" select="1" readonly="1"/>
<button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
<button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
<button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
<button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
<button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
<button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
<button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
<button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
<button
string="New Project Based on Template"
@@ -67,9 +67,9 @@
</tree>
</field>
</page>
<page groups="base.group_extended" string="Partner Info">
<page groups="base.group_extended" string="Accounting">
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
<field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
<field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
<field name="warn_customer"/>
<newline/>
<separator colspan="2" string="Mail Header"/>
@@ -242,13 +242,13 @@
<newline/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
<button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</page>
<page groups="base.group_extended" string="Delegations">
@@ -323,10 +323,10 @@
<field name="date_end" invisible="1"/>
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="context.get('set_visible',False)"/>
<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
</tree>
</field>
</record>
addons/project_issue/project_issue_view.xml
+3 -3
View File
@@ -84,10 +84,10 @@
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state" />
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
</group>
@@ -191,9 +191,9 @@
<field name="assigned_to"/>
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="state"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
@@ -290,9 +290,9 @@
<field name="version_id"/>
<field name="user_id"/>
<field name="state"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
addons/project_long_term/project_long_term_view.xml
+1 -1
View File
@@ -146,11 +146,11 @@
<separator string="" colspan="4"/>
<group col="12" colspan="4">
<field name="state" select="1"/>
<button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
<button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
<button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
<button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
<button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
</group>
</page>
<page string="Task Detail">
addons/project_planning/project_planning_view.xml
+3 -4
View File
@@ -104,14 +104,13 @@
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<button name="%(project.action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</page>
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -139,12 +138,12 @@
<group col="6" colspan="4">
<field name="state" select="1"
readonly="1" />
<button name="action_cancel" states="draft,open"
string="Cancel" type="object" icon="gtk-cancel" />
<button name="action_open" states="draft"
string="Open" type="object" icon="gtk-yes" />
<button name="action_done" states="open"
string="Done" type="object" icon="gtk-jump-to" />
<button name="action_cancel" states="draft,open"
string="Cancel" type="object" icon="gtk-cancel" />
<button name="action_draft" states="done,cancel"
string="Reset to Draft" type="object" icon="gtk-convert" />
</group>
addons/project_scrum/project_scrum_view.xml
+1 -1
View File
@@ -113,12 +113,12 @@
</notebook>
<group col="8" colspan="4">
<field name="state" select="1" readonly="1"/>
<button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
<button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
<button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
<button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
<button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
<button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
<button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
</group>
</form>
</field>
addons/purchase_requisition/purchase_requisition_view.xml
+2 -2
View File
@@ -61,10 +61,10 @@
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state" select="1" readonly ="1"/>
<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
<button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
</group>
</page>
<page string="Quotations">
@@ -78,9 +78,9 @@
<field name="minimum_planned_date"/>
<field name="origin"/>
<field name="state"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
</tree>
</field>
<separator colspan="4" string=""/>
addons/report_designer/installer.py
-1
View File
@@ -31,7 +31,6 @@ class report_designer_installer(osv.osv_memory):
"upload the report using the same wizard."),
'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
"reports on several objects. It's a SQL query builder and browser for end users."),
'olap':fields.boolean('Business Intelligence Report',help="Helps you manage Online Analytical Process with the mdx query and provides Cube Designing and Cube Browsing"),
}
report_designer_installer()
addons/report_designer/report_designer_installer.xml
-1
View File
@@ -28,7 +28,6 @@
<group colspan="8">
<field name="base_report_designer"/>
<field name="base_report_creator"/>
<field name="olap"/>
</group>
</data>
</field>
addons/sale/sale_view.xml
+1 -1
View File
@@ -206,7 +206,7 @@
<button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
<button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
<button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
<button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
<button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-gtk-go-back-rtl" type="object"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
addons/sale/wizard/sale_line_invoice.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
</form>
</field>
</record>
addons/sale/wizard/sale_make_invoice.xml
+2 -2
View File
@@ -13,7 +13,7 @@
<field name="invoice_date"/>
<separator string="" colspan="6"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
</form>
</field>
</record>
@@ -38,4 +38,4 @@
<field name="model">sale.order</field>
</record>
</data>
</openerp>
</openerp>
addons/sale/wizard/sale_make_invoice_advance.xml
+2 -2
View File
@@ -15,7 +15,7 @@
<separator string="" colspan="4"/>
<label string="" colspan="2" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
<button name="create_invoices" string="Create Partial Invoice" type="object" icon="terp-gtk-go-back-rtl"/>
</form>
</field>
</record>
@@ -55,4 +55,4 @@
<field name="target">new</field>
</record>
</data>
</openerp>
</openerp>
addons/stock/stock_view.xml
+7 -7
View File
@@ -134,9 +134,9 @@
</notebook>
<field name="state"/>
<group col="4" colspan="2">
<button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
<button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
<button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
</group>
</form>
@@ -732,10 +732,10 @@
<label string="" colspan="4"/>
<field name="state"/>
<group col="4" colspan="2">
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -746,7 +746,7 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
@@ -922,10 +922,10 @@
<label string="" colspan="4"/>
<field name="state"/>
<group col="4" colspan="2">
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -936,7 +936,7 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
@@ -1137,10 +1137,10 @@
<label string="" colspan="4"/>
<field name="state"/>
<group col="4" colspan="2">
<button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -1151,7 +1151,7 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
addons/stock/wizard/stock_invoice_onshipping_view.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<field name="invoice_date" />
<separator string="" colspan="4" />
<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
<button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
</form>
</field>
</record>
addons/subscription/security/ir.model.access.csv
+4 -6
View File
@@ -1,10 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_subscription_document,subscription.document,model_subscription_document,base.group_system,1,1,1,1
access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_subscription_document access_subscription_document_fields subscription.document subscription.document.fields model_subscription_document model_subscription_document_fields base.group_system base.group_tool_manager 1 1 1 1
access_subscription_document_fields subscription.document.fields model_subscription_document_fields base.group_system 1 1 1 1
access_subscription_subscription subscription.subscription model_subscription_subscription base.group_user 1 1 1 1
access_subscription_subscription_history subscription.subscription.history model_subscription_subscription_history base.group_user 1 1 1 1
3 access_subscription_subscription_user subscription.subscription user model_subscription_subscription base.group_tool_user 1 1 1 1
access_subscription_subscription_manager subscription.subscription manager model_subscription_subscription base.group_tool_manager 1 0 0 0
4 access_subscription_subscription_history_user subscription.subscription.history user model_subscription_subscription_history base.group_tool_user 1 1 1 1
access_subscription_subscription_system subscription.subscription system model_subscription_subscription base.group_system 1 0 0 0
5 access_subscription_document_user subscription.document user model_subscription_document base.group_tool_user 1 1 1 1
6 access_res_partner_user res.partner.user base.model_res_partner base.group_tool_user 1 1 1 1
7 access_res_partner_address_user res.partner.address.user base.model_res_partner_address base.group_tool_user 1 1 1 1
8 access_ir_cron_user ir.cron.user base.model_ir_cron base.group_tool_user 1 1 1 1
addons/subscription/subscription_view.xml
+1 -1
View File
@@ -212,7 +212,7 @@
<field name="search_view_id" ref="view_subscription_document_filter" />
</record>
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system" />
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
<menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
<menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
</data>
addons/survey/security/ir.model.access.csv
+19 -33
View File
@@ -1,51 +1,37 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
"access_survey_manager","survey","model_survey","base.group_tool_manager",1,1,1,1
"access_survey_system","survey","model_survey","base.group_system",1,0,0,0
"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
"access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
"access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,1,1,1
"access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
"access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
"access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,1
"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
"access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
"access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
"access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
"access_survey_request_survey_user","survey.request.survey.user","model_survey_request","group_survey_user",1,1,1,1
"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1
"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1
"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1
"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1
"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1
"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
"access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
"access_survey_res_partner_address_survey_user","survey.res.partner.address.survey.user","base.model_res_partner_address","group_survey_user",1,1,1,0
"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_survey_type_manager access_survey_res_partner_manager survey.type manager survey.res.partner.manager model_survey_type base.model_res_partner base.group_tool_manager 1 1 1 1
3 access_survey_type_user access_survey_type_manager survey.type user survey.type.manager model_survey_type base.group_tool_user base.group_tool_manager 1 1 1 1
4 access_survey_manager survey survey.manager model_survey base.group_tool_manager 1 1 1 1
access_survey_system survey model_survey base.group_system 1 0 0 0
access_survey_user survey model_survey base.group_tool_user 1 1 1 1
5 access_survey_page_manager survey.page manager model_survey_page base.group_tool_manager 1 1 1 1
access_survey_page_system survey.page system model_survey_page base.group_system 1 0 0 0
access_survey_page_user survey.page user model_survey_page base.group_tool_user 1 1 1 1
6 access_survey_question_manager survey.question manager model_survey_question base.group_tool_manager 1 1 1 1
access_survey_question_user survey.question user model_survey_question base.group_tool_user 1 1 1 1
7 access_survey_answer_manager survey.answer manager model_survey_answer base.group_tool_manager 1 1 1 1
access_survey_answer_user survey.answer user model_survey_answer base.group_tool_user 1 1 1 1
8 access_survey_response_manager survey.response manager model_survey_response base.group_tool_manager 1 1 1 1
access_survey_response_user survey.response user model_survey_response base.group_tool_user 1 1 1 1
9 access_survey_response_answer_manager survey.response.answer manager model_survey_response_answer base.group_tool_manager 1 1 1 1
10 access_survey_history_manager survey.history.manager model_survey_history base.group_tool_manager 1 1 1 1
11 access_survey_question_column_heading_manager survey.question.column.heading manager model_survey_question_column_heading base.group_tool_manager 1 1 1 1
12 access_survey_request_manager survey.request manager model_survey_request base.group_tool_manager 1 1 1 1
13 access_survey_tbl_column_heading_manager survey.tbl.column.heading manager model_survey_tbl_column_heading base.group_tool_manager 1 1 1 1
14 access_survey_response_line_manager survey.response.line manager model_survey_response_line base.group_tool_manager 1 1 1 1
15 access_survey_res_partner_address_manager survey.res.partner.address.manager base.model_res_partner_address base.group_tool_manager 1 1 1 0
16 access_survey_res_partner_manager survey.res.partner.manager base.model_res_partner base.group_tool_manager 1 1 1 1
17 access_survey_res_partner_user survey.res.partner.user base.model_res_partner base.group_tool_user 1 1 1 1
18 access_survey_user survey.user model_survey base.group_tool_user 1 1 1 1
19 access_survey_page_user survey.page user model_survey_page base.group_tool_user 1 1 1 1
20 access_survey_question_user survey.question user model_survey_question base.group_tool_user 1 1 1 1
21 access_survey_answer_user survey.answer user model_survey_answer base.group_tool_user 1 1 1 1
22 access_survey_response_user survey.response user model_survey_response base.group_tool_user 1 1 1 1
23 access_survey_response_answer_user survey.response.answer user model_survey_response_answer base.group_tool_user 1 1 1 1
24 access_survey_history_user survey.history.user model_survey_history base.group_tool_user 1 1 1 1
access_survey_question_column_heading_manager survey.question.column.heading manager model_survey_question_column_heading base.group_tool_manager 1 1 1 1
access_survey_question_column_heading_user survey.question.column.heading user model_survey_question_column_heading base.group_tool_user 1 0 0 0
access_survey_request_manager survey.request manager model_survey_request base.group_tool_manager 1 1 1 1
access_survey_request_user survey.request user model_survey_request base.group_tool_user 1 1 1 1
access_survey_request_system survey.request system model_survey_request base.group_system 1 0 0 0
access_survey_tbl_column_heading_manager survey.tbl.column.heading manager model_survey_tbl_column_heading base.group_tool_manager 1 1 1 1
access_survey_tbl_column_heading_user survey.tbl.column.heading user model_survey_tbl_column_heading base.group_tool_user 1 1 1 1
access_survey_response_line_manager survey.response.line manager model_survey_response_line base.group_tool_manager 1 1 1 1
25 access_survey_response_line_user survey.response.line user model_survey_response_line base.group_tool_user 1 1 1 1
access_survey_history_survey_manager survey.history manager model_survey_history base.group_tool_manager 1 1 1 1
access_survey_type_system survey.type system model_survey_type base.group_system 1 0 0 0
access_survey_question_system survey.question system model_survey_question base.group_system 1 0 0 0
access_survey_history_system survey.history.system model_survey_history base.group_system 1 0 0 0
access_survey_answer_system survey.answer system model_survey_answer base.group_system 1 0 0 0
access_survey_answer_base_user survey.answer.base.user model_survey_answer base.group_user 1 1 1 1
access_survey_question_base_user survey.question.base.user model_survey_question base.group_user 1 1 1 1
26 access_survey_res_partner_address_user survey.res.partner.address.user base.model_res_partner_address base.group_tool_user 1 1 1 0
27 access_survey_request_employee access_survey_res_partner_user survey.request.employee survey.res.partner.user model_survey_request base.model_res_partner base.group_user base.group_tool_user 1 0 1 0 1 0 1
access_survey_response_employee survey.response employee model_survey_response base.group_user 1 0 0 0
access_survey_employee survey.employee model_survey base.group_user 1 0 0 0
28 access_survey_survey_user survey.survey.user model_survey group_survey_user 1 1 1 1
access_survey_type_survey_user survey.type.survey.user model_survey_type group_survey_user 1 1 1 1
29 access_survey_page_survey_user survey.page.survey.user model_survey_page group_survey_user 1 1 1 1
access_survey_request_survey_user survey.request.survey.user model_survey_request group_survey_user 1 1 1 1
30 access_survey_question_survey_user survey.question.survey.user model_survey_question group_survey_user 1 1 1 1
31 access_survey_answer_survey_user survey.answer.survey.user model_survey_answer group_survey_user 1 1 1 1
32 access_survey_response_survey_user survey.response.survey.user model_survey_response group_survey_user 1 1 1 1
33 access_survey_response_answer_survey_user survey.response.answer.survey.user model_survey_response_answer group_survey_user 1 1 1 1
34 access_survey_history_survey_user survey.history.survey.user model_survey_history group_survey_user 1 1 1 1
access_survey_question_column_heading_survey_user survey.question.column.heading.survey.user model_survey_question_column_heading group_survey_user 1 0 0 0
access_survey_tbl_column_heading_survey_user survey.tbl.column.heading.survey.user model_survey_tbl_column_heading group_survey_user 1 1 1 1
35 access_survey_response_line_survey_user survey.response.line.survey.user model_survey_response_line group_survey_user 1 1 1 1
36 access_survey_res_partner_address_survey_user access_survey_question_column_heading_survey_user survey.res.partner.address.survey.user survey.question.column.heading.survey.user base.model_res_partner_address model_survey_question_column_heading group_survey_user 1 1 0 1 0 0
37 access_survey_question_column_heading_user survey.question.column.heading user model_survey_question_column_heading base.group_tool_user 1 1 1 1
addons/survey/survey_view.xml
+9 -10
View File
@@ -3,12 +3,11 @@
<data>
<menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" sequence="2"/>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
<menuitem name="Define Surveys" id="menu_define_survey"
groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"
groups="base.group_tool_manager"
parent="menu_surveys" />
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user"/>
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6"/>
<menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -184,6 +183,8 @@
</field>
<group col="9" colspan="4">
<field name="state"/>
<button name="survey_cancel"
string="Cancel" states="open" type="object" icon="gtk-cancel"/>
<button name="survey_draft"
string="Set to draft" states="cancel,close" type="object"
icon="gtk-new"/>
@@ -191,8 +192,6 @@
states="draft" type="object" icon="gtk-go-forward"/>
<button name="survey_close"
string="Close" states="open" type="object" icon="gtk-close"/>
<button name="survey_cancel"
string="Cancel" states="open" type="object" icon="gtk-cancel"/>
</group>
</page>
<page string="Other">
@@ -292,7 +291,7 @@
<menuitem name="Surveys" id="menu_survey_form"
action="action_survey_form1" parent="menu_define_survey"
groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
groups="base.group_tool_manager"/>
<!--
Survey Pages
@@ -492,7 +491,7 @@
<menuitem name="Survey Pages" id="menu_survey_page_form1"
action="action_survey_page_form" parent='menu_define_survey'
groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
groups="base.group_tool_manager"/>
<record model="ir.ui.view" id="survey_page_wizard_test1">
<field name="name">survey_page_wizard_test</field>
@@ -1126,7 +1125,7 @@
<menuitem name="Survey Requests" id="menu_survey_type_form1"
action="action_survey_request_tree" parent='menu_answer_surveys'
groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
groups="base.group_tool_manager"/>
<!--
Survey Type
@@ -1193,7 +1192,7 @@
src_model="survey.question"/>
<menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
action="action_view_survey_name" parent="menu_answer_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" icon="STOCK_INDEX"/>
action="action_view_survey_name" parent="menu_answer_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user" icon="STOCK_INDEX"/>
</data>
</openerp>
addons/survey/wizard/survey_selection.py
+1 -1
View File
@@ -62,7 +62,7 @@ class survey_name_wiz(osv.osv_memory):
for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
result.append((sur.id, sur.title))
return result
group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User'))])
group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
user_obj = self.pool.get('res.users')
user_rec = user_obj.read(cr, uid, uid)
for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):