odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]merge with parent branch 

bzr revid: rma@tinyerp.com-20120801055828-jmwl64y48nssb3v6
This commit is contained in:
Randhir Mayatra (OpenERP) 2012-08-01 11:28:28 +05:30
parent 900f538fdd c5eae6dec7
commit 7ab619d0b6
205 changed files with 4048 additions and 4208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_cash_statement.py
View File

@ -32,7 +32,7 @@ class account_cashbox_line(osv.osv):
_name = 'account.cashbox.line' _name = 'account.cashbox.line'
_description = 'CashBox Line' _description = 'CashBox Line'
_rec_name = 'number' _rec_name = 'pieces'
def _sub_total(self, cr, uid, ids, name, arg, context=None): def _sub_total(self, cr, uid, ids, name, arg, context=None):
@ -325,7 +325,7 @@ account_journal()
class account_journal_cashbox_line(osv.osv): class account_journal_cashbox_line(osv.osv):
_name = 'account.journal.cashbox.line' _name = 'account.journal.cashbox.line'
_rec_name = 'value' _rec_name = 'pieces'
_columns = { _columns = {
'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')), 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1), 'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1),

32
addons/account/account_invoice_view.xml
View File

@ -442,32 +442,22 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Invoice"> <search string="Search Invoice">
<group> <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
<field name="number" <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
string="Invoice" <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/> <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<separator orientation="vertical"/> <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/> <separator/>
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/> <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
<filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> <field name="partner_id"/>
<separator orientation="vertical"/> <field name="user_id" string="Salesperson"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/> <field name="journal_id"/>
<separator orientation="vertical"/> <field name="period_id" string="Period"/>
<filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id" widget="selection" string="Salesperson"/>
<field name="journal_id" widget="selection"/>
<field name="period_id" string="Period"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<filter string="Invoice Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/> <filter string="Invoice Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/>
<filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/> <filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/>

246
addons/account/account_view.xml
View File

@ -63,15 +63,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Fiscalyear"> <search string="Search Fiscalyear">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/> <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
<separator orientation="vertical"/> <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
<filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/> <field name="state"/>
<filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
<separator orientation="vertical"/>
<field name="state"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
</group> </group>
@ -146,11 +141,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Period"> <search string="Search Period">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/> <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
<separator orientation="vertical"/>
<filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -217,18 +209,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Accounts"> <search string="Accounts">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/> <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
<separator orientation="vertical"/> <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
<filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/> <field name="user_type"/>
<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
<separator orientation="vertical"/>
<field name="user_type"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/> <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
<separator orientation="vertical"/>
<filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/> <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
<filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/> <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
</group> </group>
@ -440,21 +426,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Account Journal"> <search string="Search Account Journal">
<group>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
<separator orientation="vertical"/>
<filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/> <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
<filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/> <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
<filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/> <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
<filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/> <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
<separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/> <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
<separator orientation="vertical"/> <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
<filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
</group> </group>
</search> </search>
</field> </field>
@ -542,22 +522,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Bank Statements"> <search string="Search Bank Statements">
<group> <field name="name" string="Bank Statement"/>
<field name="name" string="Bank Statement"/> <field name="date"/>
<separator orientation="vertical"/> <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<field name="date"/> <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
<separator orientation="vertical"/> <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/> <field name="journal_id" domain="[('type', '=', 'cash')]" />
<filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
<filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<separator orientation="vertical"/>
<field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
<separator orientation="vertical"/>
<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
</group> </group>
</search> </search>
@ -587,22 +560,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Bank Statements"> <search string="Search Bank Statements">
<group> <field name="name" string="Bank Statement"/>
<field name="name" string="Bank Statement"/> <field name="date"/>
<separator orientation="vertical"/> <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<field name="date"/> <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<separator orientation="vertical"/> <field name="period_id"/>
<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> <field name="journal_id" domain="[('type', '=', 'bank')]" />
<filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<separator orientation="vertical"/>
<field name="period_id"/>
<field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
<separator orientation="vertical"/>
<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
</group> </group>
</search> </search>
@ -833,7 +799,7 @@
<search string="Account Tax Code"> <search string="Account Tax Code">
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/>
<field name="parent_id"/> <field name="parent_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</search> </search>
</field> </field>
</record> </record>
@ -916,10 +882,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Taxes"> <search string="Search Taxes">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -1195,38 +1159,26 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Journal Items"> <search string="Search Journal Items">
<group> <field name="date"/>
<field name="date"/> <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
<separator orientation="vertical"/> <separator/>
<filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/> <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
<separator orientation="vertical"/> <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
<filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/> <separator/>
<filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/> <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/>
<separator orientation="vertical"/> <separator/>
<filter <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
icon="terp-dolar_ok!" <field name="move_id" string="Number (Move)"/>
string="Unreconciled" <field name="account_id"/>
domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" <field name="partner_id"/>
name="unreconciled"/> <field name="journal_id" context="{'journal_id':self}"/>
<separator orientation="vertical"/> <field name="period_id" context="{'period_id':self}"/>
<filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
<separator orientation="vertical"/>
<field name="move_id" string="Number (Move)"/>
<field name="account_id"/>
<field name="partner_id"/>
<field name="journal_id" widget="selection" context="{'journal_id':self}"/>
<field name="period_id" context="{'period_id':self}"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> <filter string="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
<separator orientation="vertical"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
</group> </group>
<newline/>
</search> </search>
</field> </field>
</record> </record>
@ -1444,27 +1396,19 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Move"> <search string="Search Move">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
<field name="date"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
<separator orientation="vertical"/> <separator/>
<filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/> <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/> <field name="partner_id"/>
<separator orientation="vertical"/> <field name="journal_id"/>
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/> <field name="period_id"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="journal_id" widget="selection"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group> </group>
@ -1673,16 +1617,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Journal Entry Model"> <search string="Journal Entry Model">
<group> <field name="name" string="Journal Entry Model"/>
<field name="name" string="Journal Entry Model"/> <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
<separator orientation="vertical"/> <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
<filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/> <field name="journal_id"/>
<filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/> <field name="company_id" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<field name="journal_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</group> </group>
@ -1852,17 +1791,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Entry Subscription"> <search string="Entry Subscription">
<group> <field name="name" string="Account Subscription"/>
<field name="name" string="Account Subscription"/> <field name="date_start"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
<field name="date_start"/> <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
<separator orientation="vertical"/> <field name="model_id"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
<filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
<separator orientation="vertical"/>
<field name="model_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/> <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@ -2119,17 +2052,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Account Templates"> <search string="Search Account Templates">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/> <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
<separator orientation="vertical"/> <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
<filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/> <field name="parent_id"/>
<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/> <field name="user_type"/>
<separator orientation="vertical"/> <field name="type"/>
<field name="parent_id"/>
<field name="user_type"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
<filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/> <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
@ -2188,20 +2116,14 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Chart of Account Templates"> <search string="Search Chart of Account Templates">
<group> <field name="name" string="Account Template"/>
<field name="name" string="Account Template"/> <field name="account_root_id"/>
<separator orientation="vertical"/> <field name="bank_account_view_id"/>
<field name="account_root_id"/>
<field name="bank_account_view_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/> <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
<filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/> <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
<separator orientation="vertical"/>
<filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/> <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
<filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/> <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
<separator orientation="vertical"/>
<filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/> <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
<filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/> <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
</group> </group>
@ -2310,14 +2232,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Tax Templates"> <search string="Search Tax Templates">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/> <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
<separator orientation="vertical"/> <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
<filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/> <field name="chart_template_id"/>
<filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
<separator orientation="vertical"/>
<field name="chart_template_id"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -2353,11 +2271,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search tax template"> <search string="Search tax template">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/> <field name="parent_id"/>
<field name="parent_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
</group> </group>
@ -2789,16 +2704,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Account Report"> <search string="Account Report">
<group> <field name="name" string="Account Report"/>
<field name="name" string="Account Report"/> <field name="type"/>
<separator orientation="vertical"/> <field name="account_report_id"/>
<field name="account_report_id"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/> <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
<separator orientation="vertical"/>
<filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group> </group>
</search> </search>

4
addons/account/i18n/es_EC.po
View File

@ -16,8 +16,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n" "X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
"X-Generator: Launchpad (build 15702)\n" "X-Generator: Launchpad (build 15719)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0

51
addons/account/project/project_view.xml
View File

@ -30,22 +30,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Account"> <search string="Analytic Account">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<field name="date"/> <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<separator orientation="vertical"/> <field name="partner_id"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/> <field name="user_id"/>
<filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
</group> </group>
@ -183,27 +176,20 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Analytic Lines"> <search string="Search Analytic Lines">
<group> <field name="name" string="Analytic Line"/>
<field name="name" string="Analytic Line"/> <field name="date"/>
<separator orientation="vertical"/> <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
<field name="date"/> <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
<separator orientation="vertical"/> <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
<filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/> <separator/>
<filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/> <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
<filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/> <field name="account_id"/>
<filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/> <field name="user_id"/>
<separator orientation="vertical"/>
<field name="account_id"/>
<field name="user_id"/>
</group>
<newline/>
<group string="Group By..." expand="0"> <group string="Group By..." expand="0">
<filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/> <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
<filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/> <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
<filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/> <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
<separator orientation="vertical"/>
<filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/> <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
<separator orientation="vertical"/>
<filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/> <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
</group> </group>
</search> </search>
@ -304,11 +290,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Journals"> <search string="Analytic Journals">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/> <field name="type"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group> </group>

22
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -34,31 +34,21 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Entries Analysis"> <search string="Analytic Entries Analysis">
<group> <field name="day" string="Day"/>
<field name="day" string="Day"/> <field name="date"/>
<separator orientation="vertical"/> <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
<field name="date"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical"/> <field name="product_id" />
<filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/> <field name="user_id"/>
<separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id" />
<field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/> <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
<filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/> <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/> <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>

51
addons/account/report/account_entries_report_view.xml
View File

@ -67,54 +67,35 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Entries Analysis"> <search string="Entries Analysis">
<group> <field name="date"/>
<field name="date"/> <field name="date_created"/>
<field name="date_created"/> <field name="date_maturity"/>
<field name="date_maturity"/> <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
<separator orientation="vertical"/> <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
<filter icon="terp-go-year" string="This F.Year" <separator/>
name="thisyear" <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
context="{'year':'current_year'}" <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
help="Journal Entries with period in current year"/> <separator/>
<filter icon="terp-go-month" string="This Period" <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
name="period" <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
context="{'period':'current_period'}" <field name="account_id"/>
help="Journal Entries with period in current period"/> <field name="journal_id"/>
<separator orientation="vertical"/> <field name="period_id"/>
<filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/> <group expand="0" string="Extended Filters...">
<filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
<separator orientation="vertical"/>
<filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
<filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
<separator orientation="vertical"/>
<field name="account_id"/>
<field name="journal_id" widget="selection"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="fiscalyear_id"/> <field name="fiscalyear_id"/>
<separator orientation="vertical"/>
<field name="product_id"/> <field name="product_id"/>
<field name="partner_id"/> <field name="partner_id"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
<separator orientation="vertical"/>
<filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/> <filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>
<filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
<separator orientation="vertical"/>
<filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/> <filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
<filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/> <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/> <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
<filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/> <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
<filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/> <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>

64
addons/account/report/account_invoice_report_view.xml
View File

@ -55,68 +55,32 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Invoices Analysis"> <search string="Invoices Analysis">
<group> <field name="date"/>
<filter icon="terp-go-year" string="Year" <filter icon="terp-go-year" string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
name="year" <separator/>
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
help="year"/> <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>
<separator orientation="vertical"/> <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/>
<field name="date"/> <separator/>
<separator orientation="vertical"/> <filter icon="terp-personal" string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/>
<filter string="Draft" <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>
icon="terp-document-new" <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/>
domain="[('state','=','draft')]" <filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/>
help = "Draft Invoices"/> <field name="partner_id"/>
<filter string="Pro-forma" <field name="user_id" />
icon="terp-gtk-media-pause" <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
domain="['|', ('state','=','proforma'),('state','=','proforma2')]"
help = "Pro-forma Invoices"/>
<filter string="Invoiced"
name="current"
icon="terp-check"
domain="[('state','not in', ('draft','cancel'))]"
help = "Open and Paid Invoices"/>
<separator orientation="vertical"/>
<filter icon="terp-personal" string="Customer"
name="customer"
domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
help="Customer Invoices And Refunds"/>
<filter icon="terp-personal"
string="Supplier"
domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
help="Supplier Invoices And Refunds"/>
<separator orientation="vertical"/>
<filter icon="terp-dolar" string="Invoice"
domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
help="Customer And Supplier Invoices"/>
<filter icon="terp-dolar_ok!"
string="Refund"
domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
help="Customer And Supplier Refunds"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id" />
<field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
</group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/> <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/> <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/> <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/> <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> <filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>

9
addons/account/report/account_treasury_report_view.xml
View File

@ -36,12 +36,9 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Treasury Analysis"> <search string="Treasury Analysis">
<group> <field name="fiscalyear_id"/>
<field name="fiscalyear_id"/> <field name="period_id"/>
<field name="period_id"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<newline/>
</search> </search>
</field> </field>
</record> </record>

16
addons/account/res_config_view.xml
View File

@ -15,7 +15,7 @@
<field name="model">account.config.settings</field> <field name="model">account.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Accounting" version="7.0"> <form string="Configure Accounting" version="7.0" class="oe_form_configuration">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
@ -69,13 +69,13 @@
</div> </div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"> <div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}">
<label for="purchase_tax"/> <label for="purchase_tax"/>
<field name="purchase_tax" <field name="purchase_tax"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"
class="oe_inline"/> class="oe_inline"/>
</div> </div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"> <div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}">
<label for="sale_tax_rate"/> <label for="sale_tax_rate"/>
<field name="sale_tax_rate" on_change="onchange_tax_rate(sale_tax_rate)"/> <field name="sale_tax_rate" on_change="onchange_tax_rate(sale_tax_rate)"/>
</div> </div>
<div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"> <div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}">
<label for="purchase_tax_rate"/> <label for="purchase_tax_rate"/>
@ -149,7 +149,7 @@
<div> <div>
<label for="sale_sequence_next"/> <label for="sale_sequence_next"/>
<field name="sale_sequence_prefix" <field name="sale_sequence_prefix"
class="oe_inline" class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_sequence_next" <field name="sale_sequence_next"
class="oe_inline" class="oe_inline"
@ -158,7 +158,7 @@
<div> <div>
<label for="sale_refund_sequence_next"/> <label for="sale_refund_sequence_next"/>
<field name="sale_refund_sequence_prefix" <field name="sale_refund_sequence_prefix"
class="oe_inline" class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_refund_sequence_next" <field name="sale_refund_sequence_next"
class="oe_inline" class="oe_inline"
@ -182,7 +182,7 @@
<div> <div>
<label for="purchase_sequence_next"/> <label for="purchase_sequence_next"/>
<field name="purchase_sequence_prefix" <field name="purchase_sequence_prefix"
class="oe_inline" class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_sequence_next" <field name="purchase_sequence_next"
class="oe_inline" class="oe_inline"
@ -191,7 +191,7 @@
<div> <div>
<label for="purchase_refund_sequence_next"/> <label for="purchase_refund_sequence_next"/>
<field name="purchase_refund_sequence_prefix" <field name="purchase_refund_sequence_prefix"
class="oe_inline" class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_refund_sequence_next" <field name="purchase_refund_sequence_next"
class="oe_inline" class="oe_inline"

34
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -19,32 +19,24 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Account"> <search string="Analytic Account">
<group col="8" colspan="4"> <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
<field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
<field name="date"/> <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
<separator orientation="vertical"/> <separator/>
<filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/> <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
<filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/> help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
<separator orientation="vertical"/> <separator/>
<filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
name="renew" <separator/>
help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" /> <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
<separator orientation="vertical"/> <field name="partner_id"/>
<filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" /> <field name="user_id"/>
<filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
<separator orientation="vertical"/>
<filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" /> <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" />
<filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" /> <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
</group> </group>

18
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -46,23 +46,17 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Accounts"> <search string="Accounts">
<group> <field name="date_stop"/>
<field name="date_stop"/> <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical"/> <field name="product_id"/>
<field name="analytic_id" groups="analytic.group_analytic_accounting"/> <field name="partner_id"/>
<field name="product_id"/> <field name="user_id"/>
<field name="partner_id"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/> <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" help="Partner"/> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" help="Partner"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" help="Product" /> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" help="Product" />
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/> <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company" /> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company" />
</group> </group>
</search> </search>

29
addons/account_asset/account_asset_invoice_view.xml
View File

@ -1,22 +1,19 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
#--------------------------------------------------------- <!-- Fiscal Year -->
# Fiscal Year <record model="ir.ui.view" id="view_account_invoice_asset_form">
#--------------------------------------------------------- <field name="name">account.invoice.line.form</field>
<field name="model">account.invoice.line</field>
<record model="ir.ui.view" id="view_account_invoice_asset_form"> <field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="name">account.invoice.line.form</field> <field name="type">form</field>
<field name="model">account.invoice.line</field> <field name="arch" type="xml">
<field name="inherit_id" ref="account.view_invoice_line_form"/> <field name="account_id" position="after">
<field name="type">form</field> <field name="asset_category_id"/>
<field name="arch" type="xml"> </field>
<field name="account_id" position="after">
<field name="asset_category_id"/>
</field> </field>
</field> </record>
</record>
</data> </data>
</openerp> </openerp>

18
addons/account_asset/account_asset_view.xml
View File

@ -65,7 +65,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Asset Category"> <search string="Search Asset Category">
<field name="name" string="Asset Category"/> <field name="name" string="Asset Category"/>
<separator orientation="vertical"/>
<field name="journal_id"/> <field name="journal_id"/>
</search> </search>
</field> </field>
@ -231,17 +230,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Account Asset"> <search string="Account Asset">
<group col="10" colspan="12"> <field name="name" string="Asset"/>
<field name="name" string="Asset"/> <field name="purchase_date"/>
<separator orientation="vertical"/> <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
<field name="purchase_date"/> <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
<separator orientation="vertical"/> <field name="category_id"/>
<filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/> <field name="partner_id"/>
<filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
<separator orientation="vertical"/>
<field name="category_id"/>
<field name="partner_id"/>
</group>
</search> </search>
</field> </field>
</record> </record>

4
addons/account_asset/i18n/es_EC.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n" "X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15702)\n" "X-Generator: Launchpad (build 15719)\n"
#. module: account_asset #. module: account_asset
#: view:account.asset.asset:0 #: view:account.asset.asset:0

28
addons/account_asset/report/account_asset_report_view.xml
View File

@ -43,34 +43,24 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Assets Analysis"> <search string="Assets Analysis">
<group col="10" colspan="12"> <field name="purchase_date"/>
<field name="purchase_date"/> <field name="depreciation_date"/>
<field name="depreciation_date"/> <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
<separator orientation="vertical"/> <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/> <separator/>
<filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/> <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/>
<separator orientation="vertical"/> <field name="asset_id"/>
<filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" <field name="asset_category_id"/>
context="{'unposted_value_visible': 0}"/>
<separator orientation="vertical"/>
<field name="asset_id"/>
<field name="asset_category_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="partner_id"/> <field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Asset" name="asset" context="{'group_by':'asset_id'}"/> <filter string="Asset" name="asset" context="{'group_by':'asset_id'}"/>
<filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/> <filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" />
<filter string="Purchase Date" icon="terp-go-month" <filter string="Purchase Date" icon="terp-go-month"
domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/> domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/>
<separator orientation="vertical" />
<filter string="Depreciation Date" icon="terp-go-today" <filter string="Depreciation Date" icon="terp-go-today"
domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/> domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/>
</group> </group>

27
addons/account_bank_statement_extensions/account_bank_statement_view.xml
View File

@ -123,22 +123,16 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Bank Transactions"> <search string="Search Bank Transactions">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/> <field name="val_date"/>
<separator orientation="vertical"/> <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
<field name="val_date"/> <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
<separator orientation="vertical"/> <separator/>
<filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/> <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
<filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/> <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
<separator orientation="vertical"/> <field name="journal_id"/>
<filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/> <field name="statement_id"/>
<filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/> <field name="globalisation_id" string="Glob. Id"/>
<separator orientation="vertical"/>
<field name="journal_id"/>
<field name="statement_id"/>
<field name="globalisation_id" string="Glob. Id"/>
</group>
<newline/>
<group string="Extended Filters..." expand="0"> <group string="Extended Filters..." expand="0">
<field name="account_id"/> <field name="account_id"/>
<field name="partner_id"/> <field name="partner_id"/>
@ -146,7 +140,6 @@
<field name="globalisation_amount" string="Glob. Amount"/> <field name="globalisation_amount" string="Glob. Amount"/>
<field name="note"/> <field name="note"/>
</group> </group>
<newline/>
<group string="Group By..." expand="1"> <group string="Group By..." expand="1">
<filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/> <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
<filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/> <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>

19
addons/account_budget/account_budget_view.xml
View File

@ -19,7 +19,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Budgetary Position"> <search string="Budgetary Position">
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</search> </search>
</field> </field>
</record> </record>
@ -201,17 +201,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Budget"> <search string="Budget">
<group> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/> <field name="date_from"/>
<separator orientation="vertical"/> <field name="date_to"/>
<field name="date_from"/> <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
<field name="date_to"/> <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
<separator orientation="vertical"/> <field name="state"/>
<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
<filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
<separator orientation="vertical"/>
<field name="state"/>
</group>
</search> </search>
</field> </field>
</record> </record>

71
addons/account_coda/account_coda_view.xml
View File

@ -12,18 +12,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="CODA Bank Account Configuration"> <search string="CODA Bank Account Configuration">
<field name="name" <field name="name" filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]" string="CODA Bank Account"/>
filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]"
string="CODA Bank Account"/>
<separator orientation="vertical"/>
<filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/> <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
<filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/> <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
<separator orientation="vertical"/>
<field name="bank_id"/> <field name="bank_id"/>
<field name="journal"/> <field name="journal"/>
<field name="currency" widget="selection"/> <field name="currency"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/> <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
<filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/> <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
@ -271,20 +266,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search CODA Files"> <search string="Search CODA Files">
<group col="10" colspan="4">
<field name="coda_creation_date"/> <field name="coda_creation_date"/>
<field name="date"/> <field name="date"/>
<field name="user_id" widget='selection'/> <field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</group> <group expand="0" string="Group By...">
<newline/> <filter string="CODA Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'coda_creation_date'}"/>
<group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="CODA Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'coda_creation_date'}"/> <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
<separator orientation="vertical"/> </group>
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -389,20 +379,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search CODA Bank Statements"> <search string="Search CODA Bank Statements">
<group col="8" colspan="4"> <field name="name" string="CODA Bank Statement"/>
<field name="name" <field name="date"/>
string="CODA Bank Statement"/> <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
<separator orientation="vertical"/> <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
<field name="date"/> <field name="period_id"/>
<separator orientation="vertical"/> <field name="coda_bank_account_id"/>
<filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/> <field name="journal_id" domain="[('type', '=', 'bank')]"/>
<filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
<separator orientation="vertical"/>
<field name="period_id"/>
<field name="coda_bank_account_id"/>
<field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@ -481,20 +464,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Bank Transactions"> <search string="Search Bank Transactions">
<group col='6' colspan='4'> <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
<field name="name" <field name="val_date"/>
filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
string="Bank Transaction"/> <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
<separator orientation="vertical"/> <field name="statement_id"/>
<field name="val_date"/> <field name="globalisation_id" string="Glob. Id"/>
<separator orientation="vertical"/>
<filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
<filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
<separator orientation="vertical"/>
<field name="statement_id"/>
<field name="globalisation_id" string="Glob. Id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="coda_bank_account_id"/> <field name="coda_bank_account_id"/>
<field name="account_id"/> <field name="account_id"/>

7
addons/account_followup/account_followup_view.xml
View File

@ -71,11 +71,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Follow-up"> <search string="Search Follow-up">
<group> <field name="name" string="Follow-up"/>
<field name="name" string="Follow-up"/> <field name="company_id" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search> </search>
</field> </field>
</record> </record>

29
addons/account_followup/report/account_followup_report.xml
View File

@ -40,31 +40,20 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Follow-ups Sent"> <search string="Follow-ups Sent">
<group> <field name="date_move"/>
<field name="date_move"/> <field name="date_move_last"/>
<field name="date_move_last"/> <filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]"
<separator orientation="vertical"/> help="Follow-up Entries with period in current year"/>
<filter icon="terp-go-year" string="This Fiscal year" <separator/>
name="fiscalyear" <filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]"
domain="[('period_id','in','current_year')]" help = "Including journal entries marked as a litigation"/>
help="Follow-up Entries with period in current year"/> <field name="partner_id"/>
<separator orientation="vertical"/> <field name="balance"/>
<filter icon="terp-camera_test" string="Not Litigation"
domain="[('blocked','=', False)]"
help = "Including journal entries marked as a litigation"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="balance"/>
</group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
<filter string="Litigation" icon="terp-camera_test" context="{'group_by':'blocked'}" /> <filter string="Litigation" icon="terp-camera_test" context="{'group_by':'blocked'}" />
<separator orientation="vertical"/>
<filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" /> <filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
<filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" /> <filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" /> <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
</group> </group>
</search> </search>

2
addons/account_followup/wizard/account_followup_print_view.xml
View File

@ -42,9 +42,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Partner to Remind"> <search string="Partner to Remind">
<field name="date_followup"/> <field name="date_followup"/>
<separator orientation="vertical"/>
<filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/> <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
<separator orientation="vertical"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="max_followup_id"/> <field name="max_followup_id"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>

30
addons/account_payment/account_payment_view.xml
View File

@ -47,12 +47,9 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Payment Mode"> <search string="Payment Mode">
<field name="name" <field name="name" string="Payment Mode"/>
string="Payment Mode"/> <field name="journal"/>
<separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="journal" widget='selection'/>
<field name="company_id" widget='selection' groups="base.group_multi_company"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
</group> </group>
@ -216,20 +213,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payment Orders"> <search string="Search Payment Orders">
<group> <field name="reference" string="Payment Order"/>
<field name="reference" <field name="date_done"/>
string="Payment Order"/> <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<separator orientation="vertical"/> <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
<field name="date_done"/> <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
<separator orientation="vertical"/> <field name="mode"/>
<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> <field name="state"/>
<filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
<filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
<separator orientation="vertical"/>
<field name="mode" widget='selection'/>
<field name="state"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/> <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>

24
addons/account_voucher/account_voucher_view.xml
View File

@ -126,21 +126,15 @@
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Vouchers"> <search string="Search Vouchers">
<group> <field name="number" string="Voucher"/>
<field name="number" string="Voucher"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<field name="date"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/> <separator/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <field name="partner_id"/>
<separator orientation="vertical"/> <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/> <field name="period_id"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>

38
addons/account_voucher/report/account_voucher_sales_receipt_view.xml
View File

@ -48,48 +48,26 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Sales Receipt Analysis"> <search string="Sales Receipt Analysis">
<group> <field name="date"/>
<field name="date"/> <field name="date_due"/>
<field name="date_due"/> <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/>
<separator orientation="vertical"/> <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/>
<filter string="Draft" <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/>
icon="terp-document-new" <field name="partner_id"/>
domain="[('state','=','draft')]"
help = "Draft Vouchers"/>
<filter string="Pro-forma"
icon="terp-gtk-media-pause"
domain="[('state','=','proforma')]"
help = "Pro-forma Vouchers"/>
<filter string="Posted"
name="current"
icon="terp-check"
domain="[('state','not in', ('draft','cancel'))]"
help = "Validated Vouchers"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="journal_id" widget="selection"/> <field name="journal_id"/>
<field name="account_id"/> <field name="account_id"/>
<field name="pay_now"/> <field name="pay_now"/>
<separator orientation="vertical" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/> <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>

109
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -8,21 +8,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Vouchers"> <search string="Search Vouchers">
<group> <field name="number" string="Voucher"/>
<field name="number" string="Voucher"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<field name="date"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/> <field name="partner_id" string="Customer"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <field name="period_id"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
<separator orientation="vertical"/>
<field name="partner_id" string="Customer"/>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@ -40,21 +32,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Vouchers"> <search string="Search Vouchers">
<group> <field name="number" string="Voucher"/>
<field name="number" string="Voucher"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<field name="date"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/> <field name="partner_id" string="Supplier"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <field name="period_id"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
<separator orientation="vertical"/>
<field name="partner_id" string="Supplier"/>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@ -72,7 +56,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bill Payment" version="7.0"> <form string="Bill Payment" version="7.0">
<group col="6"> <group col="6">
<field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" /> <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}"/>
<field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="journal_id" <field name="journal_id"
domain="[('type','in',['bank', 'cash'])]" domain="[('type','in',['bank', 'cash'])]"
@ -94,8 +78,7 @@
<tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0"> <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"/>
/>
<field name="account_id" domain="[('type','=','payable')]"/> <field name="account_id" domain="[('type','=','payable')]"/>
<field name="date_original" readonly="1"/> <field name="date_original" readonly="1"/>
<field name="date_due" readonly="1"/> <field name="date_due" readonly="1"/>
@ -108,8 +91,7 @@
<tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0"> <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"/>
/>
<field name="account_id" domain="[('type','=','payable')]"/> <field name="account_id" domain="[('type','=','payable')]"/>
<field name="date_original" readonly="1"/> <field name="date_original" readonly="1"/>
<field name="date_due" readonly="1"/> <field name="date_due" readonly="1"/>
@ -156,11 +138,11 @@
<group> <group>
<group> <group>
<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" string="Supplier"/> <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" string="Supplier"/>
<label for="amount" string="Amount"/> <label for="amount" string="Amount"/>
<div> <div>
<field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/> <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
<field name="currency_id" class="oe_inline"/> <field name="currency_id" class="oe_inline"/>
</div> </div>
<field name="journal_id" <field name="journal_id"
domain="[('type','in',['bank', 'cash'])]" domain="[('type','in',['bank', 'cash'])]"
invisible="context.get('line_type', False)" invisible="context.get('line_type', False)"
@ -182,8 +164,7 @@
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
required="1" required="1"/>
/>
<field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/> <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
<field name="date_original" readonly="1"/> <field name="date_original" readonly="1"/>
<field name="date_due" readonly="1"/> <field name="date_due" readonly="1"/>
@ -198,8 +179,7 @@
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
required="1" required="1"/>
/>
<field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/> <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
<field name="date_original" readonly="1"/> <field name="date_original" readonly="1"/>
<field name="date_due" readonly="1"/> <field name="date_due" readonly="1"/>
@ -278,7 +258,7 @@
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_voucher_filter_vendor_pay"/> <field name="search_view_id" ref="view_voucher_filter_vendor_pay"/>
<field name="target">current</field> <field name="target">current</field>
<field name="help">Click on "Create" to register a supplier payment. <field name="help">Click on "Create" to register a supplier payment.
&lt;p&gt; &lt;p&gt;
Track payments you do to your supplier and amounts you pay.</field> Track payments you do to your supplier and amounts you pay.</field>
</record> </record>
@ -316,14 +296,13 @@
<group> <group>
<group> <group>
<field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/> <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
<label for="amount" <label for="amount" string="Paid Amount"/>
string="Paid Amount"/> <div>
<div>
<field name="amount" class="oe_inline" <field name="amount" class="oe_inline"
invisible="context.get('line_type', False)" invisible="context.get('line_type', False)"
on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="currency_id" class="oe_inline"/> <field name="currency_id" class="oe_inline"/>
</div> </div>
<field name="journal_id" <field name="journal_id"
domain="[('type','in',['bank', 'cash'])]" domain="[('type','in',['bank', 'cash'])]"
@ -347,7 +326,7 @@
</group> </group>
<notebook> <notebook>
<page string="Payment Information"> <page string="Payment Information" groups="base.group_user">
<field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)"> <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
<tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0"> <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@ -369,8 +348,7 @@
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
required="1" required="1"/>
/>
<field name="account_id" groups="base.group_no_one" domain="[('type','=','receivable')]"/> <field name="account_id" groups="base.group_no_one" domain="[('type','=','receivable')]"/>
<field name="date_original" readonly="1"/> <field name="date_original" readonly="1"/>
<field name="date_due" readonly="1"/> <field name="date_due" readonly="1"/>
@ -409,21 +387,21 @@
<field name="audit"/> <field name="audit"/>
</group> </group>
<field name="move_ids" readonly="1"> <field name="move_ids" readonly="1">
<tree string="Journal Items"> <tree string="Journal Items">
<field name="move_id"/> <field name="move_id"/>
<field name="ref"/> <field name="ref"/>
<field name="date"/> <field name="date"/>
<field name="statement_id"/> <field name="statement_id"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="account_id"/> <field name="account_id"/>
<field name="name"/> <field name="name"/>
<field name="debit"/> <field name="debit"/>
<field name="credit"/> <field name="credit"/>
<field name="state"/> <field name="state"/>
<field name="reconcile_id"/> <field name="reconcile_id"/>
<field name="amount_currency"/> <field name="amount_currency"/>
<field name="currency_id"/> <field name="currency_id"/>
</tree> </tree>
</field> </field>
</page> </page>
</notebook> </notebook>
@ -464,5 +442,6 @@
<menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="12" <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="12"
id="menu_action_vendor_receipt" parent="account.menu_finance_receivables"/> id="menu_action_vendor_receipt" parent="account.menu_finance_receivables"/>
</data> </data>
</openerp> </openerp>

44
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -7,21 +7,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Vouchers"> <search string="Search Vouchers">
<group> <field name="number" string="Voucher"/>
<field name="number" string="Voucher"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<field name="date"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/> <field name="partner_id" string="Supplier"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <field name="period_id"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
<separator orientation="vertical"/>
<field name="partner_id" string="Supplier"/>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@ -38,21 +30,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Vouchers"> <search string="Search Vouchers">
<group> <field name="number" string="Voucher"/>
<field name="number" string="Voucher"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<field name="date"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/> <field name="partner_id" string="Customer"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <field name="period_id"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
<separator orientation="vertical"/>
<field name="partner_id" string="Customer"/>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>

1
addons/association/profile_association.xml
View File

@ -5,6 +5,7 @@
<!-- Top menu item --> <!-- Top menu item -->
<menuitem name="Association" <menuitem name="Association"
id="base.menu_association" id="base.menu_association"
groups="base.group_user"
sequence="70"/> sequence="70"/>
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/> <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
<menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/> <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>

24
addons/audittrail/audittrail_view.xml
View File

@ -63,15 +63,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Audittrail Rule"> <search string="Search Audittrail Rule">
<group> <field name="name" string="Audittrail Rule"/>
<field name="name" string="Audittrail Rule"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Rule"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Rule"/> <field name="object_id" string="Model"/>
<filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
<separator orientation="vertical"/>
<field name="object_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group> </group>
@ -171,16 +166,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Audittrail Log"> <search string="Search Audittrail Log">
<group> <field name="name" string="Audittrail Log"/>
<field name="name" string="Audittrail Log"/> <field name="object_id" string="Model"/>
<separator orientation="vertical"/> <field name="user_id"/>
<field name="object_id"/>
<field name="user_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
</group> </group>

91
addons/base_calendar/base_calendar_view.xml
View File

@ -84,40 +84,20 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Invitations"> <search string="Search Invitations">
<field name="email" string="Email"/> <field name="email" string="Email"/>
<separator orientation="vertical"/> <field name="event_date"/>
<field name="event_date"/> <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
<separator orientation="vertical"/> <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
<filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
domain="[('state','=', 'needs-action')]" <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
help="Invitations To Review" /> <field name="user_id" string="Responsible"/>
<filter icon="terp-check" string="Accepted" <field name="cutype" string="Invitation type"/>
domain="[('state','=', 'accepted')]"
help="Accepted Invitations" />
<filter icon="terp-dialog-close" string="Declined"
domain="[('state','=', 'declined')]"
help="Declined Invitations" />
<filter icon="gtk-sort-descending" string="Delegated"
domain="[('state','=', 'delegated')]"
help="Delegated Invitations" />
<separator orientation="vertical"/>
<field name="user_id" string="Responsible"/>
<separator orientation="vertical"/>
<field name="cutype" string="Invitation type"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]" <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
context="{'group_by':'user_id'}" /> <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
<filter string="Contact" icon="terp-personal" domain="[]" <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" />
context="{'group_by':'partner_id'}" /> <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" />
<separator orientation="vertical" /> <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" />
<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
domain="[]" context="{'group_by':'cutype'}" />
<filter string="Role" icon="terp-gtk-select-all"
domain="[]" context="{'group_by':'role'}" />
<filter string="Required Reply" icon="terp-mail-replied"
domain="[]" context="{'group_by':'rsvp'}" />
<separator orientation="vertical" />
<filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type" <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
domain="[]" context="{'group_by':'state'}" /> domain="[]" context="{'group_by':'state'}" />
</group> </group>
@ -414,37 +394,20 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Events"> <search string="Search Events">
<group> <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
<field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/> <field name="show_as"/>
<separator orientation="vertical"/> <field name="class" string="Privacy"/>
<filter icon="terp-go-today" string="My Events" <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
domain="[('user_id','=',uid)]" <separator/>
help="My Events" /> <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
<separator orientation="vertical"/> <field name="user_id"/>
<filter icon="terp-check" string="Confirmed" <group expand="0" string="Group By...">
domain="[('state','=','confirmed')]" <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
help="Confirmed Events" /> <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
<separator orientation="vertical"/> <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" />
<field name="user_id"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
<field name="show_as"/> </group>
<field name="class" string="Privacy"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]"
context="{'group_by':'user_id'}" />
<separator orientation="vertical" />
<filter string="Availability" icon="terp-camera_test"
domain="[]" context="{'group_by':'show_as'}" />
<filter string="Privacy" icon="terp-locked"
domain="[]" context="{'group_by':'class'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
context="{'group_by':'state'}" />
<separator orientation="vertical" />
<filter string="Date" icon="terp-go-month"
domain="[]" context="{'group_by':'date'}" />
</group>
</search> </search>
</field> </field>
</record> </record>

18
addons/base_calendar/crm_meeting_view.xml
View File

@ -302,18 +302,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Meetings"> <search string="Search Meetings">
<group> <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
<field name="name" string="Meeting" <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
filter_domain="[('name','ilike',self)]"/> <separator/>
<filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
name="needaction_pending" domain="[('needaction_pending','=',True)]"/> <field name="user_id"/>
<separator orientation="vertical"/> <field name="partner_ids"/>
<filter string="My Meetings" help="My Meetings" icon="terp-personal"
domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/>
<field name="user_id"/>
<field name="partner_ids"/>
</group>
</search> </search>
</field> </field>
</record> </record>

1
addons/base_setup/__openerp__.py
View File

@ -46,5 +46,6 @@ Shows you a list of applications features to install from.
'certificate': '0086711085869', 'certificate': '0086711085869',
'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',], 'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
'js': ['static/src/js/base_setup.js'], 'js': ['static/src/js/base_setup.js'],
'css': ['static/src/css/base_setup.css'],
} }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

85
addons/base_setup/base_setup_views.xml
View File

@ -1,47 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- Show menus that are hidden in module base --> <!-- Show menus that are hidden in module base -->
<record id="base.menu_res_company_global" model="ir.ui.menu"> <record id="base.menu_res_company_global" model="ir.ui.menu">
<field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/> <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
</record> </record>
<record id="base.menu_users" model="ir.ui.menu"> <record id="base.menu_users" model="ir.ui.menu">
<field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/> <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
</record> </record>
<record id="base.menu_publisher_warranty" model="ir.ui.menu"> <record id="base.menu_publisher_warranty" model="ir.ui.menu">
<field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/> <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
</record> </record>
<!-- Specify Your Terminology Config Wiz--> <!-- Specify your terminology config wiz -->
<record id="base_setup_terminology_form" model="ir.ui.view"> <record id="base_setup_terminology_form" model="ir.ui.view">
<field name="name">Specify Your Terminology</field> <field name="name">Specify Your Terminology</field>
<field name="model">base.setup.terminology</field> <field name="model">base.setup.terminology</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/> <field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<form position="attributes" version="7.0"> <form position="attributes" version="7.0">
<attribute name="string">Specify Your Terminology</attribute> <attribute name="string">Specify Your Terminology</attribute>
</form> </form>
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<label string="You can use this wizard to change the terminologies for customers in the whole application."/> <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
<separator string="Specify Your Terminology"/> <separator string="Specify Your Terminology"/>
<group colspan="4"> <group colspan="4">
<field colspan="4" name="partner"/> <field colspan="4" name="partner"/>
</group> </group>
</group> </group>
</data> </data>
</field> </field>
</record> </record>
<record id="action_partner_terminology_config_form" model="ir.actions.act_window"> <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
<field name="name">Use another word to say "Customer"</field> <field name="name">Use another word to say "Customer"</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">base.setup.terminology</field> <field name="res_model">base.setup.terminology</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="base_setup_terminology_form"/> <field name="view_id" ref="base_setup_terminology_form"/>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

5
addons/base_setup/res_config_view.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
@ -39,12 +40,12 @@
<label for="module_portal"/> <label for="module_portal"/>
</div> </div>
<div> <div>
<label string="Configure outgoing email servers"/> <label string="Configure outgoing email servers"/>
<button type="action" <button type="action"
name="%(base.action_ir_mail_server_list)d" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute" class="oe_link"/> string="Configure" icon="gtk-execute" class="oe_link"/>
</div> </div>
</div> </div>
</group> </group>
</form> </form>
</field> </field>

1
addons/base_setup/res_partner_view.xml
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>

4
addons/base_setup/static/src/css/base_setup.css Normal file
View File

@ -0,0 +1,4 @@
.oe_form_configuration .oe_form_group td:last-child .oe_form_label_help,
.oe_form_configuration .oe_form_group td:last-child .oe_form_label {
font-weight: normal;
}

8
addons/caldav/caldav_view.xml
View File

@ -159,15 +159,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Calendars"> <search string="Calendars">
<field name="name" string="Calendar"/> <field name="name" string="Calendar"/>
<separator orientation="vertical"/>
<filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/> <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
<separator/>
<filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/> <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
<filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/> <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
<separator/>
<filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/> <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection"/>
<field name="collection_id"/>
<field name="type"/> <field name="type"/>
<field name="user_id"/>
<field name="collection_id"/>
</search> </search>
</field> </field>
</record> </record>

94
addons/crm/crm_lead_view.xml
View File

@ -51,7 +51,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Stage Search"> <search string="Stage Search">
<field name="name" string="Stage Name"/> <field name="name" string="Stage Name"/>
<separator orientation="vertical"/>
<field name="state"/> <field name="state"/>
<field name="type"/> <field name="type"/>
</search> </search>
@ -351,44 +350,30 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leads"> <search string="Search Leads">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
<!-- subjects is not set as store=True so, it is placed outside filter_domain--> <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
<field name="subjects"/> <field name="subjects"/>
<separator orientation="vertical"/>
<field name="create_date"/> <field name="create_date"/>
<separator orientation="vertical"/> <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
<filter icon="terp-check" <separator/>
string="New" <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
name="new" help="New Leads" <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
domain="[('state','=','draft')]"/> <separator/>
<filter icon="terp-camera_test" <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
string="Open" <separator/>
name="open" <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
domain="[('state','=','open')]"/>
<filter string="Unassigned Leads"
icon="terp-personal-"
domain="[('user_id','=', False)]"
help="Unassigned Leads" />
<filter string="Leads Assigned to Me or My Team(s)"
icon="terp-personal+"
context="{'invisible_section': False}"
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="Leads that are assigned to one of the sale teams I manage, or to me"/> help="Leads that are assigned to one of the sale teams I manage, or to me"/>
<separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
<field name="section_id" widget="selection" <field name="section_id" context="{'invisible_section': False}"/>
context="{'invisible_section': False}"/>
<field name="country_id" context="{'invisible_country': False}"/> <field name="country_id" context="{'invisible_country': False}"/>
<separator orientation="vertical"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/> <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
<filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/> <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
<filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Campaign" icon="terp-gtk-jump-to-rtl" <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'type_id'}" /> domain="[]" context="{'group_by':'type_id'}" />
@ -397,18 +382,11 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" groups="base.group_no_one"/> <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
<filter string="Creation" help="Create date" icon="terp-go-month"
domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
</group> </group>
<separator orientation="vertical"/>
<group string="Display"> <group string="Display">
<filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/> <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
<filter string="Show Sales Team" <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
icon="terp-personal+"
context="{'invisible_section': False}"
domain="[]"
help="Show Sales Team"/>
</group> </group>
</search> </search>
</field> </field>
@ -604,56 +582,36 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Opportunities"> <search string="Search Opportunities">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<field name="name" string="Opportunity / Customer" <field name="name" string="Opportunity / Customer"
filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/> filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
<separator orientation="vertical"/> <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
<filter icon="terp-check" <separator/>
string="New" help="New Opportunities" <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
name="new" <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
domain="[('state','=','draft')]"/> <separator/>
<filter icon="terp-camera_test" <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
string="Open" help="Open Opportunities" <separator/>
name="open" <filter string="Opportunities Assigned to Me or My Team(s)" icon="terp-personal+"
domain="[('state','=','open')]"/> domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
<filter string="Unassigned Opportunities"
icon="terp-personal-"
domain="[('user_id','=', False)]"
help="Unassigned Opportunities" />
<filter string="Opportunities Assigned to Me or My Team(s)" icon="terp-personal+"
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
context="{'invisible_section': False}"
help="Opportunities that are assigned to either me or one of the sale teams I manage" /> help="Opportunities that are assigned to either me or one of the sale teams I manage" />
<separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
<field name="country_id"/> <field name="country_id"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="section_id" <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
context="{'invisible_section': False, 'default_section_id': self}"/>
<newline/>
<group expand="0" string="Group By..." colspan="16"> <group expand="0" string="Group By..." colspan="16">
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
<filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/> <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
<filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" /> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" />
<filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
<filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" /> <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
</group> </group>
<group string="Display"> <group string="Display">
<filter string="Show Sales Team" <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
icon="terp-personal+"
context="{'invisible_section': False}"
domain="[]"
help="Show Sales Team"/>
</group> </group>
</search> </search>
</field> </field>

38
addons/crm/crm_phonecall_view.xml
View File

@ -214,40 +214,24 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Phonecalls"> <search string="Search Phonecalls">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<separator orientation="vertical"/>
<field name="name" string="Phonecalls"/> <field name="name" string="Phonecalls"/>
<separator orientation="vertical"/>
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
<separator/>
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/> <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
<filter string="Unassigned Phonecalls" <separator/>
icon="terp-personal-" <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
domain="[('user_id','=',False)]" <separator/>
help="Unassigned Phonecalls"/> <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
<filter string="Phone Calls Assigned to Me or My Team(s)"
icon="terp-personal+"
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="Phone Calls that are assigned to me or to my team(s)" /> help="Phone Calls that are assigned to me or to my team(s)" />
<separator orientation="vertical"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="section_id" <field name="section_id" string="Sales Team"/>
widget="selection" string="Sales Team"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
context="{'group_by':'partner_id'}" /> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
<filter string="Responsible" icon="terp-personal" <filter string="Creation" icon="terp-go-month" help="Creation Date" domain="[]" context="{'group_by':'create_date'}" />
domain="[]" context="{'group_by':'user_id'}" /> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Date of Call" />
<separator orientation="vertical" />
<filter string="Creation" icon="terp-go-month" help="Creation Date"
domain="[]" context="{'group_by':'create_date'}" />
<filter string="Date" icon="terp-go-month" domain="[]"
context="{'group_by':'date'}" help="Date of Call" />
</group> </group>
</search> </search>
</field> </field>

54
addons/crm/crm_report_view.xml
View File

@ -69,15 +69,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Cases by Team and Type"> <search string="Cases by Team and Type">
<group> <field name="name"/>
<field name="name"/> <field name="month"/>
<separator orientation="vertical"/> <field name="nbr"/>
<field name="month"/> <field name="state"/>
<field name="section_id" widget="selection" /> <field name="section_id"/>
<field name="category2_id"/> <field name="category2_id"/>
<field name="nbr"/>
<field name="state"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -157,14 +154,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Cases by Team and Stage"> <search string="Cases by Team and Stage">
<group> <field name="name"/>
<field name="name"/> <field name="month"/>
<separator orientation="vertical"/> <field name="nbr"/>
<field name="month"/> <field name="state"/>
<field name="section_id" widget="selection"/> <field name="section_id"/>
<field name="nbr"/>
<field name="state"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -229,14 +223,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Cases by Section, Category and Stage"> <search string="Cases by Section, Category and Stage">
<group> <field name="name"/>
<field name="name"/> <field name="month"/>
<separator orientation="vertical"/> <field name="nbr"/>
<field name="month"/> <field name="state"/>
<field name="section_id" widget="selection"/> <field name="section_id"/>
<field name="nbr"/>
<field name="state"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -318,14 +309,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Cases by User"> <search string="Search Cases by User">
<group> <field name="name"/>
<field name="name"/> <field name="month"/>
<separator orientation="vertical"/> <field name="nbr"/>
<field name="month"/> <field name="state"/>
<field name="section_id" widget="selection"/> <field name="section_id"/>
<field name="nbr"/>
<field name="state"/>
</group>
</search> </search>
</field> </field>
</record> </record>

78
addons/crm/report/crm_lead_report_view.xml
View File

@ -70,47 +70,26 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leads Analysis"> <search string="Leads Analysis">
<group> <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
<filter icon="terp-personal" <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
name="lead" <separator/>
string="Lead" <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/>
domain="[('type','=', 'lead')]" <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/>
help="Show only lead"/> <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/>
<filter icon="terp-personal+" <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
string="Opportunity" <separator/>
name="opportunity" <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
domain="[('type','=','opportunity')]" help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
help="Show only opportunity"/> <separator/>
<separator orientation="vertical" /> <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
<filter icon="terp-check" <field name="section_id" context="{'invisible_section': False}"/>
string="New" <field name="user_id" string="Salesperson"/>
domain="[('state','=','draft')]"
help="Leads/Opportunities which are in New state"/>
<filter icon="terp-camera_test"
string="Open"
domain="[('state','=','open')]"
help="Leads/Opportunities which are in open state"/>
<filter icon="gtk-media-pause"
string="Pending"
domain="[('state','=','pending')]"
help="Leads/Opportunities which are in pending state"/>
<filter icon="terp-dialog-close"
string="Closed"
domain="[('state','=','done')]"
help="Leads/Opportunities which are in done state"/>
<filter string="My Sales Team(s)" icon="terp-personal+"
context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]"
help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
<filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
<separator orientation="vertical" />
<field name="section_id"
context="{'invisible_section': False}"/>
<field name="user_id" string="Salesperson"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="partner_id"/> <field name="partner_id"/>
<field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
<field name="type_id"/>
<field name="channel_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" /> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
<field name="type_id" widget="selection"/> <field name="type_id" widget="selection"/>
@ -122,22 +101,21 @@
<field name="opening_date"/> <field name="opening_date"/>
<field name="date_closed"/> <field name="date_closed"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Salesperson" name="user" icon="terp-personal" <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
domain="[]" context="{'group_by':'user_id'}" /> <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"
context="{'group_by':'section_id'}" />
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
<filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" /> <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
<filter string="Company" icon="terp-go-home" <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
domain="[]"
context="{'group_by':'company_id'}"
groups="base.group_multi_company"/>
<separator orientation="vertical" />
<filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
<filter string="Exp. Closing" icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
<filter string="Campaign" icon="terp-gtk-jump-to-rtl" <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'type_id'}" /> domain="[]" context="{'group_by':'type_id'}" />
<filter string="Channel" icon="terp-call-start" <filter string="Channel" icon="terp-call-start"

70
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -51,65 +51,37 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<group> <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]"
<filter icon="terp-gtk-go-back-rtl" help="Phone calls which are in draft and open state"/>
string="Todo" <filter icon="terp-camera_test" string="Held" domain="[('state','=','done')]"
domain="[('state','in',('draft','open'))]" help="Phone calls which are in closed state"/>
help="Phone calls which are in draft and open state"/> <filter icon="gtk-media-pause" string="Not Held" domain="[('state','=','pending')]"
<filter icon="terp-camera_test" help="Phone calls which are in pending state"/>
string="Held" <separator/>
domain="[('state','=','done')]" <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
help="Phone calls which are in closed state"/> help="Phone calls that are assigned to one of the sale teams I manage"/>
<filter icon="gtk-media-pause" <separator/>
string="Not Held" <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
domain="[('state','=','pending')]" <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
help="Phone calls which are in pending state"/> <field name="user_id" string="Salesperson"/>
<filter string="My Sales Team(s)"
icon="terp-personal+"
context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]"
help="Phone calls that are assigned to one of the sale teams I manage"/>
<filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
<separator orientation="vertical"/>
<field name="section_id" string="Sales Team"
context="{'invisible_section': False}"/>
<field name="user_id" string="Salesperson"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="partner_id"/> <field name="partner_id"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<newline/>
<field name="creation_date"/> <field name="creation_date"/>
<field name="opening_date"/> <field name="opening_date"/>
<field name="date_closed"/> <field name="date_closed"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Salesperson" name="Salesperson" icon="terp-personal" <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
domain="[]" context="{'group_by':'user_id'}" /> <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"
context="{'group_by':'section_id'}" />
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
<separator orientation="vertical" />
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Category" icon="terp-stock_symbol-selection" <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
domain="[]" context="{'group_by':'categ_id'}" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
domain="[]" context="{'group_by':'state'}" /> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of call"/>
<separator orientation="vertical" /> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of call"/>
<filter string="Company" icon="terp-go-home" <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of call"/>
domain="[]"
context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" />
<filter string="Day" icon="terp-go-today"
domain="[]" context="{'group_by':'day'}" help="Date of call"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}" help="Month of call"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}" help="Year of call"/>
</group> </group>
</search> </search>
</field> </field>

1
addons/crm/res_partner_view.xml
View File

@ -37,6 +37,7 @@
<field eval="18" name="priority"/> <field eval="18" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="category_id" position="after"> <field name="category_id" position="after">
<field name="section_id" completion="1"/>
<field name="section_id" completion="1" widget="selection" context="{'invisible_section': False}"/> <field name="section_id" completion="1" widget="selection" context="{'invisible_section': False}"/>
</field> </field>
<xpath expr="//field[@name='user_id']" position="after"> <xpath expr="//field[@name='user_id']" position="after">

56
addons/crm_claim/crm_claim_view.xml
View File

@ -199,50 +199,22 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Claims"> <search string="Search Claims">
<field name="name" string="Claims"/> <field name="name" string="Claims"/>
<separator orientation="vertical"/> <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
<filter icon="terp-check" string="New" name="current" <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
domain="[('state','=','draft')]" <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
help="New Claims"/> <separator/>
<filter icon="terp-camera_test" <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
string="In Progress"
domain="[('state','=','open')]"
help="In Progress Claims"/>
<filter icon="terp-gtk-media-pause"
string="Pending"
domain="[('state','=','pending')]"/>
<filter string="Unassigned Claims"
icon="terp-personal-"
domain="[('user_id','=', False)]"
help="Unassigned Claims" />
<separator orientation="vertical"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id" widget="selection"/> <field name="user_id"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
domain="[]" help="Partner" <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
context="{'group_by':'partner_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Responsible" icon="terp-personal" <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
domain="[]" help="Responsible User" <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
context="{'group_by':'user_id'}"/> <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/>
<separator orientation="vertical"/> <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
<filter string="Stage" icon="terp-stage" <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}" groups="base.group_no_one"/>
domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Type" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'categ_id'}"/>
<filter string="Status"
icon="terp-stock_effects-object-colorize"
domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
<separator orientation="vertical"/>
<filter string="Claim Date" icon="terp-go-month"
domain="[]" help="Claim Date"
context="{'group_by':'date'}"/>
<filter string="Deadline" icon="terp-go-month"
domain="[]"
context="{'group_by':'date_deadline'}"/>
<filter string="Closure" icon="terp-go-month"
domain="[]" help="Date Closed"
context="{'group_by':'date_closed'}" groups="base.group_no_one"/>
</group> </group>
</search> </search>
</field> </field>

110
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -53,93 +53,43 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<group> <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
<filter icon="terp-document-new" <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
string="New" <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
domain="[('state','=','draft')]"/> <separator/>
<filter icon="terp-camera_test" <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
string="Open" <separator/>
domain="[('state','=','open')]"/> <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
<filter icon="terp-gtk-media-pause" <separator/>
string="Pending" <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
domain="[('state','=','pending')]"/> <field name="company_id" groups="base.group_multi_company"/>
<filter string="My Sales Team(s)" <field name="user_id" string="Salesperson"/>
icon="terp-personal+" <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" />
<filter string="My Company"
icon="terp-go-home"
context="{'invisible_section': False}"
domain="[('section_id.user_id.company_id','=',uid)]"
help="My company"/>
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="user_id" string="Salesperson"/>
<field name="section_id" string="Sales Team"
context="{'invisible_section': False}"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<filter icon="terp-dialog-close"
string="Done"
domain="[('state','=','done')]"/>
<filter icon="gtk-cancel"
string="Cancel"
domain="[('state','=','cancel')]"/>
<separator orientation="vertical"/>
<field name="partner_id"/> <field name="partner_id"/>
<separator orientation="vertical"/> <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
<field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/> <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/> <field name="priority"/>
<separator orientation="vertical"/> <field name="type_action"/>
<field name="priority" />
<field name="type_action" />
<newline/>
<field name="create_date" /> <field name="create_date" />
<field name="date_closed" /> <field name="date_closed" />
<field name="date_deadline" /> <field name="date_deadline" />
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Salesperson" name="Salesperson" icon="terp-personal" <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
domain="[]" context="{'group_by':'user_id'}" /> <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
<filter string="Sales Team" icon="terp-personal+" <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
domain="[]" <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
context="{'group_by':'section_id'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Partner" name="partner" icon="terp-partner" <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
domain="[]" context="{'group_by':'partner_id'}" /> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
<separator orientation="vertical" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Stage" icon="terp-stage" domain="[]" <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
context="{'group_by':'stage_id'}" /> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>
context="{'group_by':'priority'}" /> <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of claim"/>
<filter string="Category" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'categ_id'}" />
<separator orientation="vertical"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
context="{'group_by':'type_action'}" help="Action Type"/>
<filter string="Status" icon="terp-stock_effects-object-colorize"
domain="[]" context="{'group_by':'state'}" />
<separator orientation="vertical" />
<filter string="Company" icon="terp-go-home"
domain="[]"
context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" />
<filter string="Day" icon="terp-go-today"
domain="[]" context="{'group_by':'day'}"
help="Date of claim"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}"
help="Month of claim"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}"
help="Year of claim"/>
</group> </group>
</search> </search>
</field> </field>

60
addons/crm_fundraising/crm_fundraising_view.xml
View File

@ -172,50 +172,24 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Funds"> <search string="Search Funds">
<group> <field name="name" string="Fund Description"/>
<field name="name" string="Fund Description"/> <field name="state"/>
<separator orientation="vertical" /> <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
<filter icon="terp-check" string="New" <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
domain="[('state','=','draft')]" name="current" <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
help="New Funds" /> <separator/>
<filter icon="terp-camera_test" string="Open" <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
domain="[('state','=','open')]" <separator/>
help="Open Funds" /> <filter string="Assigned to Me or to My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
<filter icon="terp-gtk-media-pause" help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
string="Pending" <field name="user_id"/>
domain="[('state','=','pending')]" <field name="section_id" string="Sales Team"/>
help="Pending Funds" />
<separator orientation="vertical" />
<filter string="Unassigned"
icon="terp-personal-"
domain="[('user_id','=', False)]"
help="Unassigned" />
<filter string="Assigned to Me or to My Sales Team(s)"
icon="terp-personal+"
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
<separator orientation="vertical" />
<field name="state"/>
<field name="user_id"
widget="selection"/>
<field name="section_id" widget="selection" string="Sales Team"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
domain="[]" <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
context="{'group_by':'partner_id'}" /> <filter string="Category" help="Fund Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Responsible" icon="terp-personal" <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" />
domain="[]" <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
context="{'group_by':'user_id'}" />
<filter string="Category" help="Fund Category"
icon="terp-stock_symbol-selection" domain="[]"
context="{'group_by':'categ_id'}" />
<filter string="Payment Mode" help="Payment Mode"
icon="terp-dolar" domain="[]"
context="{'group_by':'type_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
context="{'group_by':'state'}" />
</group> </group>
</search> </search>
</field> </field>

88
addons/crm_fundraising/report/crm_fundraising_report_view.xml
View File

@ -77,74 +77,34 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<group> <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
<filter icon="terp-document-new" <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
string="New" <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
domain="[('state','=','draft')]"/> <separator/>
<filter icon="terp-camera_test" <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
string="Open" <separator/>
domain="[('state','=','open')]"/> <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
<filter icon="terp-gtk-media-pause" <separator/>
string="Pending" <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
domain="[('state','=','pending')]"/> <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
<filter string="My Sales Team(s)" <field name="company_id" groups="base.group_multi_company"/>
icon="terp-personal+" <field name="user_id" string="Salesperson"/>
context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" />
<filter string="My Company"
icon="terp-go-home"
context="{'invisible_section': False}"
domain="[('section_id.user_id.company_id','=',uid)]"
help="My company"/>
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
<separator orientation="vertical"/>
<field name="section_id" string="Sales Team"
context="{'invisible_section': False}"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="user_id" string="Salesperson"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<filter icon="terp-dialog-close" <field name="categ_id" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
string="Done"
domain="[('state','=','done')]"/>
<filter icon="gtk-cancel"
string="Cancel"
domain="[('state','=','cancel')]"/>
<separator orientation="vertical"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
<field name="create_date"/> <field name="create_date"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Salesperson" name="Salesperson" icon="terp-personal" <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
domain="[]" context="{'group_by':'user_id'}" /> <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
<filter string="Sales Team" icon="terp-personal+" <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
domain="[]" <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
context="{'group_by':'section_id'}" /> <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" />
<separator orientation="vertical" /> <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of fundraising"/>
domain="[]" context="{'group_by':'state'}" /> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of fundraising"/>
<filter string="Category" icon="terp-stock_symbol-selection" <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" />
domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Payment Mode" help="Payment Mode"
icon="terp-dolar" domain="[]"
context="{'group_by':'type_id'}" />
<separator orientation="vertical" />
<filter string="Company" icon="terp-go-home"
domain="[]"
groups="base.group_multi_company"
context="{'group_by':'company_id'}" />
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today"
domain="[]" context="{'group_by':'day'}"
help="Date of fundraising"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}"
help="Month of fundraising"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}" />
</group> </group>
</search> </search>
</field> </field>

58
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -152,54 +152,24 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Helpdesk"> <search string="Search Helpdesk">
<field name="name" string="Query"/> <field name="name" string="Query"/>
<separator orientation="vertical"/>
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Helpdesk Request" />
<filter icon="terp-check" string="New" <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Helpdesk Request" />
name="current" <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
domain="[('state','=','draft')]" <separator/>
help="New Helpdesk Request" /> <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
<filter icon="terp-camera_test"
string="Open"
domain="[('state','=','open')]"
help="Open Helpdesk Request"
/>
<filter icon="terp-gtk-media-pause"
string="Pending"
domain="[('state','=','pending')]"
help="All pending Helpdesk Request"
/>
<filter string="Assigned to Me or My Sales Team(s)"
icon="terp-personal+"
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" /> help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
<separator orientation="vertical"/>
<field name="partner_id" /> <field name="partner_id" />
<field name="user_id" widget="selection"/> <field name="user_id"/>
<field name="section_id" widget="selection" string="Sales Team"/> <field name="section_id" string="Sales Team"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
domain="[]" help="Partner" <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
context="{'group_by':'partner_id'}" /> <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" />
<filter string="Responsible" icon="terp-personal" <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
domain="[]" help="Responsible User" <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
context="{'group_by':'user_id'}" /> <filter string="Date" icon="terp-go-month" domain="[]" help="Request Date" context="{'group_by':'date'}" />
<filter string="Sales Team" icon="terp-personal+" <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}" />
domain="[]" help="Sales Team"
context="{'group_by':'section_id'}" />
<separator orientation="vertical"/>
<filter string="Priority" icon="terp-rating-rated"
domain="[]" context="{'group_by':'priority'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
context="{'group_by':'state'}" />
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month"
domain="[]" help="Request Date"
context="{'group_by':'date'}" />
<filter string="Deadline" icon="terp-go-month"
domain="[]"
context="{'group_by':'date_deadline'}" />
</group> </group>
</search> </search>
</field> </field>

71
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
View File

@ -53,65 +53,34 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<group> <filter string="New" icon="terp-check" domain="[('state','=','draft')]" />
<filter string="New" icon="terp-check" <filter string="Open" icon="terp-camera_test" domain="[('state','=','open')]" />
domain="[('state','=','draft')]" /> <filter string="Closed" icon="terp-dialog-close" domain="[('state','=','cancel')]" />
<filter string="Open" icon="terp-camera_test" <separator/>
domain="[('state','=','open')]" /> <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
<filter string="Closed" icon="terp-dialog-close" <separator/>
domain="[('state','=','cancel')]" /> <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> <separator/>
<filter string="My Sales Team(s)" <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
icon="terp-personal+" <field name="user_id" string="Salesperson"/>
context="{'invisible_section': False}" <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
domain="[('section_id.user_id','=',uid)]" <field name="company_id" groups="base.group_multi_company"/>
help="My Sales Team(s)" />
<filter string="My Company"
icon="terp-go-home"
context="{'invisible_section': False}"
domain="[('section_id.user_id.company_id','=',uid)]"
help="My company"/>
<separator orientation="vertical"/>
<field name="user_id" string="Salesperson"/>
<field name="section_id" string="Sales Team"
context="{'invisible_section': False}"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_no_one"> <group expand="0" string="Extended Filters..." groups="base.group_no_one">
<field name="priority" string="Priority"/> <field name="priority" string="Priority"/>
<field name="categ_id"/> <field name="categ_id"/>
<newline/>
<field name="create_date"/> <field name="create_date"/>
<field name="date_closed" string="Close Date"/> <field name="date_closed" string="Close Date"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Salesperson" icon="terp-personal" <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
domain="[]" context="{'group_by':'user_id'}"/> <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
<filter string="Sales Team" icon="terp-personal+" <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
domain="[]"
context="{'group_by':'section_id'}" />
<filter string="Partner" icon="terp-partner"
domain="[]"
context="{'group_by':'partner_id'}" />
<separator orientation="vertical" />
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<separator orientation="vertical" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" />
domain="[]" context="{'group_by':'state'}" /> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
<separator orientation="vertical" /> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
<filter string="Company" icon="terp-go-home" <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
domain="[]"
groups="base.group_multi_company"
context="{'group_by':'company_id'}" />
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today"
domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
</group> </group>
</search> </search>
</field> </field>

1
addons/crm_partner_assign/crm_lead_view.xml
View File

@ -62,7 +62,6 @@
</filter> </filter>
<field name="user_id" position="after"> <field name="user_id" position="after">
<separator orientation="vertical"/>
<field name="partner_assigned_id"/> <field name="partner_assigned_id"/>
</field> </field>
</field> </field>

80
addons/crm_partner_assign/report/crm_lead_report_view.xml
View File

@ -9,72 +9,42 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leads Analysis"> <search string="Leads Analysis">
<group> <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
<filter icon="terp-check" <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
string="Current" <field name="section_id" context="{'invisible_section': False}"/>
domain="[('state','in',('draft','open'))]"/> <field name="grade_id"/>
<filter icon="terp-dialog-close" <field name="user_id"/>
string="Closed" <field name="partner_assigned_id"/>
domain="[('state','=','done')]"/> <group expand="0" string="Extended Filters...">
<separator orientation="vertical" />
<field name="section_id"
widget="selection"
context="{'invisible_section': False}"/>
<field name="grade_id"/>
<field name="user_id"/>
<field name="partner_assigned_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="partner_id"/> <field name="partner_id"/>
<separator orientation="vertical"/> <separator/>
<field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
<separator orientation="vertical"/> <separator />
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="creation_date"/> <field name="creation_date"/>
<field name="opening_date"/> <field name="opening_date"/>
<field name="date_closed"/> <field name="date_closed"/>
</group> </group>
<newline/> <group expand="1" string="Group By...">
<group expand="1" string="Group By..."> <filter string="Salesperson" name="user" icon="terp-personal"
<filter string="Salesperson" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" /> domain="[]" context="{'group_by':'user_id'}" />
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
<filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" /> <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
<separator orientation="vertical" />
<filter string="Section" icon="terp-personal+" <filter string="Section" icon="terp-personal+"
domain="[]" domain="[]"
context="{'group_by':'section_id'}" /> context="{'group_by':'section_id'}" />
<filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'grade_id'}" /> domain="[]" context="{'group_by':'grade_id'}" />
<separator orientation="vertical" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<separator orientation="vertical"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<separator orientation="vertical" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
domain="[]" context="{'group_by':'state'}" /> <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/>
<separator orientation="vertical" /> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
<filter string="Company" icon="terp-go-home" <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" />
domain="[]" <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" />
context="{'group_by':'company_id'}" /> </group>
<separator orientation="vertical" /> </search>
<filter string="Assign Date" icon="terp-go-today"
domain="[]"
name="group_partner_date"
context="{'group_by':'date_assign'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today"
domain="[]" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}" />
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'year'}" />
</group>
</search>
</field> </field>
</record> </record>

26
addons/crm_partner_assign/report/crm_partner_report_view.xml
View File

@ -9,36 +9,30 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Partner assigned Analysis"> <search string="Partner assigned Analysis">
<group col="20" colspan="8"> <field name="section_id"/>
<field name="section_id"/> <field name="user_id"/>
<field name="user_id"/> <field name="grade_id"/>
<field name="grade_id"/> <field name="activation"/>
<field name="activation"/> <group expand="1" string="Group By...">
</group> <filter string="Salesperson" name="user" icon="terp-personal"
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesperson" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" /> domain="[]" context="{'group_by':'user_id'}" />
<filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" /> <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
<separator orientation="vertical" />
<filter string="Section" icon="terp-personal+" <filter string="Section" icon="terp-personal+"
domain="[]" domain="[]" context="{'group_by':'section_id'}" />
context="{'group_by':'section_id'}" />
<filter string="Activation" name="group_activation" icon="terp-stock_symbol-selection" <filter string="Activation" name="group_activation" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'activation'}" /> domain="[]" context="{'group_by':'activation'}" />
<filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'grade_id'}" /> domain="[]" context="{'group_by':'grade_id'}" />
<filter string="Partner" name="" icon="terp-stock_symbol-selection" <filter string="Partner" name="" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'partner_id'}" /> domain="[]" context="{'group_by':'partner_id'}" />
<separator orientation="vertical" />
<filter string="Date Invoice" name="group_period_id" icon="terp-stock_symbol-selection" <filter string="Date Invoice" name="group_period_id" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'period_id'}" /> domain="[]" context="{'group_by':'period_id'}" />
<filter string="Date Partnership" name="group_date_partnership" icon="terp-stock_symbol-selection" <filter string="Date Partnership" name="group_date_partnership" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'date_partnership'}" /> domain="[]" context="{'group_by':'date_partnership'}" />
<filter string="Date Review" name="group_date_review" icon="terp-stock_symbol-selection" <filter string="Date Review" name="group_date_review" icon="terp-stock_symbol-selection"
domain="[]" context="{'group_by':'date_review'}" /> domain="[]" context="{'group_by':'date_review'}" />
</group> </group>
</search> </search>
</field> </field>
</record> </record>

6
addons/delivery/delivery_view.xml
View File

@ -15,7 +15,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_delivery_carrier_form" model="ir.ui.view"> <record id="view_delivery_carrier_form" model="ir.ui.view">
<field name="name">delivery.carrier.form</field> <field name="name">delivery.carrier.form</field>
<field name="model">delivery.carrier</field> <field name="model">delivery.carrier</field>
@ -90,7 +90,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="action_delivery_carrier_form" model="ir.actions.act_window"> <record id="action_delivery_carrier_form" model="ir.actions.act_window">
<field name="name">Delivery Method</field> <field name="name">Delivery Method</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -299,7 +299,7 @@
<field name="model">stock.picking</field> <field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/> <field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/header/button[@string='Create Invoice/Refund']" position="after"> <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">
<button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/> <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
</xpath> </xpath>
</field> </field>

12
addons/document/document_view.xml
View File

@ -41,7 +41,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Document Storage"> <search string="Search Document Storage">
<field name="name" string="Document Storage"/> <field name="name" string="Document Storage"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group> </group>
@ -172,20 +171,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Document Directory"> <search string="Search Document Directory">
<field name="name" string="Document Directory"/> <field name="name" string="Document Directory"/>
<separator orientation="vertical"/>
<filter string="Static" domain="[('type','=','directory')]"/> <filter string="Static" domain="[('type','=','directory')]"/>
<filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/> <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="storage_id" /> <field name="storage_id" />
<field name="user_id" /> <field name="user_id" />
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
<filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/> <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group> </group>
</search> </search>
@ -269,11 +263,7 @@
<field name="inherit_id" ref="base.view_attachment_search"/> <field name="inherit_id" ref="base.view_attachment_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//filter[@name='my_documents_filter']" position="replace"> <xpath expr="//filter[@name='my_documents_filter']" position="replace">
<filter name="my_documents_filter" <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/>
string="My Document(s)"
icon="terp-personal"
domain="[('user_id','=',uid)]"
help="Filter on my documents"/>
</xpath> </xpath>
<xpath expr="//field[@name='create_uid']" position="replace"> <xpath expr="//field[@name='create_uid']" position="replace">
<field name="user_id"/> <field name="user_id"/>

9
addons/document/report/document_report_view.xml
View File

@ -41,13 +41,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="All users files"> <search string="All users files">
<group> <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/>
<field name="name" <field name="month"/>
filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
string="Users File"/>
<separator orientation="vertical"/>
<field name="month"/>
</group>
</search> </search>
</field> </field>
</record> </record>

10
addons/document_webdav/webdav_view.xml
View File

@ -38,10 +38,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Document properties"> <search string="Search Document properties">
<field name="name" <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document property"/>
filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
string="Document property"/>
<newline/>
<group expand="0" string="Group By..." groups="base.group_no_one"> <group expand="0" string="Group By..." groups="base.group_no_one">
<filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/> <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
<filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/> <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
@ -140,10 +137,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Document properties"> <search string="Search Document properties">
<field name="name" <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document Property"/>
filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
string="Document Property"/>
<newline/>
<group expand="0" string="Group By..." groups="base.group_no_one"> <group expand="0" string="Group By..." groups="base.group_no_one">
<filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/> <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
<filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/> <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>

11
addons/email_template/email_template_view.xml
View File

@ -122,16 +122,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Templates"> <search string="Templates">
<group> <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
<field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/> <field name="lang"/>
<separator orientation="vertical"/> <field name="model_id"/>
<field name="model_id"/>
<field name="lang"/>
</group>
<newline/>
<group expand="0" string="Group by..."> <group expand="0" string="Group by...">
<filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/> <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
<separator orientation="vertical"/>
<filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/> <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
</group> </group>
</search> </search>

23
addons/event/event.py
View File

@ -23,6 +23,7 @@ import time
from osv import fields, osv from osv import fields, osv
from tools.translate import _ from tools.translate import _
import decimal_precision as dp import decimal_precision as dp
from openerp import SUPERUSER_ID
class event_type(osv.osv): class event_type(osv.osv):
""" Event Type """ """ Event Type """
@ -159,7 +160,7 @@ class event_event(osv.osv):
elif field == 'register_prospect': elif field == 'register_prospect':
number = reg_draft number = reg_draft
elif field == 'register_avail': elif field == 'register_avail':
#the number of ticket is unlimited if the event.register_max field is not set. #the number of ticket is unlimited if the event.register_max field is not set.
#In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button #In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button
number = event.register_max - reg_open if event.register_max != 0 else 9999 number = event.register_max - reg_open if event.register_max != 0 else 9999
res[event.id][field] = number res[event.id][field] = number
@ -178,7 +179,7 @@ class event_event(osv.osv):
if reg.state in ('open','done'): if reg.state in ('open','done'):
res[event.id]= True res[event.id]= True
continue continue
return res return res
_columns = { _columns = {
'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}), 'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
@ -189,7 +190,7 @@ class event_event(osv.osv):
'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'), 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'), 'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'), 'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'), 'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'),
'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}), 'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@ -227,18 +228,18 @@ class event_event(osv.osv):
self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context) self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context)
user = user_pool.browse(cr, uid, uid, context=context) user = user_pool.browse(cr, uid, uid, context=context)
curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])]) curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
#the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe #the subscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to subscribe
if not curr_reg_ids: if not curr_reg_ids:
curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': num_of_seats})] curr_reg_ids = [register_pool.create(cr, SUPERUSER_ID, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': num_of_seats})]
else: else:
register_pool.write(cr, uid, curr_reg_ids, {'nb_register': num_of_seats}, context=context) register_pool.write(cr, uid, curr_reg_ids, {'nb_register': num_of_seats}, context=context)
return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context) return register_pool.confirm_registration(cr, SUPERUSER_ID, curr_reg_ids, context=context)
def unsubscribe_to_event(self, cr, uid, ids, context=None): def unsubscribe_to_event(self, cr, uid, ids, context=None):
register_pool = self.pool.get('event.registration') register_pool = self.pool.get('event.registration')
#the unsubscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to unsubscribe #the unsubscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to unsubscribe
curr_reg_ids = register_pool.search(cr, 1, [('user_id', '=', uid), ('event_id', '=', ids[0])]) curr_reg_ids = register_pool.search(cr, SUPERUSER_ID, [('user_id', '=', uid), ('event_id', '=', ids[0])])
return register_pool.button_reg_cancel(cr, 1, curr_reg_ids, context=context) return register_pool.button_reg_cancel(cr, SUPERUSER_ID, curr_reg_ids, context=context)
def _check_closing_date(self, cr, uid, ids, context=None): def _check_closing_date(self, cr, uid, ids, context=None):
for event in self.browse(cr, uid, ids, context=context): for event in self.browse(cr, uid, ids, context=context):
@ -260,7 +261,7 @@ class event_event(osv.osv):
'register_max': type_info.default_registration_max, 'register_max': type_info.default_registration_max,
} }
return {'value': dic} return {'value': dic}
# ---------------------------------------- # ----------------------------------------
# OpenChatter methods and notifications # OpenChatter methods and notifications
# ---------------------------------------- # ----------------------------------------
@ -415,7 +416,7 @@ class event_registration(osv.osv):
return {} return {}
event_obj = self.pool.get('event.event') event_obj = self.pool.get('event.event')
data_event = event_obj.browse(cr, uid, event_id, context=context) data_event = event_obj.browse(cr, uid, event_id, context=context)
return {'value': return {'value':
{'event_begin_date': data_event.date_begin, {'event_begin_date': data_event.date_begin,
'event_end_date': data_event.date_end, 'event_end_date': data_event.date_end,
'company_id': data_event.company_id and data_event.company_id.id or False, 'company_id': data_event.company_id and data_event.company_id.id or False,

111
addons/event/event_view.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<act_window <act_window
id="act_event_list_register_event" id="act_event_list_register_event"
name="Registration" name="Registration"
@ -13,6 +14,7 @@
<!-- Top menu item --> <!-- Top menu item -->
<menuitem name="Events" <menuitem name="Events"
id="event_main_menu" id="event_main_menu"
groups="base.group_user"
sequence="80"/> sequence="80"/>
<menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/> <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
@ -102,10 +104,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Events" version="7.0"> <form string="Events" version="7.0">
<header> <header>
<button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/> <span groups="base.user_group">
<button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/> <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" /> <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/> <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
</span>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
</header> </header>
<sheet> <sheet>
@ -126,20 +130,20 @@
<field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/> <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
<field name="street" placeholder="Street..."/> <field name="street" placeholder="Street..."/>
<div> <div>
<field name="zip" class="oe_inline" placeholder="Zip"/> <field name="zip" class="oe_inline" placeholder="Zip"/>
<field name="city" class="oe_inline" placeholder="City"/> <field name="city" class="oe_inline" placeholder="City"/>
</div> </div>
</div> </div>
</group> </group>
<group> <group>
<field name="type" on_change="onchange_event_type(type,context)"/> <field name="type" on_change="onchange_event_type(type,context)"/>
<field name="register_min"/> <field name="register_min"/>
<field name="register_max"/> <field name="register_max"/>
<label for="register_current" string="Current Registrations"/> <label for="register_current" string="Current Registrations" groups="base.group_user"/>
<div> <div groups="base.group_user">
Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/> Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
</div> </div>
</group> </group>
</group> </group>
</div> </div>
<!-- <div class="oe_right" style="height: 200px"></div> --> <!-- <div class="oe_right" style="height: 200px"></div> -->
@ -328,37 +332,22 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Events"> <search string="Events">
<filter icon="terp-mail-message-new" <field name="name" string="Events"/>
string="Inbox" help="Unread messages" <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
name="needaction_pending" <separator/>
domain="[('needaction_pending','=',True)]"/> <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
<group> <separator/>
<field name="name" string="Events"/> <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/> <separator/>
<filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/> <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/> <field name="type"/>
<filter icon="terp-personal" <field name="user_id"/>
string="My Events"
help="My Events"
domain="[('user_id','=',uid)]"/>
<filter icon="terp-go-today" string="Upcoming"
name="upcoming"
domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
help="Upcoming events from today" />
<separator orientation="vertical"/>
<field name="type" widget="selection"/>
<field name="user_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" context="{'group_by': 'user_id'}"/> <filter string="Responsible" icon="terp-personal" context="{'group_by': 'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/> <filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/> <filter string="Starting Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_begin'}"/>
<filter string="Starting Date" icon="terp-go-month"
domain="[]" context="{'group_by':'date_begin'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -474,8 +463,8 @@
<div> <div>
<field name="email" class="oe_inline"/> <field name="email" class="oe_inline"/>
<button class="oe_inline oe_right" string="Send Email" <button class="oe_inline oe_right" string="Send Email"
name="%(mail.action_email_compose_message_wizard)d" name="%(mail.action_email_compose_message_wizard)d"
icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/> icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
</div> </div>
</group> </group>
<group> <group>
@ -529,34 +518,21 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Event Registration"> <search string="Event Registration">
<group> <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
<filter icon="terp-mail-message-new" <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
string="Inbox" help="Unread messages" <separator/>
name="needaction_pending" <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
domain="[('needaction_pending','=',True)]"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
<separator orientation="vertical"/> <separator/>
<field name="name" string="Participant" <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/> <field name="event_id"/>
<separator orientation="vertical"/> <field name="user_id"/>
<filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
<filter icon="terp-personal"
string="My Registrations"
help="My Registrations"
domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/>
<field name="event_id" widget="selection"/>
<field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/> <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
@ -571,12 +547,11 @@
<field name="search_view_id" ref="view_registration_search"/> <field name="search_view_id" ref="view_registration_search"/>
</record>view_ </record>view_
<menuitem <menuitem name="Registrations"
name="Registrations"
id="menu_action_registration" parent="base.menu_event_main" id="menu_action_registration" parent="base.menu_event_main"
action="action_registration" groups="event.group_event_manager,event.group_event_user"/> action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/> <menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
</data> </data>
</openerp> </openerp>

43
addons/event/report/report_event_registration_view.xml
View File

@ -52,24 +52,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Event on Registration"> <search string="Event on Registration">
<group> <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
<filter icon="terp-document-new" <filter icon="terp-check" string="Confirm" domain="[('event_state','=','confirm')]" help="Events which are in confirm state"/>
string="New" <separator/>
domain="[('event_state','=','draft')]" <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
help="Events which are in New state"/> <field name="event_id" string="Event"/>
<filter icon="terp-check" <field name="user_id"/>
string="Confirm"
domain="[('event_state','=','confirm')]"
help="Events which are in confirm state"/>
<filter icon="terp-personal"
string="My Events"
help="My Events"
domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/>
<field name="event_id" string="Event"/>
<field name="user_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="event_type" widget="selection"/> <field name="event_type" widget="selection"/>
<field name="event_date"/> <field name="event_date"/>
@ -80,27 +68,18 @@
<filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/> <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
<filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/> <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/>
<filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/> <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/> <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
<filter string="Event Type" icon="terp-crm" context="{'group_by':'event_type'}"/> <filter string="Event Type" icon="terp-crm" context="{'group_by':'event_type'}"/>
<separator orientation="vertical"/>
<filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/> <filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/>
<filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/> <filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" /> <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
<filter string="Day" icon="terp-go-month" <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/> <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
</group> </group>
<group expand="0" string="Display"> <group expand="0" string="Display">
<filter icon="terp-camera_test" <filter icon="terp-camera_test" string="Show Confirmed Registrations"
string="Show Confirmed Registrations" help="Registrations in confirmed or done state" context="{'no_of_draft_invisible':1}"/>
help="Registrations in confirmed or done state"
context="{'no_of_draft_invisible':1}"/>
</group> </group>
</search> </search>
</field> </field>

65
addons/event/security/event_security.xml
View File

@ -1,45 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data noupdate="0"> <data>
<record model="ir.module.category" id="module_category_event_management"> <record model="ir.module.category" id="module_category_event_management">
<field name="name">Event</field> <field name="name">Event</field>
<field name="description">Helps you manage your Events.</field> <field name="description">Helps you manage your Events.</field>
<field name="sequence">3</field> <field name="sequence">3</field>
</record> </record>
<record id="group_event_user" model="res.groups"> <record id="group_event_user" model="res.groups">
<field name="name">User</field> <field name="name">User</field>
<field name="category_id" ref="module_category_event_management"/> <field name="category_id" ref="module_category_event_management"/>
</record> </record>
<record id="group_event_manager" model="res.groups"> <record id="group_event_manager" model="res.groups">
<field name="name">Manager</field> <field name="name">Manager</field>
<field name="category_id" ref="module_category_event_management"/> <field name="category_id" ref="module_category_event_management"/>
<field name="implied_ids" eval="[(4, ref('group_event_user'))]"/> <field name="implied_ids" eval="[(4, ref('group_event_user'))]"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/> <field name="users" eval="[(4, ref('base.user_root'))]"/>
</record> </record>
<!-- Multi - Company Rules --> <!-- Multi - Company Rules -->
<record model="ir.rule" id="event_event_comp_rule">
<field name="name">Event multi-company</field>
<field name="model_id" ref="model_event_event"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="event_event_comp_rule"> <record model="ir.rule" id="event_registration_comp_rule">
<field name="name">Event multi-company</field> <field name="name">Event Registration multi-company</field>
<field name="model_id" ref="model_event_event"/> <field name="model_id" ref="model_event_registration"/>
<field name="global" eval="True"/> <field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record> </record>
<record model="ir.rule" id="event_registration_comp_rule">
<field name="name">Event Registration multi-company</field>
<field name="model_id" ref="model_event_registration"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="report_event_registration_comp_rule"> <record model="ir.rule" id="report_event_registration_comp_rule">
<field name="name">Report Event Registration multi-company</field> <field name="name">Report Event Registration multi-company</field>
<field name="model_id" ref="model_report_event_registration"/> <field name="model_id" ref="model_report_event_registration"/>
<field name="global" eval="True"/> <field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>--> </record>
</data>
</data>
</openerp> </openerp>

3
addons/fetchmail/fetchmail_view.xml
View File

@ -80,10 +80,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Incoming Mail Servers"> <search string="Search Incoming Mail Servers">
<field name="name" string="Incoming Mail Server"/> <field name="name" string="Incoming Mail Server"/>
<separator orientation="vertical"/>
<filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/> <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
<filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/> <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
<separator orientation="vertical"/> <separator/>
<filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/> <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
</search> </search>
</field> </field>

13
addons/hr/hr_department_view.xml
View File

@ -2,11 +2,7 @@
<openerp> <openerp>
<data> <data>
<!-- <!-- Department -->
======================
department
======================
-->
<record id="view_department_form" model="ir.ui.view"> <record id="view_department_form" model="ir.ui.view">
<field name="name">hr.department.form</field> <field name="name">hr.department.form</field>
<field name="model">hr.department</field> <field name="model">hr.department</field>
@ -37,18 +33,17 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_department_filter" model="ir.ui.view"> <record id="view_department_filter" model="ir.ui.view">
<field name="name">Departments</field> <field name="name">Departments</field>
<field name="model">hr.department</field> <field name="model">hr.department</field>
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Departments"> <search string="Departments">
<field name="name" string="Department"/> <field name="name" string="Department"/>
<separator orientation="vertical"/>
<field name="manager_id" /> <field name="manager_id" />
</search> </search>
</field> </field>
</record> </record>
<record id="open_module_tree_department" model="ir.actions.act_window"> <record id="open_module_tree_department" model="ir.actions.act_window">
<field name="name">Departments</field> <field name="name">Departments</field>
@ -60,5 +55,5 @@
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/> <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
</data> </data>
</openerp> </openerp>

50
addons/hr/hr_view.xml
View File

@ -11,7 +11,7 @@
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/> <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_no_one" sequence="25"/> <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_no_one" sequence="25"/>
<menuitem id="menu_hr_reporting_timesheet" name="Reports" <menuitem id="menu_hr_reporting_timesheet" name="Reports"
parent="menu_hr_reporting" sequence="6" /> parent="menu_hr_reporting" sequence="6"/>
<!--Employee form view --> <!--Employee form view -->
<record id="view_employee_form" model="ir.ui.view"> <record id="view_employee_form" model="ir.ui.view">
@ -40,9 +40,9 @@
<!-- Put here related buttons --> <!-- Put here related buttons -->
</div> </div>
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="work_email" widget="email" /> <field name="work_email" widget="email"/>
<field name="work_phone"/> <field name="work_phone"/>
<field name="address_id" on_change="onchange_address_id(address_id)" /> <field name="address_id" on_change="onchange_address_id(address_id)"/>
<field name="mobile_phone"/> <field name="mobile_phone"/>
</group> </group>
<notebook> <notebook>
@ -50,7 +50,7 @@
<group> <group>
<group> <group>
<field name="user_id" on_change="onchange_user(user_id)"/> <field name="user_id" on_change="onchange_user(user_id)"/>
<field name="parent_id" /> <field name="parent_id"/>
<field name="coach_id"/> <field name="coach_id"/>
</group> </group>
<group> <group>
@ -109,16 +109,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Employees"> <search string="Employees">
<field name="name" string="Employees"/> <field name="name" string="Employees"/>
<separator orientation="vertical"/> <field name="department_id" />
<field name="department_id" widget="selection"/> <field name="job_id"/>
<field name="job_id" widget="selection"/>
<field name="parent_id"/> <field name="parent_id"/>
<field name="category_ids"/> <field name="category_ids"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/> <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
<separator orientation="vertical"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@ -142,7 +139,9 @@
<a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a> <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
</div> </div>
<div class="oe_employee_details"> <div class="oe_employee_details">
<h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4> <h4>
<a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
</h4>
<ul> <ul>
<li id="last_login"> <li id="last_login">
<span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%"> <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
@ -225,12 +224,7 @@
<field name="res_id" ref="hr.menu_open_view_employee_list_my"/> <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
</record> </record>
<!-- <!-- Employee architecture -->
=======================
Employee architecture
=======================
-->
<record id="view_partner_tree2" model="ir.ui.view"> <record id="view_partner_tree2" model="ir.ui.view">
<field name="name">hr.employee.tree</field> <field name="name">hr.employee.tree</field>
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
@ -269,12 +263,7 @@
<field eval="True" name="replace"/> <field eval="True" name="replace"/>
</ir_set> </ir_set>
<!-- <!-- Employee Category -->
============
Employee Category
============
-->
<record id="view_employee_category_form" model="ir.ui.view"> <record id="view_employee_category_form" model="ir.ui.view">
<field name="name">hr.employee.category.form</field> <field name="name">hr.employee.category.form</field>
<field name="model">hr.employee.category</field> <field name="model">hr.employee.category</field>
@ -373,8 +362,8 @@
</h1> </h1>
<group> <group>
<group> <group>
<field name="no_of_employee"/> <field name="no_of_employee" groups="base.group_user"/>
<field name="expected_employees"/> <field name="expected_employees" groups="base.group_user"/>
<field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/> <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
</group> </group>
<group> <group>
@ -418,16 +407,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Jobs"> <search string="Jobs">
<field name="name" string="Job"/> <field name="name" string="Job"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" domain="[('state','=','open')]" string="In Position" help="In Position"/>
<filter icon="terp-camera_test" <filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment"/>
domain="[('state','=','open')]" <field name="department_id"/>
string="In Position"
help="In Position"/>
<filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment"
help="In Recruitment"/>
<separator orientation="vertical"/>
<field name="department_id" widget="selection"/>
<newline />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>

18
addons/hr/res_config.py
View File

@ -26,23 +26,23 @@ class hr_config_settings(osv.osv_memory):
_inherit = 'res.config.settings' _inherit = 'res.config.settings'
_columns = { _columns = {
'module_hr_timesheet_sheet': fields.boolean('Timesheet Validation by Manager', 'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers',
help ="""This installs the module hr_timesheet_sheet."""), help ="""This installs the module hr_timesheet_sheet."""),
'module_hr_attendance': fields.boolean('Track Attendances', 'module_hr_attendance': fields.boolean('track attendances',
help ="""This installs the module hr_attendance."""), help ="""This installs the module hr_attendance."""),
'module_hr_timesheet': fields.boolean('Manage Timesheets', 'module_hr_timesheet': fields.boolean('manage timesheets',
help ="""This installs the module hr_timesheet."""), help ="""This installs the module hr_timesheet."""),
'module_hr_holidays': fields.boolean('Leaves & Holidays', 'module_hr_holidays': fields.boolean('manage leaves and allocation requests',
help ="""This installs the module hr_holidays."""), help ="""This installs the module hr_holidays."""),
'module_hr_expense': fields.boolean('Expenses', 'module_hr_expense': fields.boolean('manage employees expenses',
help ="""This installs the module hr_expense."""), help ="""This installs the module hr_expense."""),
'module_hr_recruitment': fields.boolean('Recruitment', 'module_hr_recruitment': fields.boolean('manage the recruitment pipe',
help ="""This installs the module hr_recruitment."""), help ="""This installs the module hr_recruitment."""),
'module_hr_contract': fields.boolean('Employees Contracts', 'module_hr_contract': fields.boolean('manage contract per employee',
help ="""This installs the module hr_contract."""), help ="""This installs the module hr_contract."""),
'module_hr_evaluation': fields.boolean('Periodic Appraisals', 'module_hr_evaluation': fields.boolean('manage employees periodic evaluation',
help ="""This installs the module hr_evaluation."""), help ="""This installs the module hr_evaluation."""),
'module_hr_payroll': fields.boolean('Payroll', 'module_hr_payroll': fields.boolean('manage payroll',
help ="""This installs the module hr_payroll."""), help ="""This installs the module hr_payroll."""),
} }

17
addons/hr/res_config_view.xml
View File

@ -14,7 +14,7 @@
<field name="model">hr.config.settings</field> <field name="model">hr.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Human Resources" version="7.0"> <form string="Configure Human Resources" version="7.0" class="oe_form_configuration">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
@ -40,15 +40,11 @@
<field name="module_hr_contract" class="oe_inline"/> <field name="module_hr_contract" class="oe_inline"/>
<label for="module_hr_contract"/> <label for="module_hr_contract"/>
</div> </div>
<div>
<field name="module_hr_recruitment" class="oe_inline"/>
<label for="module_hr_recruitment"/>
</div>
<div name="hr_payroll"> <div name="hr_payroll">
<field name="module_hr_payroll" class="oe_inline"/> <field name="module_hr_payroll" class="oe_inline"/>
<label for="module_hr_payroll"/> <label for="module_hr_payroll"/>
<button name="%(open_payroll_modules)d" type="action" <button name="%(open_payroll_modules)d" type="action"
string="Install Country-Specific Payroll" icon="gtk-go-forward" string="install your country's payroll" icon="gtk-go-forward"
attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/> attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
</div> </div>
</div> </div>
@ -70,6 +66,15 @@
</div> </div>
</div> </div>
</group> </group>
<group name="recruitment_grp">
<label for="id" string="Recruitment"/>
<div name="recruitment">
<div>
<field name="module_hr_recruitment" class="oe_inline"/>
<label for="module_hr_recruitment"/>
</div>
</div>
</group>
</form> </form>
</field> </field>
</record> </record>

11
addons/hr_attendance/hr_attendance_view.xml
View File

@ -55,16 +55,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Hr Attendance Search"> <search string="Hr Attendance Search">
<field name="name" string="Attendance"/> <field name="name" string="Attendance"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
<separator orientation="vertical"/>
<field name="employee_id"/>
<field name="action"/> <field name="action"/>
<newline/> <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
<separator/>
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
<field name="employee_id"/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
</group> </group>
</search> </search>

21
addons/hr_contract/hr_contract_view.xml
View File

@ -40,22 +40,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Contract"> <search string="Search Contract">
<group> <field name="name" string="Contracts"/>
<field name="name" string="Contracts"/> <field name="date_start"/>
<separator orientation="vertical"/> <field name="date_end"/>
<field name="date_start"/> <field name="working_hours"/>
<field name="date_end"/> <field name="employee_id"/>
<separator orientation="vertical"/>
<field name="employee_id"/>
<field name="working_hours"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
<filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/> <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<separator orientation="vertical"/>
<filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
</group> </group>
</search> </search>
@ -174,9 +167,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Contract Type"> <search string="Search Contract Type">
<group> <field name="name" string="Contract Type"/>
<field name="name" string="Contract Type"/>
</group>
</search> </search>
</field> </field>
</record> </record>

40
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -8,12 +8,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Appraisal Plan"> <search string="Appraisal Plan">
<group> <field name="name" string="Appraisal Plans"/>
<field name="name" string="Appraisal Plans"/> <field name="company_id" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By..." groups="base.group_multi_company"> <group expand="0" string="Group By..." groups="base.group_multi_company">
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
</group> </group>
@ -234,22 +230,15 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Appraisal"> <search string="Search Appraisal">
<group> <field name="date"/>
<field name="date"/> <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
<filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/> <field name="employee_id" />
<filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/> <field name="plan_id"/>
<separator orientation="vertical"/>
<field name="employee_id" />
<field name="plan_id" widget="selection" />
</group>
<newline/>
<group expand='0' string='Group by...'> <group expand='0' string='Group by...'>
<filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" /> <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
<separator orientation="vertical"/>
<filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" /> <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
<filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" /> <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
<separator orientation="vertical"/>
<filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" /> <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
</group> </group>
</search> </search>
@ -329,20 +318,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Appraisal"> <search string="Search Appraisal">
<group> <field name="date_deadline"/>
<field name="date_deadline"/> <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
<separator orientation="vertical"/> <field name="user_to_review_id"/>
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/> <field name="user_id" string="Interviewer"/>
<separator orientation="vertical"/>
<field name="user_to_review_id"/>
<field name="user_id" string="Interviewer"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/> <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>

22
addons/hr_evaluation/report/hr_evaluation_report_view.xml
View File

@ -45,34 +45,22 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Appraisal Analysis"> <search string="Appraisal Analysis">
<group> <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" help = "In progress Evaluations"/>
<filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" help = "Final Validation Evaluations"/>
help = "In progress Evaluations"/> <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" <field name="employee_id"/>
help = "Final Validation Evaluations"/> <field name="plan_id"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="employee_id"/>
<field name="plan_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="rating"/> <field name="rating"/>
<newline/>
<field name="deadline"/> <field name="deadline"/>
<separator orientation="vertical"/>
<field name="state"/> <field name="state"/>
<field name="create_date"/> <field name="create_date"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/> <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
<filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/> <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
<filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/> <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/> <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>

34
addons/hr_expense/hr_expense_view.xml
View File

@ -136,27 +136,19 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Expense"> <search string="Expense">
<group> <field name="name" string="Expenses"/>
<field name="name" string="Expenses"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
<field name="date"/> <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
<separator orientation="vertical"/> <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
<filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/> <field name="employee_id"/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/> <field name="department_id" string="Department" context="{'invisible_department': False}"/>
<filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/> <field name="user_id" string="User"/>
<separator orientation="vertical"/> <group expand="0" string="Group By...">
<field name="employee_id"/> <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<field name="user_id" string="User"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group> </group>
<newline />
<group expand="0" string="Group By...">
<filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>

65
addons/hr_expense/report/hr_expense_report_view.xml
View File

@ -51,46 +51,31 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Expenses Analysis"> <search string="Expenses Analysis">
<group> <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
<filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
help = "Confirm Expenses"/> <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
<filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" <field name="employee_id"/>
help = "Approved Expenses"/> <field name="department_id"/>
<filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" <group expand="0" string="Extended Filters...">
help = "Invoiced Expenses"/> <field name="product_id"/>
<separator orientation="vertical"/> <field name="user_id"/>
<field name="employee_id"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="department_id"/> <field name="date" string="Creation Date"/>
</group> <field name="date_confirm"/>
<newline/> <field name="date_valid"/>
<group expand="0" string="Extended Filters..."> </group>
<field name="product_id"/> <group expand="1" string="Group By...">
<separator orientation="vertical"/> <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
<field name="user_id"/> <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<newline/> <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
<field name="date" string="Creation Date"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<field name="date_confirm"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<field name="date_valid"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
</group> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
<newline/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
<group expand="1" string="Group By..."> </group>
<filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
<filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
</group>
</search> </search>
</field> </field>
</record> </record>

44
addons/hr_holidays/hr_holidays_view.xml
View File

@ -44,36 +44,28 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leave"> <search string="Search Leave">
<group> <field name="date_from"/>
<field name="date_from"/> <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
<separator orientation="vertical"/> <separator/>
<filter icon="terp-mail-message-new" <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
string="Inbox" help="Unread messages" <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
name="needaction_pending" <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
domain="[('needaction_pending','=',True)]"/> <separator/>
<separator orientation="vertical"/> <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
<filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/> <separator/>
<filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/> <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
<filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/> <separator/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/> <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
<filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/> <field name="employee_id"/>
<filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/> <field name="department_id"/>
<separator orientation="vertical"/> <field name="holiday_status_id"/>
<field name="employee_id"/>
<field name="department_id" widget="selection"/>
<field name="holiday_status_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/> <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/>
<separator orientation="vertical"/>
<filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/> <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
<separator orientation="vertical"/>
<filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"/> <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>
@ -408,8 +400,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leave Type"> <search string="Search Leave Type">
<field name="name" string="Leave Types"/> <field name="name" string="Leave Types"/>
<separator orientation="vertical"/> <field name="categ_id"/>
<field name="categ_id" widget="selection"/>
</search> </search>
</field> </field>
</record> </record>
@ -475,8 +466,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leave Type"> <search string="Leave Type">
<field name="name" string="Leave Types"/> <field name="name" string="Leave Types"/>
<separator orientation="vertical"/> <field name="categ_id"/>
<field name="categ_id" widget="selection"/>
</search> </search>
</field> </field>
</record> </record>

53
addons/hr_payroll/hr_payroll_view.xml
View File

@ -61,10 +61,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Payroll Structures"> <search string="Payroll Structures">
<group col="8" colspan="4"> <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
<field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
</group>
<newline/>
</search> </search>
</field> </field>
</record> </record>
@ -179,19 +176,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payslip Lines"> <search string="Search Payslip Lines">
<group col="8" colspan="4"> <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
<field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> <field name="amount_select"/>
<separator orientation="vertical"/> <field name="slip_id"/>
<field name="slip_id"/>
<field name="amount_select"/>
</group>
<newline/>
<group col="8" colspan="4" expand="0" string="Group By..."> <group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/> <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
<filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/> <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
<separator orientation="vertical"/>
<filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/> <filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
<separator orientation="vertical"/>
<filter string="Employees" name="employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/> <filter string="Employees" name="employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
</group> </group>
</search> </search>
@ -367,25 +358,16 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payslips"> <search string="Search Payslips">
<group> <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
<field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/> <field name="date_from"/>
<separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
<field name="date_from"/> <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
<separator orientation="vertical"/> <field name="employee_id"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/> <field name="payslip_run_id"/>
<filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
<separator orientation="vertical"/>
<field name="employee_id"/>
<field name="payslip_run_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/> <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
<filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/> <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/> <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
<separator orientation="vertical"/>
<filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>
@ -526,8 +508,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Contribution Registers"> <search string="Contribution Registers">
<field name="name" string="Contribution Registers"/> <field name="name" string="Contribution Registers"/>
<separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</search> </search>
</field> </field>
</record> </record>
@ -655,13 +636,9 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Salary Rule"> <search string="Search Salary Rule">
<group col="8"> <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
<field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> <field name="category_id"/>
<separator orientation="vertical"/> <field name="condition_range_min"/>
<field name="category_id"/>
<field name="condition_range_min"/>
</group>
<newline/>
<group col="8" colspan="4" expand="0" string="Group By..."> <group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/> <filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
</group> </group>
@ -698,10 +675,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payslip Batches"> <search string="Search Payslip Batches">
<field name="name" string="Payslip Batches"/> <field name="name" string="Payslip Batches"/>
<separator orientation="vertical"/>
<field name="date_start"/> <field name="date_start"/>
<field name="date_end"/> <field name="date_end"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
<filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/> <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
</search> </search>

4
addons/hr_payroll/i18n/he.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-31 04:58+0000\n" "X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15702)\n" "X-Generator: Launchpad (build 15719)\n"
#. module: hr_payroll #. module: hr_payroll
#: field:hr.payslip.line,condition_select:0 #: field:hr.payslip.line,condition_select:0

2
addons/hr_payroll/res_config.py
View File

@ -24,6 +24,6 @@ from osv import osv, fields
class human_resources_configuration(osv.osv_memory): class human_resources_configuration(osv.osv_memory):
_inherit = 'hr.config.settings' _inherit = 'hr.config.settings'
_columns = { _columns = {
'module_hr_payroll_account': fields.boolean('Manage Account Payroll', 'module_hr_payroll_account': fields.boolean('link your payroll to accounting system',
help ="""Create Journal Entries from Payslips"""), help ="""Create Journal Entries from Payslips"""),
} }

3
addons/hr_payroll_account/hr_payroll_account_view.xml
View File

@ -62,8 +62,7 @@
<field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/> <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<filter name='done_filter' position="after"> <filter name='done_filter' position="after">
<separator orientation="vertical"/> <field name="journal_id"/>
<field name="journal_id" widget="selection"/>
</filter> </filter>
</field> </field>
</record> </record>

148
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -1,23 +1,21 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<menuitem
id="menu_hr_recruitment_recruitment"
name="Recruitment"
parent="hr.menu_hr_configuration"
sequence="40" />
<act_window <menuitem name="Recruitment"
id="act_hr_applicant_to_meeting" id="menu_hr_recruitment_recruitment"
name="Meetings" parent="hr.menu_hr_configuration"
res_model="crm.meeting" sequence="40"/>
src_model="hr.applicant"
view_mode="tree,form,calendar,graph"
view_type="form"/>
# ------------------------------------------------------ <act_window
# Stage id="act_hr_applicant_to_meeting"
# ------------------------------------------------------ name="Meetings"
res_model="crm.meeting"
src_model="hr.applicant"
view_mode="tree,form,calendar,graph"
view_type="form"/>
<!-- Stage -->
<record id="hr_job_stage_act" model="ir.actions.act_window"> <record id="hr_job_stage_act" model="ir.actions.act_window">
<field name="name">Recruitment / Applicants Stages</field> <field name="name">Recruitment / Applicants Stages</field>
<field name="res_model">hr.recruitment.stage</field> <field name="res_model">hr.recruitment.stage</field>
@ -28,10 +26,7 @@
</record> </record>
# ------------------------------------------------------ <!-- Jobs -->
# Jobs
# ------------------------------------------------------
<!-- Applicant Read/Unread actions --> <!-- Applicant Read/Unread actions -->
<record id="actions_server_applicant_unread" model="ir.actions.server"> <record id="actions_server_applicant_unread" model="ir.actions.server">
<field name="name">Mark unread</field> <field name="name">Mark unread</field>
@ -44,9 +39,9 @@
<record id="action_applicant_unread" model="ir.values"> <record id="action_applicant_unread" model="ir.values">
<field name="name">action_project_unread</field> <field name="name">action_project_unread</field>
<field name="action_id" ref="actions_server_applicant_unread"/> <field name="action_id" ref="actions_server_applicant_unread"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))" /> <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))"/>
<field name="key">action</field> <field name="key">action</field>
<field name="model_id" ref="model_hr_applicant" /> <field name="model_id" ref="model_hr_applicant"/>
<field name="model">hr.applicant</field> <field name="model">hr.applicant</field>
<field name="key2">client_action_multi</field> <field name="key2">client_action_multi</field>
</record> </record>
@ -62,9 +57,9 @@
<record id="action_applicant_read" model="ir.values"> <record id="action_applicant_read" model="ir.values">
<field name="name">action_project_read</field> <field name="name">action_project_read</field>
<field name="action_id" ref="actions_server_applicant_read"/> <field name="action_id" ref="actions_server_applicant_read"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))" /> <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))"/>
<field name="key">action</field> <field name="key">action</field>
<field name="model_id" ref="model_hr_applicant" /> <field name="model_id" ref="model_hr_applicant"/>
<field name="model">hr.applicant</field> <field name="model">hr.applicant</field>
<field name="key2">client_action_multi</field> <field name="key2">client_action_multi</field>
</record> </record>
@ -175,12 +170,12 @@
<group string="Contract"> <group string="Contract">
<label for="salary_expected"/> <label for="salary_expected"/>
<div> <div>
<field name="salary_expected" class="oe_inline"/>, <field name="salary_expected" class="oe_inline"/>,
<field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/> <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
</div> </div>
<label for="salary_proposed"/> <label for="salary_proposed"/>
<div> <div>
<field name="salary_proposed" class="oe_inline"/>, <field name="salary_proposed" class="oe_inline"/>,
<field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/> <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
</div> </div>
</group> </group>
@ -214,45 +209,29 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Jobs"> <search string="Search Jobs">
<filter icon="terp-mail-message-new" <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
string="Inbox" help="Unread messages" <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
name="needaction_pending" <separator/>
domain="[('needaction_pending','=',True)]"/> <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
<filter icon="terp-document-new" string="New" name="filter_new"/> <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
<field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/> <separator/>
<separator orientation="vertical"/> <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
<filter icon="terp-document-new" string="New" <separator/>
domain="[('state','=','draft')]" <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
help="All Initial Jobs"/> domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
<filter icon="terp-camera_test" string="In Progress" <field name="job_id"/>
domain="[('state','=','open')]" <field name="user_id"/>
help="Open Jobs"/>
<filter icon="terp-gtk-media-pause" string="Pending"
domain="[('state','=','pending')]"
help="Pending Jobs"/>
<filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
<filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
context="{'invisible_next_action':False, 'invisible_next_date':False}"
domain="[('date_action','&lt;&gt;',False)]"
help="Filter and view on next actions and date"/>
<separator orientation="vertical"/>
<field name="job_id" widget="selection"/>
<field name="user_id"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/> <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
<separator orientation="vertical"/>
<filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/> <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/> <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
</group> </group>
</search> </search>
@ -260,7 +239,6 @@
</record> </record>
<!-- CRM Lead Calendar View --> <!-- CRM Lead Calendar View -->
<record model="ir.ui.view" id="hr_applicant_calendar_view"> <record model="ir.ui.view" id="hr_applicant_calendar_view">
<field name="name">Hr Applicants Calendar</field> <field name="name">Hr Applicants Calendar</field>
<field name="model">hr.applicant</field> <field name="model">hr.applicant</field>
@ -269,15 +247,14 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar string="Applicants" <calendar string="Applicants"
date_start="date_action" color="user_id"> date_start="date_action" color="user_id">
<field name="name" /> <field name="name"/>
<field name="partner_name" /> <field name="partner_name"/>
<field name="title_action"/> <field name="title_action"/>
</calendar> </calendar>
</field> </field>
</record> </record>
<!-- hr Applicant Kanban View --> <!-- Hr Applicant Kanban View -->
<record model="ir.ui.view" id="hr_kanban_view_applicant"> <record model="ir.ui.view" id="hr_kanban_view_applicant">
<field name="name">Hr Applicants kanban</field> <field name="name">Hr Applicants kanban</field>
<field name="model">hr.applicant</field> <field name="model">hr.applicant</field>
@ -346,10 +323,7 @@
</field> </field>
</record> </record>
# ------------------------------------------------------ <!-- HR Job -->
# HR Job
# ------------------------------------------------------
<record id="hr_job_survey" model="ir.ui.view"> <record id="hr_job_survey" model="ir.ui.view">
<field name="name">hr.job.form1</field> <field name="name">hr.job.form1</field>
<field name="model">hr.job</field> <field name="model">hr.job</field>
@ -357,20 +331,19 @@
<field name="inherit_id" ref="hr.view_hr_job_form"/> <field name="inherit_id" ref="hr.view_hr_job_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="no_of_recruitment" version="7.0" position="after"> <field name="no_of_recruitment" version="7.0" position="after">
<label for="survey_id" /> <label for="survey_id" groups="base.group_user"/>
<div> <div groups="base.group_user">
<field name="survey_id" class="oe_inline"/> <field name="survey_id" class="oe_inline"/>
<button class="oe_inline" <button class="oe_inline"
string="Interview" icon="gtk-print" string="Interview" icon="gtk-print"
name="action_print_survey" type="object" name="action_print_survey" type="object"
attrs="{'invisible':[('survey_id','=',False)]}"/> attrs="{'invisible':[('survey_id','=',False)]}"/>
</div> </div>
</field> </field>
</field> </field>
</record> </record>
<!-- Stage Tree View --> <!-- Stage Tree View -->
<record model="ir.ui.view" id="hr_recruitment_stage_tree"> <record model="ir.ui.view" id="hr_recruitment_stage_tree">
<field name="name">hr.recruitment.stage.tree</field> <field name="name">hr.recruitment.stage.tree</field>
<field name="model">hr.recruitment.stage</field> <field name="model">hr.recruitment.stage</field>
@ -385,8 +358,7 @@
</field> </field>
</record> </record>
<!-- Stage Form View --> <!-- Stage Form View -->
<record model="ir.ui.view" id="hr_recruitment_stage_form"> <record model="ir.ui.view" id="hr_recruitment_stage_form">
<field name="name">hr.recruitment.stage.form</field> <field name="name">hr.recruitment.stage.form</field>
<field name="model">hr.recruitment.stage</field> <field name="model">hr.recruitment.stage</field>
@ -405,8 +377,7 @@
</field> </field>
</record> </record>
<!-- Stage Action --> <!-- Stage Action -->
<record id="hr_recruitment_stage_act" model="ir.actions.act_window"> <record id="hr_recruitment_stage_act" model="ir.actions.act_window">
<field name="name">Stages</field> <field name="name">Stages</field>
<field name="res_model">hr.recruitment.stage</field> <field name="res_model">hr.recruitment.stage</field>
@ -422,8 +393,7 @@
action="hr_recruitment_stage_act" action="hr_recruitment_stage_act"
sequence="1" groups="base.group_no_one"/> sequence="1" groups="base.group_no_one"/>
<!-- Degree Tree View --> <!-- Degree Tree View -->
<record model="ir.ui.view" id="hr_recruitment_degree_tree"> <record model="ir.ui.view" id="hr_recruitment_degree_tree">
<field name="name">hr.recruitment.degree.tree</field> <field name="name">hr.recruitment.degree.tree</field>
<field name="model">hr.recruitment.degree</field> <field name="model">hr.recruitment.degree</field>
@ -436,8 +406,7 @@
</field> </field>
</record> </record>
<!-- Degree Form View --> <!-- Degree Form View -->
<record model="ir.ui.view" id="hr_recruitment_degree_form"> <record model="ir.ui.view" id="hr_recruitment_degree_form">
<field name="name">hr.recruitment.degree.form</field> <field name="name">hr.recruitment.degree.form</field>
<field name="model">hr.recruitment.degree</field> <field name="model">hr.recruitment.degree</field>
@ -452,8 +421,7 @@
</field> </field>
</record> </record>
<!-- Degree Action --> <!-- Degree Action -->
<record id="hr_recruitment_degree_action" model="ir.actions.act_window"> <record id="hr_recruitment_degree_action" model="ir.actions.act_window">
<field name="name">Degree</field> <field name="name">Degree</field>
<field name="res_model">hr.recruitment.degree</field> <field name="res_model">hr.recruitment.degree</field>
@ -468,8 +436,7 @@
action="hr_recruitment_degree_action" action="hr_recruitment_degree_action"
sequence="5" groups="base.group_no_one"/> sequence="5" groups="base.group_no_one"/>
<!-- Source Tree View --> <!-- Source Tree View -->
<record model="ir.ui.view" id="hr_recruitment_source_tree"> <record model="ir.ui.view" id="hr_recruitment_source_tree">
<field name="name">hr.recruitment.source.tree</field> <field name="name">hr.recruitment.source.tree</field>
<field name="model">hr.recruitment.source</field> <field name="model">hr.recruitment.source</field>
@ -496,11 +463,12 @@
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem <menuitem
id="menu_hr_recruitment_source" id="menu_hr_recruitment_source"
parent="menu_hr_recruitment_recruitment" parent="menu_hr_recruitment_recruitment"
action="hr_recruitment_source_action" action="hr_recruitment_source_action"
sequence="10" groups="base.group_no_one"/> groups="base.group_no_one"
sequence="10"/>
</data> </data>
</openerp> </openerp>

47
addons/hr_recruitment/report/hr_recruitment_report_view.xml
View File

@ -49,55 +49,32 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Recruitment Analysis"> <search string="Recruitment Analysis">
<group> <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
<filter string="New" <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
icon="terp-document-new" <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
domain="[('state','=','draft')]" <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
help = "Draft recruitment"/> <separator/>
<filter string="In progress" <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
icon="terp-camera_test" <field name="job_id"/>
domain="[('state', '=' ,'open')]" <field name="department_id"/>
help = "In progress recruitment"/> <field name="user_id" string="Responsible"/>
<filter string="Pending"
icon="terp-gtk-media-pause"
domain="[('state','=','pending')]"
help = "Pending recruitment"/>
<filter string="Hired"
icon="terp-camera_test"
domain="[('state','=','done')]"
help = "Hired employees"/>
<filter icon="terp-personal"
string="My Recruitment"
help="My Recruitment"
domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/>
<field name="job_id"/>
<field name="department_id" widget="selection"/>
<field name="user_id" string="Responsible"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<!--field name="job_id"/--> <!--field name="job_id"/-->
<field name="priority"/> <field name="priority"/>
<field name="stage_id" widget="selection"/> <field name="stage_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="date" string="Creation Date"/> <field name="date" string="Creation Date"/>
<field name="date_closed"/> <field name="date_closed"/>
</group> </group>
<newline/>
<group expand="1" string="Group By ..."> <group expand="1" string="Group By ...">
<filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/> <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
<separator orientation="vertical"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" /> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/> <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>

4
addons/hr_recruitment/res_config.py
View File

@ -26,10 +26,10 @@ class hr_applicant_settings(osv.osv_memory):
_inherit = ['hr.config.settings', 'fetchmail.config.settings'] _inherit = ['hr.config.settings', 'fetchmail.config.settings']
_columns = { _columns = {
'module_document_ftp': fields.boolean('Automatic Indexation of Resumes', 'module_document_ftp': fields.boolean('allow the automatic indexation of resumes',
help="""Manage your CV's and motivation letter related to all applicants. help="""Manage your CV's and motivation letter related to all applicants.
This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"""), This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"""),
'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', 'fetchmail_applicants': fields.boolean('create applicants from an incoming email account',
fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications', fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',
help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com), help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
and create automatically application documents in the system."""), and create automatically application documents in the system."""),

29
addons/hr_recruitment/res_config_view.xml
View File

@ -7,23 +7,18 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/> <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<group name="timesheet_grp" position="after"> <div name="recruitment" position="inside">
<group> <div>
<label for="id" string="Recruitment"/> <field name="fetchmail_applicants" class="oe_inline"/>
<div> <label for="fetchmail_applicants"/>
<div> <button name="configure_fetchmail_applicants" type="object" string="configure" icon="gtk-go-forward"
<field name="module_document_ftp" class="oe_inline"/> attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
<label for="module_document_ftp"/> </div>
</div> <div>
<div> <field name="module_document_ftp" class="oe_inline"/>
<field name="fetchmail_applicants" class="oe_inline"/> <label for="module_document_ftp"/>
<label for="fetchmail_applicants"/> </div>
<button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward" </div>
attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
</div>
</div>
</group>
</group>
</field> </field>
</record> </record>
</data> </data>

13
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -68,24 +68,17 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet"> <search string="Timesheet">
<group> <field name="date"/>
<field name="date"/> <field name="user_id"/>
<separator orientation="vertical"/> <field name="account_id"/>
<field name="user_id"/>
<field name="account_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Analytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/> <filter string="Analytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<record id="account_analytic_account_timesheet_form" model="ir.ui.view"> <record id="account_analytic_account_timesheet_form" model="ir.ui.view">

19
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -126,6 +126,25 @@ class account_analytic_line(osv.osv):
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"), 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
} }
def _default_journal(self, cr, uid, context=None):
proxy = self.pool.get('hr.employee')
record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
employee = proxy.browse(cr, uid, record_ids[0], context=context)
return employee.journal_id and employee.journal_id.id or False
def _default_general_account(self, cr, uid, context=None):
proxy = self.pool.get('hr.employee')
record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
employee = proxy.browse(cr, uid, record_ids[0], context=context)
if employee.product_id and employee.product_id.property_account_income:
return employee.product_id.property_account_income.id
return False
_defaults = {
'journal_id' : _default_journal,
'general_account_id' : _default_general_account,
}
def write(self, cr, uid, ids, vals, context=None): def write(self, cr, uid, ids, vals, context=None):
self._check_inv(cr, uid, ids, vals) self._check_inv(cr, uid, ids, vals)
return super(account_analytic_line,self).write(cr, uid, ids, vals, return super(account_analytic_line,self).write(cr, uid, ids, vals,

10
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -89,11 +89,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="inherit_id" ref="account.view_account_analytic_line_filter"/> <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date" position="before"> <xpath expr="//filter[@name='others']" position="after">
<separator/>
<filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
<filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
<separator orientation="vertical"/> </xpath>
</field>
</field> </field>
</record> </record>
@ -144,9 +144,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Type of invoicing"> <search string="Type of invoicing">
<group> <field name="name" string="Type of invoicing"/>
<field name="name" string="Type of invoicing"/>
</group>
</search> </search>
</field> </field>
</record> </record>

52
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -46,29 +46,19 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by user"> <search string="Timesheet by user">
<group> <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
<filter icon="terp-personal" <field name="user_id"/>
string="Non Assigned timesheets to users" <field name="account_id" groups="analytic.group_analytic_accounting"/>
help="Non Assigned timesheets to users" <field name="product_id"/>
domain="[('user_id','=',False)]"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/> <field name="invoice_id"/>
<field name="invoice_id" widget="selection"/>
</group> </group>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/> <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/> <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
@ -149,12 +139,9 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by user"> <search string="Timesheet by user">
<group> <field name="name" string="Timesheet by users"/>
<field name="name" string="Timesheet by users"/> <field name="month"/>
<separator orientation="vertical"/> <field name="user_id"/>
<field name="user_id"/>
<field name="month"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -201,7 +188,6 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by invoice"> <search string="Timesheet by invoice">
<separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="manager_id"/> <field name="manager_id"/>
<field name="user_id"/> <field name="user_id"/>
@ -282,13 +268,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Daily timesheet by account"> <search string="Daily timesheet by account">
<group> <field name="name" string="Timesheet by account"/>
<field name="name" string="Timesheet by account"/> <field name="month"/>
<separator orientation="vertical"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="user_id"/>
<field name="user_id"/>
<field name="month"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -351,13 +334,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by account"> <search string="Timesheet by account">
<group> <field name="name" string="Timesheet by account"/>
<field name="name" string="Timesheet by account"/> <field name="month"/>
<separator orientation="vertical"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="user_id"/>
<field name="user_id"/>
<field name="month"/>
</group>
</search> </search>
</field> </field>
</record> </record>

11
addons/hr_timesheet_invoice/report/report_analytic_view.xml
View File

@ -113,13 +113,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Lines to Invoice"> <search string="Analytic Lines to Invoice">
<group> <field name="name" string="Analytic Lines"/>
<field name="name" string="Analytic Lines"/> <field name="month"/>
<separator orientation="vertical"/> <field name="product_id"/>
<field name="product_id"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="month"/>
</group>
</search> </search>
</field> </field>
</record> </record>

23
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -23,11 +23,9 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Account"> <search string="Search Account">
<group> <field name="name" groups="analytic.group_analytic_accounting"/>
<field name="sheet_id" /> <field name="invoice_rate"/>
<field name="name" groups="analytic.group_analytic_accounting"/> <field name="sheet_id" />
<field name="invoice_rate"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -158,16 +156,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Timesheet"> <search string="Search Timesheet">
<group> <field name="date_from"/>
<field name="date_from"/> <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
<filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/> <field name="employee_id"/>
<filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/> <field name="department_id"/>
<separator orientation="vertical"/>
<field name="employee_id"/>
<field name="department_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>

14
addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
View File

@ -40,29 +40,21 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet"> <search string="Timesheet">
<group> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="user_id"/>
<field name="user_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="general_account_id"/> <field name="general_account_id"/>
<field name="product_id"/> <field name="product_id"/>
<field name="journal_id"/> <field name="journal_id"/>
<separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="date" /> <field name="date" />
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/> <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
<filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>

37
addons/hr_timesheet_sheet/report/timesheet_report_view.xml
View File

@ -48,51 +48,30 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet"> <search string="Timesheet">
<group> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
<filter icon="terp-document-new" <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/>
string="Draft" <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
domain="[('state','=','draft')]"/> <field name="account_id"/>
<filter icon="terp-camera_test" <field name="user_id" />
string="Confirmed"
domain="[('state','=','confirm')]"/>
<filter icon="terp-dialog-close"
string="Done"
domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="account_id"/>
<field name="user_id" />
</group>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="general_account_id"/> <field name="general_account_id"/>
<field name="to_invoice" widget="selection"/> <field name="to_invoice"/>
<separator orientation="vertical"/>
<field name="product_id"/> <field name="product_id"/>
<separator orientation="vertical"/> <field name="department_id"/>
<field name="department_id" widget="selection"/> <field name="company_id" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="date_current"/> <field name="date_current"/>
<field name="date_to"/> <field name="date_to"/>
<field name="date_from"/> <field name="date_from"/>
</group> </group>
<newline/>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/>
<filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/> <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
<separator orientation="vertical"/>
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
<filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>

4
addons/hr_timesheet_sheet/res_config.py
View File

@ -26,8 +26,8 @@ class hr_timesheet_settings(osv.osv_memory):
_columns = { _columns = {
'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')], 'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')],
'Validate Timesheets Every', help="Periodicity on which you validate your timesheets."), 'Validate timesheets every', help="Periodicity on which you validate your timesheets."),
'timesheet_max_difference': fields.float('Timesheet Allowed Difference (Hours)', 'timesheet_max_difference': fields.float('Allow a difference of time between timesheets and attendances of (in hours)',
help="""Allowed difference in hours between the sign in/out and the timesheet help="""Allowed difference in hours between the sign in/out and the timesheet
computation for one sheet. Set this to 0 if you do not want any control."""), computation for one sheet. Set this to 0 if you do not want any control."""),
} }

18
addons/idea/idea_view.xml
View File

@ -110,22 +110,14 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Ideas"> <search string="Ideas">
<group> <field name="name" string="Idea"/>
<field name="name" string="Idea"/> <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
<separator orientation="vertical"/> <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
<filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/> <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
<filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/> <field name="category_ids"/>
<filter icon="terp-check" string="Accepted"
domain="[('state','=','close')]" help="Accepted Ideas" />
<separator orientation="vertical"/>
<field name="category_ids"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/> <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/> <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/> <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>

105
addons/import_base/i18n/pt_BR.po Normal file
View File

@ -0,0 +1,105 @@
# Brazilian Portuguese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-08-01 01:59+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: import_base
#: code:addons/import_base/import_framework.py:434
#, python-format
msgid "Import failed due to an unexpected error"
msgstr "A importação falhou devido a um erro inesperado"
#. module: import_base
#: code:addons/import_base/import_framework.py:461
#, python-format
msgid "started at %s and finished at %s \n"
msgstr "Início em %s e término em %s \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:448
#, python-format
msgid "Import of your data finished at %s"
msgstr "A Importação de seus dados terminou em %s"
#. module: import_base
#: code:addons/import_base/import_framework.py:463
#, python-format
msgid ""
"but failed, in consequence no data were imported to keep database "
"consistency \n"
" error : \n"
msgstr ""
"mas falhou, por isso nenhum dado foi importado para manter a consistência do "
"banco de dados \n"
" erro: \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:477
#, python-format
msgid ""
"The import of data \n"
" instance name : %s \n"
msgstr ""
"A importação de dados \n"
" nome da instância: %s \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:470
#, python-format
msgid "%s has been successfully imported from %s %s, %s \n"
msgstr "%s foi importada com sucesso de %s %s, %s \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:447
#, python-format
msgid "Data Import failed at %s due to an unexpected error"
msgstr "A importação falhou em %s devido a um erro inesperado"
#. module: import_base
#: code:addons/import_base/import_framework.py:436
#, python-format
msgid "Import finished, notification email sended"
msgstr "Importação Concluída, o email de notificação foi enviado"
#. module: import_base
#: code:addons/import_base/import_framework.py:190
#, python-format
msgid "%s is not a valid model name"
msgstr "%s não é um nome de modelo válido"
#. module: import_base
#: model:ir.ui.menu,name:import_base.menu_import_crm
msgid "Import"
msgstr "Importar"
#. module: import_base
#: code:addons/import_base/import_framework.py:467
#, python-format
msgid "with no warning"
msgstr "sem nenhum erro"
#. module: import_base
#: code:addons/import_base/import_framework.py:469
#, python-format
msgid "with warning : %s"
msgstr "com avisos: %s"
#. module: import_base
#: code:addons/import_base/import_framework.py:191
#, python-format
msgid " fields imported : "
msgstr " campos importados: "

2
addons/lunch/lunch.py
View File

@ -210,7 +210,7 @@ class report_lunch_amount(osv.osv):
_name = 'report.lunch.amount' _name = 'report.lunch.amount'
_description = "Amount available by user and box" _description = "Amount available by user and box"
_auto = False _auto = False
_rec_name = "user" _rec_name = "user_id"
_columns = { _columns = {
'user_id': fields.many2one('res.users', 'User Name', readonly=True), 'user_id': fields.many2one('res.users', 'User Name', readonly=True),

20
addons/lunch/lunch_view.xml
View File

@ -76,12 +76,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Lunch Order"> <search string="Search Lunch Order">
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/>
<filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/> <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
<separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category'}"/> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category'}"/>
</group> </group>
@ -192,12 +189,9 @@
<search string="Search CashMove"> <search string="Search CashMove">
<field name="create_date"/> <field name="create_date"/>
<field name="user_cashmove"/> <field name="user_cashmove"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_cashmove'}"/> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_cashmove'}"/>
<separator orientation="vertical"/>
<filter string="Box" icon="terp-dolar" domain="[]" context="{'group_by':'box'}"/> <filter string="Box" icon="terp-dolar" domain="[]" context="{'group_by':'box'}"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-today" domain="[]" context="{'group_by':'create_date'}"/> <filter string="Date" icon="terp-go-today" domain="[]" context="{'group_by':'create_date'}"/>
</group> </group>
</search> </search>
@ -301,8 +295,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Products"> <search string="Products">
<field name="name" string="Product"/> <field name="name" string="Product"/>
<field name="category_id"/>
<field name="price"/> <field name="price"/>
<field name="category_id"/>
</search> </search>
</field> </field>
</record> </record>
@ -375,14 +369,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Box Amount by User"> <search string="Box Amount by User">
<group> <field name="date"/>
<field name="date"/> <field name="box"/>
<separator orientation="vertical"/> <field name="amount"/>
<field name="user_id"/> <field name="user_id"/>
<field name="box"/>
<field name="amount"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/> <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
</group> </group>

7
addons/lunch/report/report_lunch_order_view.xml
View File

@ -25,19 +25,14 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Lunch Order Analysis"> <search string="Lunch Order Analysis">
<group> <field name="date"/>
<field name="date"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/> <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group> </group>
<newline/>
</search> </search>
</field> </field>
</record> </record>

16
addons/mail/data/mail_demo.xml
View File

@ -29,10 +29,10 @@
<field name="model">mail.group</field> <field name="model">mail.group</field>
<field name="res_id" ref="group_all_company"/> <field name="res_id" ref="group_all_company"/>
<field name="content_subtype">html</field> <field name="content_subtype">html</field>
<field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus. <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla.
Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field> Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
<field name="type">comment</field> <field name="type">comment</field>
@ -54,11 +54,11 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
<field name="model">mail.group</field> <field name="model">mail.group</field>
<field name="res_id" ref="group_all_company"/> <field name="res_id" ref="group_all_company"/>
<field name="content_subtype">html</field> <field name="content_subtype">html</field>
<field name="body_html"><![CDATA[Agreed ! <field name="body_html"><![CDATA[Agreed !
Would it be possible to learn more about the author ? (second comment)]]></field> Would it be possible to learn more about the author ? (second comment)]]></field>
<field name="parent_id" ref="message_blogpost0"/> <field name="parent_id" ref="message_blogpost0"/>
<field name="type">comment</field> <field name="type">comment</field>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_demo"/>
</record> </record>
<record id="message_blogpost0_comment2_attachment0" model="ir.attachment"> <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
@ -76,10 +76,10 @@ Would it be possible to learn more about the author ? (second comment)]]></fiel
<field name="model">mail.group</field> <field name="model">mail.group</field>
<field name="res_id" ref="group_all_company"/> <field name="res_id" ref="group_all_company"/>
<field name="content_subtype">html</field> <field name="content_subtype">html</field>
<field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue. In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu. Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
Check the file in attachment for more information ! (third comment)]]></field> Check the file in attachment for more information ! (third comment)]]></field>
<field name="parent_id" ref="message_blogpost0"/> <field name="parent_id" ref="message_blogpost0"/>

1
addons/mail/mail_group_view.xml
View File

@ -104,7 +104,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Groups"> <search string="Search Groups">
<field name="name" string="Group"/> <field name="name" string="Group"/>
<separator orientation="vertical"/>
<field name="responsible_id"/> <field name="responsible_id"/>
</search> </search>
</field> </field>

11
addons/mail/mail_message_view.xml
View File

@ -64,9 +64,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Messages Search"> <search string="Messages Search">
<field name="model" string="Message"/> <field name="model" string="Message"/>
<separator orientation="vertical"/>
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
</search> </search>
</field> </field>
@ -80,7 +78,6 @@
<field name="priority">25</field> <field name="priority">25</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Messages Search"> <search string="Messages Search">
<field name="user_id"/>
<field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" /> <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
<field name="type"/> <field name="type"/>
<filter icon="terp-personal+" string="My Feeds" <filter icon="terp-personal+" string="My Feeds"
@ -105,6 +102,7 @@
domain="[ ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')), domain="[ ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00')) ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
]"/> ]"/>
<field name="user_id"/>
</search> </search>
</field> </field>
</record> </record>
@ -208,31 +206,26 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Email Search"> <search string="Email Search">
<field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/> <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
<separator orientation="vertical"/>
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/> <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
<filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/> <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
<filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/> <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
<filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/> <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
<separator/>
<filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/> <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
<filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/> <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
<filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/> <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
<newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
<field name="user_id" string="User"/> <field name="user_id" string="User"/>
<field name="partner_id" string="Partner Name"/> <field name="partner_id" string="Partner Name"/>
<field name="model"/> <field name="model"/>
<field name="res_id"/> <field name="res_id"/>
</group> </group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/> <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
<separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group> </group>
</search> </search>

3
addons/mail/mail_thread_view.xml
View File

@ -9,7 +9,8 @@
sequence="10"/> sequence="10"/>
<!-- left-side menu: Feeds !--> <!-- left-side menu: Feeds !-->
<menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/> <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
<record id="mail_wallfeeds" model="ir.ui.menu"> <record id="mail_wallfeeds" model="ir.ui.menu">
<field name="name">News Feed</field> <field name="name">News Feed</field>
<field name="sequence" eval="10"/> <field name="sequence" eval="10"/>

100
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -4,19 +4,14 @@
<menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/> <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
<!-- <!-- Marketing Campaign -->
======================
Marketing Campaign
======================
-->
<act_window name="All Segments" <act_window name="All Segments"
res_model="marketing.campaign.segment" res_model="marketing.campaign.segment"
src_model="marketing.campaign" src_model="marketing.campaign"
view_type="form" view_type="form"
view_mode="tree,form" view_mode="tree,form"
id="act_marketing_campaing_segment_opened" id="act_marketing_campaing_segment_opened"
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}" context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
/>
<!-- Campaign Followups --> <!-- Campaign Followups -->
<act_window <act_window
@ -24,7 +19,7 @@
id="act_marketing_campaing_followup" id="act_marketing_campaing_followup"
name="Campaign Follow-up" res_model="marketing.campaign.workitem" name="Campaign Follow-up" res_model="marketing.campaign.workitem"
src_model="marketing.campaign" view_mode="tree,form" src_model="marketing.campaign" view_mode="tree,form"
view_type="form" /> view_type="form"/>
<record model="ir.ui.view" id="view_marketing_campaign_form"> <record model="ir.ui.view" id="view_marketing_campaign_form">
<field name="name">marketing.campaign.form</field> <field name="name">marketing.campaign.form</field>
@ -43,10 +38,10 @@
<div class="oe_right oe_button_box" name="button_box"> <div class="oe_right oe_button_box" name="button_box">
<button type="action" <button type="action"
name="%(act_marketing_campaing_followup)d" name="%(act_marketing_campaing_followup)d"
string="Follow-Up" /> string="Follow-Up"/>
<button type="action" <button type="action"
name="%(act_marketing_campaing_segment_opened)d" name="%(act_marketing_campaing_segment_opened)d"
string="Segments" /> string="Segments"/>
</div> </div>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
@ -61,10 +56,10 @@
<field name="object_id"/> <field name="object_id"/>
<field name="partner_field_id"/> <field name="partner_field_id"/>
<field name="unique_field_id"/> <field name="unique_field_id"/>
</group> </group>
</group> </group>
<separator string="Activities"/> <separator string="Activities"/>
<field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" /> <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}"/>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -114,19 +109,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Campaigns"> <search string="Campaigns">
<field name="name" string="Campaign"/> <field name="name" string="Campaign"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/> <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
<filter icon="terp-check" string="Running" domain="[('state','=','running')]"/> <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
<separator/>
<filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/> <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
<filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/> <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
<separator orientation="vertical"/>
<field name="object_id" string="Resource"/> <field name="object_id" string="Resource"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/> <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
<separator orientation="vertical"/>
<filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/> <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
<separator orientation="vertical"/>
<filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>
@ -146,14 +137,9 @@
</record> </record>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/> <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30" /> <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30"/>
<!--
======================
Marketing Segments
======================
-->
<!-- Marketing Segments -->
<record model="ir.ui.view" id="view_marketing_campaign_segment_form"> <record model="ir.ui.view" id="view_marketing_campaign_segment_form">
<field name="name">marketing.campaign.segment.form</field> <field name="name">marketing.campaign.segment.form</field>
<field name="model">marketing.campaign.segment</field> <field name="model">marketing.campaign.segment</field>
@ -202,7 +188,7 @@
<field name="campaign_id"/> <field name="campaign_id"/>
<field name="date_run"/> <field name="date_run"/>
<field name="sync_last_date"/> <field name="sync_last_date"/>
<field name="state" /> <field name="state"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -214,23 +200,18 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Segments"> <search string="Segments">
<field name="name" string="Segment"/> <field name="name" string="Segment"/>
<separator orientation="vertical"/>
<field name="date_run"/> <field name="date_run"/>
<separator orientation="vertical"/>
<filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/> <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
<separator/>
<filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/> <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
<filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/> <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
<filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/> <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
<separator orientation="vertical"/>
<field name="campaign_id"/> <field name="campaign_id"/>
<field name="object_id"/> <field name="object_id"/>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/> <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/> <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
</group> </group>
</search> </search>
@ -248,16 +229,12 @@
<field name="context">{'group_by': []}</field> <field name="context">{'group_by': []}</field>
</record> </record>
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" /> <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20"/>
<!-- <!--
====================== Marketing Activities
Marketing Activities These views are not intended to be used outside the campaign context.
======================
these views are not intended to be used outside the campaign context.
--> -->
<record model="ir.ui.view" id="view_marketing_campaign_activity_form"> <record model="ir.ui.view" id="view_marketing_campaign_activity_form">
<field name="name">marketing.campaign.activity.form</field> <field name="name">marketing.campaign.activity.form</field>
<field name="model">marketing.campaign.activity</field> <field name="model">marketing.campaign.activity</field>
@ -285,7 +262,7 @@
<group> <group>
<field name="type"/> <field name="type"/>
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}" <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
context="{'default_model_id':object_id}" /> context="{'default_model_id':object_id}"/>
<field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/> <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
<field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/> <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
<field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/> <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
@ -344,12 +321,7 @@
</record> </record>
<!-- <!-- Marketing Workitems -->
======================
Marketing Workitems
======================
-->
<record model="ir.ui.view" id="view_marketing_campaign_workitem_tree"> <record model="ir.ui.view" id="view_marketing_campaign_workitem_tree">
<field name="name">marketing.campaign.workitem.tree</field> <field name="name">marketing.campaign.workitem.tree</field>
<field name="model">marketing.campaign.workitem</field> <field name="model">marketing.campaign.workitem</field>
@ -358,10 +330,10 @@
<tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities"> <tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities">
<field name="campaign_id"/> <field name="campaign_id"/>
<field name="segment_id"/> <field name="segment_id"/>
<field name="activity_id" /> <field name="activity_id"/>
<field name="object_id" invisible="1"/> <field name="object_id" invisible="1"/>
<field name="res_id" invisible="1"/> <field name="res_id" invisible="1"/>
<field name="res_name" /> <field name="res_name"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="date"/> <field name="date"/>
<field name="state"/> <field name="state"/>
@ -414,31 +386,22 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Marketing Campaign Activities"> <search string="Marketing Campaign Activities">
<group> <field name="res_name" string="Marketing Campaign Activity"/>
<field name="res_name" string="Marketing Campaign Activity"/> <field name="date"/>
<separator orientation="vertical"/> <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
<field name="date"/> <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
<separator orientation="vertical"/> <field name="campaign_id"/>
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/> <field name="segment_id"/>
<filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/> <field name="object_id"/>
<separator orientation="vertical"/> <field name="partner_id"/>
<field name="campaign_id"/> <field name="res_id"/>
<field name="segment_id"/>
<field name="object_id"/>
<field name="partner_id"/>
<field name="res_id"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/> <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
<filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/> <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
<filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/> <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
<separator orientation="vertical"/>
<filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/> <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
<filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/> <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/> <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
</group> </group>
</search> </search>
@ -464,8 +427,7 @@
view_type="form" view_type="form"
view_mode="tree,form" view_mode="tree,form"
id="act_marketing_campaing_segment_opened" id="act_marketing_campaing_segment_opened"
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}" context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
/>
<!-- Campaign Follow-ups --> <!-- Campaign Follow-ups -->
<act_window <act_window
@ -473,7 +435,7 @@
id="act_marketing_campaing_followup" id="act_marketing_campaing_followup"
name="Campaign Follow-up" res_model="marketing.campaign.workitem" name="Campaign Follow-up" res_model="marketing.campaign.workitem"
src_model="marketing.campaign" view_mode="tree,form" src_model="marketing.campaign" view_mode="tree,form"
view_type="form" /> view_type="form"/>
<!-- Campaign Statistics --> <!-- Campaign Statistics -->
<act_window <act_window
@ -481,7 +443,7 @@
id="act_marketing_campaing_stat" id="act_marketing_campaing_stat"
name="Campaign Statistics" res_model="campaign.analysis" name="Campaign Statistics" res_model="campaign.analysis"
src_model="marketing.campaign" view_mode="tree,form" src_model="marketing.campaign" view_mode="tree,form"
view_type="form" /> view_type="form"/>
</data> </data>
</openerp> </openerp>

Some files were not shown because too many files have changed in this diff Show More