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

merge 

bzr revid: fp@tinyerp.com-20091126075703-7zj8iksoahs0omig
This commit is contained in:
Fabien Pinckaers 2009-11-26 08:57:03 +01:00
parent 8ab5c34ce6 d8dc05715d
commit 1b12a5a8c1
77 changed files with 758 additions and 834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account/account.py
View File

@ -526,7 +526,8 @@ class account_fiscalyear(osv.osv):
'date_start': fields.date('Start Date', required=True),
'date_stop': fields.date('End Date', required=True),
'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'),
}
_defaults = {
@ -590,7 +591,8 @@ class account_period(osv.osv):
'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
'company_id': fields.many2one('res.company', 'Company', required=True)
}
_defaults = {
@ -674,7 +676,8 @@ class account_journal_period(osv.osv):
'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
'active': fields.boolean('Active', required=True),
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
'company_id' : fields.many2one('res.company', 'Company')
}
@ -761,7 +764,8 @@ class account_move(osv.osv):
'ref': fields.char('Ref', size=64),
'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True,
help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Posted\' state.'),
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
'to_check': fields.boolean('To Be Verified'),
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
@ -1613,7 +1617,7 @@ class account_subscription(osv.osv):
'period_total': fields.integer('Number of Periods', required=True),
'period_nbr': fields.integer('Period', required=True),
'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
}

4
addons/account/account_bank_statement.py
View File

@ -126,7 +126,9 @@ class account_bank_statement(osv.osv):
'Entry lines', states={'confirm':[('readonly',True)]}),
'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
'State', required=True,
states={'confirm': [('readonly', True)]}, readonly="1"),
states={'confirm': [('readonly', True)]}, readonly="1",
help='When new statement is created the state will be \'Draft\'. \
\n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
'currency': fields.function(_currency, method=True, string='Currency',
type='many2one', relation='res.currency'),
}

24
addons/account/account_invoice_view.xml
View File

@ -327,7 +327,7 @@
<search string="Search Invoice">
<group col="10" colspan="4">
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Invoices"/>
<filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<field name="number" select='1'/>
@ -392,7 +392,6 @@
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
</record>
<menuitem action="action_invoice_tree1_new" sequence="50" id="menu_action_invoice_tree1_new" parent="menu_action_invoice_tree1"/>
<record id="action_invoice_tree2" model="ir.actions.act_window">
<field name="name">Supplier Invoices</field>
@ -414,7 +413,6 @@
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
</record>
<menuitem action="action_invoice_tree2_new" sequence="50" id="menu_action_invoice_tree2_new" parent="menu_action_invoice_tree2"/>
<record id="action_invoice_tree3" model="ir.actions.act_window">
<field name="name">Customer Refunds</field>
@ -437,7 +435,6 @@
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
</record>
<menuitem action="action_invoice_tree3_new" sequence="50" id="menu_action_invoice_tree3_new" parent="menu_action_invoice_tree3"/>
<record id="action_invoice_tree4" model="ir.actions.act_window">
<field name="name">Supplier Refunds</field>
@ -460,7 +457,6 @@
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
</record>
<menuitem action="action_invoice_tree4_new" sequence="50" id="menu_action_invoice_tree4_new" parent="menu_action_invoice_tree4"/>
<record id="action_invoice_tree5" model="ir.actions.act_window">
@ -485,8 +481,6 @@
<field name="act_window_id" ref="action_invoice_tree5"/>
</record>
<menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
<record id="action_invoice_tree6" model="ir.actions.act_window">
<field name="name">PRO-FORMA Customer Invoices</field>
<field name="res_model">account.invoice</field>
@ -509,8 +503,6 @@
<field name="act_window_id" ref="action_invoice_tree6"/>
</record>
<menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
<record id="action_invoice_tree7" model="ir.actions.act_window">
<field name="name">Unpaid Customer Invoices</field>
<field name="res_model">account.invoice</field>
@ -533,8 +525,6 @@
<field name="act_window_id" ref="action_invoice_tree7"/>
</record>
<menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
<record id="action_invoice_tree8" model="ir.actions.act_window">
<field name="name">Draft Supplier Invoices</field>
<field name="res_model">account.invoice</field>
@ -557,8 +547,6 @@
<field name="act_window_id" ref="action_invoice_tree8"/>
</record>
<menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended"/>
<record id="action_invoice_tree9" model="ir.actions.act_window">
<field name="name">Unpaid Supplier Invoices</field>
<field name="res_model">account.invoice</field>
@ -581,8 +569,6 @@
<field name="act_window_id" ref="action_invoice_tree9"/>
</record>
<menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended"/>
<record id="action_invoice_tree10" model="ir.actions.act_window">
<field name="name">Draft Customer Refunds</field>
<field name="res_model">account.invoice</field>
@ -605,8 +591,6 @@
<field name="act_window_id" ref="action_invoice_tree10"/>
</record>
<menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended"/>
<record id="action_invoice_tree11" model="ir.actions.act_window">
<field name="name">Unpaid Customer Refunds</field>
<field name="res_model">account.invoice</field>
@ -629,8 +613,6 @@
<field name="act_window_id" ref="action_invoice_tree11"/>
</record>
<menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended"/>
<record id="action_invoice_tree12" model="ir.actions.act_window">
<field name="name">Draft Supplier Refunds</field>
<field name="res_model">account.invoice</field>
@ -653,8 +635,6 @@
<field name="act_window_id" ref="action_invoice_tree12"/>
</record>
<menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended"/>
<record id="action_invoice_tree13" model="ir.actions.act_window">
<field name="name">Unpaid Supplier Refunds</field>
<field name="res_model">account.invoice</field>
@ -677,8 +657,6 @@
<field name="act_window_id" ref="action_invoice_tree13"/>
</record>
<menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended"/>
<act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
<act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>

3
addons/account/account_move_line.py
View File

@ -377,7 +377,8 @@ class account_move_line(osv.osv):
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
this field will contain the basic amount(without tax)."),

4
addons/account/account_view.xml
View File

@ -394,7 +394,6 @@
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended"/>
<record id="action_bank_statement_tree2" model="ir.actions.act_window">
<field name="name">New Statement</field>
@ -402,7 +401,6 @@
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="action_bank_statement_tree2" id="menu_bank_statement_tree2" parent="menu_bank_statement_tree"/>
<record id="view_bank_statement_reconcile" model="ir.ui.view">
<field name="name">account.bank.statement.reconcile.form</field>
@ -1350,7 +1348,6 @@
<field name="domain">[('state','=','running')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended"/>
<record id="action_subscription_form_new" model="ir.actions.act_window">
<field name="name">New Subscription</field>
@ -1359,7 +1356,6 @@
<field name="view_mode">form,tree</field>
<field name="view_id" ref="view_subscription_form"/>
</record>
<menuitem action="action_subscription_form_new" id="menu_action_subscription_form_new" parent="menu_action_subscription_form"/>
<record id="view_subscription_line_form_complete" model="ir.ui.view">
<field name="name">account.subscription.line.form</field>

2
addons/account/process/customer_invoice_process.xml
View File

@ -28,7 +28,7 @@
</record>
<record id="process_node_draftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_invoice_draft"/>
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>

2
addons/account/process/supplier_invoice_process.xml
View File

@ -28,7 +28,7 @@
</record>
<record id="process_node_supplierdraftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_invoice_draft"/>
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>

6
addons/account/project/project.py
View File

@ -189,7 +189,11 @@ class account_analytic_account(osv.osv):
'date': fields.date('Date End'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True),
'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True,
help='* When an account is created its in \'Draft\' state.\
\n* If any associated partner is there, it can be in \'Open\' state.\
\n* If any pending balance is there it can be in \'Pending\'. \
\n* And finally when all the transactions are over, it can be in \'Close\' state.'),
}
def _default_company(self, cr, uid, context={}):

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

@ -116,7 +116,6 @@
<field name="view_mode">form,tree,graph</field>
<field eval="view_account_analytic_account_form" name="view_id"/>
</record>
<menuitem action="analytic_account_form" id="account_analytic_form" parent="account.account_analytic_def_account"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>

23
addons/account/security/account_security.xml
View File

@ -63,7 +63,7 @@
</record>
<record id="journal_period_comp_rule_group" model="ir.rule.group">
<field name="name">Journal Period</field>
<field model="ir.model" ref="model_account_journal_period"/>
<field model="ir.model" name="model_id" ref="model_account_journal_period"/>
<field eval="True" name="global"/>
</record>
<record id="journal_period_comp_rule" model="ir.rule">
@ -72,10 +72,10 @@
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="journal_period_comp_rule_group"/>
</record>
<record id="journal_comp_rule_group" model="ir.rule.group">
<field name="name">Journal multi-company</field>
<field model="ir.model" ref="model_account_journal"/>
<field model="ir.model" name="model_id" ref="model_account_journal"/>
<field eval="True" name="global"/>
</record>
<record id="journal_comp_rule" model="ir.rule">
@ -84,10 +84,9 @@
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="journal_comp_rule_group"/>
</record>
<record id="analytic_journal_comp_rule_group" model="ir.rule.group">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" ref="model_account_analytic_journal"/>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
</record>
<record id="analytic_journal_comp_rule" model="ir.rule">
@ -98,7 +97,7 @@
</record>
<record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" ref="model_account_analytic_journal"/>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
</record>
@ -111,7 +110,7 @@
<record id="period_comp_rule_group" model="ir.rule.group">
<field name="name">Period multi-company</field>
<field model="ir.model" ref="model_account_period"/>
<field model="ir.model" name="model_id" ref="model_account_period"/>
<field eval="True" name="global"/>
</record>
<record id="period_comp_rule" model="ir.rule">
@ -124,7 +123,7 @@
<record id="fiscal_year_comp_rule_group" model="ir.rule.group">
<field name="name">Fiscal year multi-company</field>
<field model="ir.model" ref="model_account_fiscalyear"/>
<field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
<field eval="True" name="global"/>
</record>
<record id="fiscal_year_comp_rule" model="ir.rule">
@ -136,7 +135,7 @@
<record id="account_comp_rule_group" model="ir.rule.group">
<field name="name">Account multi-company</field>
<field model="ir.model" ref="model_account_account"/>
<field model="ir.model" name="model_id" ref="model_account_account"/>
<field eval="True" name="global"/>
</record>
<record id="account_comp_rule" model="ir.rule">
@ -148,7 +147,7 @@
<record id="tax_comp_rule_group" model="ir.rule.group">
<field name="name">Tax multi-company</field>
<field model="ir.model" ref="model_account_tax"/>
<field model="ir.model" name="model_id" ref="model_account_tax"/>
<field eval="True" name="global"/>
</record>
<record id="tax_comp_rule" model="ir.rule">
@ -160,7 +159,7 @@
<record id="tax_code_comp_rule_group" model="ir.rule.group">
<field name="name">Tax code multi-company</field>
<field model="ir.model" ref="model_account_tax_code"/>
<field model="ir.model" name="model_id" ref="model_account_tax_code"/>
<field eval="True" name="global"/>
</record>
<record id="tax_code_comp_rule" model="ir.rule">
@ -172,7 +171,7 @@
<record id="invoice_comp_rule_group" model="ir.rule.group">
<field name="name">Invoice multi-company</field>
<field model="ir.model" ref="model_account_invoice"/>
<field model="ir.model" name="model_id" ref="model_account_invoice"/>
<field eval="True" name="global"/>
</record>
<record id="invoice_comp_rule" model="ir.rule">

41
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="action_account_analytic_managed" model="ir.actions.act_window">
@ -7,13 +6,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem
id="next_id_71"
name="Financial Project Management"
parent="project.menu_main"
groups="account.group_account_invoice"
sequence="20"/>
<menuitem id="next_id_71" name="Financial Project Management" parent="project.menu_main" groups="account.group_account_invoice" sequence="20"/>
<menuitem id="menu_account" name="Analytic Accounts" parent="next_id_71" sequence="10"/>
<menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
@ -21,6 +16,7 @@
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -34,6 +30,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
</record>
<menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="menu_invoicing"/>
@ -42,38 +39,25 @@
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended"/>
<record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
<field name="name">My Pending Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended"/>
<record id="action_account_analytic_new" model="ir.actions.act_window">
<field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,graph</field>
</record>
<menuitem
action="action_account_analytic_new"
id="menu_action_account_analytic_new"
sequence="50"
parent="account_analytic_analysis.menu_account"/>
<record id="action_account_analytic_all" model="ir.actions.act_window">
<field name="name">All Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
@ -88,27 +72,25 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
</record>
<menuitem
action="action_account_analytic_managed_overpassed"
id="menu_action_account_analytic_managed_overpassed"
sequence="50"
parent="menu_invoicing"/>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing"/>
<record id="action_account_analytic_all_open" model="ir.actions.act_window">
<field name="name">Current Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all" groups="base.group_extended"/>
<record id="action_account_analytic_all_pending" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
@ -116,7 +98,6 @@
<field name="domain">[('state','=','pending')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all" groups="base.group_extended"/>
</data>
</openerp>

3
addons/account_payment/payment.py
View File

@ -100,7 +100,8 @@ class payment_order(osv.osv):
('draft', 'Draft'),
('open','Confirmed'),
('cancel','Cancelled'),
('done','Done')], 'State', select=True),
('done','Done')], 'State', select=True,
help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
'line_ids': fields.one2many('payment.line','order_id','Payment lines',states={'done':[('readonly',True)]}),
'total': fields.function(_total, string="Total", method=True,
type='float'),

5
addons/account_payment/payment_view.xml
View File

@ -192,7 +192,6 @@
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="2" groups="base.group_extended"/>
<record id="action_payment_order_open" model="ir.actions.act_window">
<field name="name">Payment Orders to Validate</field>
@ -202,16 +201,12 @@
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="3" groups="base.group_extended"/>
<record id="action_payment_order_tree_new" model="ir.actions.act_window">
<field name="name">New Payment Order</field>
<field name="res_model">payment.order</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="action_payment_order_tree_new" id="menu_action_payment_order_form_new" parent="account_payment.menu_action_payment_order_form" sequence="1"/>
<record id="view_payment_line_form" model="ir.ui.view">
<field name="name">Payment Line</field>

13
addons/auction/auction.py
View File

@ -75,7 +75,8 @@ class auction_dates(osv.osv):
'acc_income': fields.many2one('account.account', 'Income Account', required=True),
'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True),
'state': fields.selection((('draft','Draft'),('closed','Closed')),'Status',select=1, readonly=True),
'state': fields.selection((('draft','Draft'),('closed','Closed')),'State',select=1, readonly=True,
help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
}
@ -442,7 +443,7 @@ class auction_lots(osv.osv):
# 'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True),
'paid_vnd':fields.boolean('Seller Paid'),
'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True),
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'Status', required=True, readonly=True),
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'State', required=True, readonly=True),
'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True),
'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True),
'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True),
@ -989,7 +990,7 @@ class report_seller_auction(osv.osv):
'avg_price':fields.float('Avg adjudication',readonly=True),
'avg_estimation':fields.float('Avg estimation',readonly=True),
'date': fields.date('Create Date', required=True, select=1),
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'Status',readonly=True, select=1)
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'State',readonly=True, select=1)
}
def init(self, cr):
@ -1199,7 +1200,7 @@ class report_auction_adjudication(osv.osv):
_auto = False
_columns = {
'name': fields.many2one('auction.dates','Auction date',readonly=True,select=1),
'state': fields.selection((('draft','Draft'),('close','Closed')),'Status', select=1),
'state': fields.selection((('draft','Draft'),('close','Closed')),'State', select=1),
'adj_total': fields.float('Total Adjudication'),
'date': fields.date('Date', readonly=True,select=1),
'user_id':fields.many2one('res.users', 'User',select=1)
@ -1305,7 +1306,7 @@ class report_object_encoded(osv.osv):
_description = "Object encoded"
_auto = False
_columns = {
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'Status', required=True,select=1),
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'State', required=True,select=1),
'user_id':fields.many2one('res.users', 'User', select=1),
'estimation': fields.float('Estimation',select=2),
'date': fields.date('Create Date', required=True),
@ -1375,7 +1376,7 @@ class report_unclassified_objects(osv.osv):
'obj_num': fields.integer('Catalog Number'),
'obj_price': fields.float('Adjudication price'),
'lot_num': fields.integer('List Number', required=True, select=1 ),
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'Status', required=True, readonly=True),
'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'State', required=True, readonly=True),
'obj_comm': fields.boolean('Commission'),
'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True),
'ach_login': fields.char('Buyer Username',size=64),

21
addons/auction/auction_view.xml
View File

@ -138,8 +138,8 @@
<field name="view_type">form</field>
<field name="domain">[('state','=','closed')]</field>
<field name="view_id" ref="view_auction_dates_tree"/>
<field name="filter" eval="True"/>
</record>
<menuitem parent="auction_date_menu" name="Old Auction Dates" id="menu_auction_dates_old" action="action_auction_dates_old"/>
<record model="ir.actions.act_window" id="action_auction_dates1">
<field name="res_model">auction.dates</field>
@ -366,6 +366,7 @@
</record>
<record model="ir.actions.act_window" id="action_all_objects_sold">
<field name="name">Sold Objects</field>
<field name="res_model">auction.lots</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','sold')]</field>
@ -375,26 +376,23 @@
<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_all_objects_to_sell">
<field name="name">Objects to sell</field>
<field name="res_model">auction.lots</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','&lt;&gt;','sold')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="Objects to sell" parent="auction_all_objects_menu" action="action_all_objects_to_sell" id="menu_all_objects_to_sell" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_all_objects_unplanned">
<field name="name">Unplanned objects</field>
<field name="res_model">auction.lots</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="Unplanned objects" parent="auction_all_objects_menu" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1" groups="base.group_extended"/>
<!-- for the sold object start-->
@ -405,14 +403,6 @@
<field name="domain">[('state','=','unsold')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem
name="Unsold Objects"
parent="auction_all_objects_menu"
action="action_all_objects_unsold"
id="menu_all_objects_unsold"
groups="base.group_extended"/>
<!-- form3: simplified form meant for during the sale (action button in dates) -->
<!--form par defaut-->
@ -486,7 +476,6 @@
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="Unclassified objects" parent="auction_all_objects_menu" action="action_unclassified_objects" id="menu_all_objects_unclassified" groups="base.group_extended"/>
<record model="ir.ui.view" id="v12">
<field name="name">Auction.deposit.tree</field>
@ -501,8 +490,6 @@
</field>
</record>
<record model="ir.ui.view" id="view_deposit_border_form">
<field name="name">auction.deposit.form</field>
<field name="model">auction.deposit</field>

4
addons/audittrail/audittrail_view.xml
View File

@ -53,13 +53,13 @@
<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
<field name="name">Rules</field>
<field name="name">Subscribed Rules</field>
<field name="res_model">audittrail.rule</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','subscribed')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="Subscribed Rules" id="menu_action_audittrail_rule_tree_sub" action="action_audittrail_rule_tree_sub" parent="menu_action_audittrail_rule_tree"/>
<record model="ir.ui.view" id="view_audittrail_log_form">
<field name="name">audittrail.log.form</field>

2
addons/base_report_creator/base_report_creator.py
View File

@ -314,7 +314,7 @@ class report_creator(osv.osv):
'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id','model_id', 'Reported Objects'),
'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
'state': fields.selection([('draft','Draft'),('valid','Valid')], 'Status', required=True),
'state': fields.selection([('draft','Draft'),('valid','Valid')], 'State', required=True),
'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel','report_id','group_id','Authorized Groups'),
}

10
addons/bin/addons/base/i18n/pt.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 08:23+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-11-25 22:34+0000\n"
"Last-Translator: Paulino <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:39+0000\n"
"X-Launchpad-Export-Date: 2009-11-26 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@ -30,12 +30,12 @@ msgstr "SMS - Gateway: clickatell"
#: code:addons/addons/account/wizard/wizard_open_closed_fiscalyear.py:0
#, python-format
msgid "No journal for ending writing has been defined for the fiscal year"
msgstr ""
msgstr "Não foi definido o diário dos movimentos de fim de exercício."
#. module: base
#: view:res.lang:0
msgid "%j - Day of the year as a decimal number [001,366]."
msgstr "%j - Dia como um numero decimal [001,366]."
msgstr "%j - Dia do ano como número decimal [001,366]."
#. module: base
#: code:addons/addons/mrp/report/price.py:0

339
addons/bin/addons/base/i18n/sk.po
View File

File diff suppressed because it is too large Load Diff

6
addons/crm/crm.py
View File

@ -511,7 +511,11 @@ class crm_case(osv.osv):
'user_id': fields.many2one('res.users', 'Responsible'),
'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
\nWhen the case is over, the state is set to \'Done\'.\
\nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
'ref' : fields.reference('Reference', selection=_links_get, size=128),
'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),

2
addons/crm/crm_segmentation.py
View File

@ -36,7 +36,7 @@ class crm_segmentation(osv.osv):
'description': fields.text('Description'),
'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'),
'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn\'t match segmentation criterions'),
'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True),
'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution State', readonly=True),
'partner_id': fields.integer('Max Partner ID processed'),
'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True),
'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."),

2
addons/crm/crm_view.xml
View File

@ -481,7 +481,6 @@
<field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
<field name="search_view_id" ref="view_crm_case_filter"/>
</record>
<menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended"/>
<record id="crm_case_categ0-act_my" model="ir.actions.act_window">
<field name="name">My cases</field>
@ -500,7 +499,6 @@
<field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
<field name="search_view_id" ref="view_crm_case_filter"/>
</record>
<menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended"/>
<record id="crm_case_section_open_act" model="ir.actions.act_window">
<field name="name">crm.case.section.open</field>

1
addons/delivery/delivery_view.xml
View File

@ -168,7 +168,6 @@
<field name="context">{'contact_display': 'partner'}</field>
<field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
</record>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree" groups="base.group_extended"/>
<record id="action_picking_tree5" model="ir.actions.act_window">
<field name="name">Generate Draft Invoices On Receptions</field>

4
addons/event/event.py
View File

@ -130,7 +130,9 @@ class event(osv.osv):
'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
'date_begin': fields.datetime('Beginning date', required=True),
'date_end': fields.datetime('Ending date', required=True),
'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'Status', readonly=True, required=True),
'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True,
help='If event is created, the state is \'Draft\'.\n If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
\nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'),
'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),

19
addons/event/event_view.xml
View File

@ -146,10 +146,7 @@
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem
parent="menu_event_event"
id="menu_event_event_draft"
action="action_event_view_draft" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_event_view_confirm">
<field name="name">Confirmed Events</field>
<field name="type">ir.actions.act_window</field>
@ -157,10 +154,6 @@
<field name="domain">[('state','=','confirm')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem parent="menu_event_event"
id="menu_event_event_confirm"
action="action_event_view_confirm" groups="base.group_extended"/>
<!-- EVENTS/REGISTRATIONS/EVENTS -->
@ -304,10 +297,7 @@
<field name="view_mode">tree,form</field>
<field name="filter" eval="True"/>
</record>
<menuitem
parent="menu_action_registration"
id="menu_action_registration_draft"
action="action_registration_draft" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_registration_confirm">
<field name="name">Confirmed Registrations</field>
<field name="res_model">event.registration</field>
@ -315,11 +305,6 @@
<field name="domain">[('state','in',('open','done'))]</field>
<field name="filter" eval="True"/>
</record>
<menuitem
parent="menu_action_registration"
id="menu_action_registration_confirm"
action="action_registration_confirm" groups="base.group_extended"/>
<!-- report , event on registration... start -->
<record model="ir.ui.view" id="report_event_registration_tree">

6
addons/hr_expense/hr.expense.expense.csv
View File

@ -1,3 +1,3 @@
name,ref,employee_id,line_ids/date_value,line_ids/name,line_ids/analytic_account,line_ids/unit_quantity,line_ids/ref,line_ids/unit_amount
September Expenses,09/06,Fabien Pinckaers,2006-09-05,Travel by Car - Customer Seagate 2 - Double,Thymbra,130.0,,0.22
,,,2006-09-05,Basic PC - Server for Seagate,Seagate P2,1.0,S1234435,300.0
"id","name","ref","employee_id","line_ids/date_value","line_ids/name","line_ids/analytic_account","line_ids/unit_quantity","line_ids/ref","line_ids/unit_amount"
1,"September Expenses",09/06/09,"Fabien Pinckaers",05/09/06,"Travel by Car - Customer Seagate 2 - Double","Thymbra",130,,0.22
,,,,05/09/06,"Basic PC - Server for Seagate","Seagate P2",1,"S1234435",300

1 id name ref employee_id line_ids/date_value line_ids/name line_ids/analytic_account line_ids/unit_quantity line_ids/ref line_ids/unit_amount
2 1 September Expenses 09/06 09/06/09 Fabien Pinckaers 2006-09-05 05/09/06 Travel by Car - Customer Seagate 2 - Double Thymbra 130.0 130 0.22
3 2006-09-05 05/09/06 Basic PC - Server for Seagate Seagate P2 1.0 1 S1234435 300.0 300

3
addons/hr_expense/hr_expense.py
View File

@ -77,7 +77,8 @@ class hr_expense_expense(osv.osv):
('invoiced', 'Invoiced'),
('paid', 'Reimbursed'),
('cancelled', 'Cancelled')],
'State', readonly=True),
'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
\nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
}
_defaults = {
'date' : lambda *a: time.strftime('%Y-%m-%d'),

103
addons/hr_expense/hr_expense_view.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Expenses -->
<record id="view_expenses_line_tree" model="ir.ui.view">
<field name="name">hr.expense.line.tree</field>
<field name="type">tree</field>
@ -34,6 +36,8 @@
</tree>
</field>
</record>
<record id="view_expenses_form" model="ir.ui.view">
<field name="name">hr.expense.form</field>
<field name="type">form</field>
@ -93,6 +97,7 @@
</field>
</record>
<record id="view_hr_expense_filter" model="ir.ui.view">
<field name="name">hr.expense.expense.filter</field>
<field name="model">hr.expense.expense</field>
@ -120,59 +125,18 @@
<field name="view_type">form</field>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem
id="next_id_49"
name="Expenses"
parent="hr.menu_hr_root"/>
<menuitem
action="expense_all"
id="menu_expense_all"
parent="next_id_49"
groups="hr.group_hr_manager"/>
<record id="expense_all_draft" model="ir.actions.act_window">
<field name="name">Draft expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<record id="expense_all_confirm" model="ir.actions.act_window">
<field name="name">Expenses waiting validation</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<record id="expense_all_valid" model="ir.actions.act_window">
<field name="name">Expenses waiting invoice</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','accepted')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<record id="expense_all_invoiced" model="ir.actions.act_window">
<field name="name">Expenses waiting payment</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','invoiced')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<menuitem id="next_id_49" name="Expenses"
parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all"
parent="next_id_49" groups="hr.group_hr_manager"/>
<!--
My expenses menu
-->
My expenses menu
-->
<record id="expense_my" model="ir.actions.act_window">
<field name="name">My Expenses</field>
<field name="res_model">hr.expense.expense</field>
@ -182,38 +146,11 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49" groups="base.group_extended"/>
<record id="expense_my_new" model="ir.actions.act_window">
<field name="name">New Expenses Sheet</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem action="expense_my_new" id="menu_expense_my_new" parent="hr_expense.next_id_49"/>
<record id="expense_my_draft" model="ir.actions.act_window">
<field name="name">My Draft expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
<record id="expense_my_confirm" model="ir.actions.act_window">
<field name="name">My expenses waiting validation</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
<menuitem action="expense_my" id="menu_expense_my"
parent="hr_expense.next_id_49" groups="base.group_extended"
/>
<record id="view_product_hr_expense_form" model="ir.ui.view">
<field name="name">product.product.expense.form</field>

3
addons/hr_holidays/hr.py
View File

@ -96,7 +96,8 @@ class hr_holidays(osv.osv):
_columns = {
'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'Status', readonly=True),
'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'),
'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),

235
addons/hr_holidays/hr_view.xml
View File

@ -2,7 +2,33 @@
<openerp>
<data>
<!-- Holidays -->
<!-- Menu Items -->
<record id="view_hr_holidays_filter" model="ir.ui.view">
<field name="name">hr.holidays.filter</field>
<field name="model">hr.holidays</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Leave">
<group col='6' colspan='4'>
<filter icon="gtk-execute" string="My Leaves" domain="[('user_id','=',uid)]" separator="1" help="Leaves Related to Current User"/>
<filter icon="gtk-execute" string="My Departments Leaves" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
<field name="state" select="1">
<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Holidays"/>
<filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
<filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
</field>
<field name="name" select='1'/>
<field name="user_id" select="1" widget="selection"/>
</group>
</search>
</field>
</record>
<!-- Holidays: Leave Request -->
<record model="ir.ui.view" id="edit_holiday_new">
<field name="name">Leave Request</field>
<field name="model">hr.holidays</field>
@ -20,7 +46,6 @@
<field name="number_of_days_temp"/>
<field name="manager_id"/>
<field name="notes" colspan="4"/>
<newline/>
<field name="state" select="1" colspan="2"/>
<group colspan="2">
@ -36,7 +61,8 @@
</field>
</record>
<!-- Holidays -->
<!-- Holidays: Allocation Request -->
<record model="ir.ui.view" id="allocation_leave_new">
<field name="name">Allocation Request</field>
<field name="model">hr.holidays</field>
@ -49,7 +75,6 @@
<field name="number_of_days_temp"/>
<notebook colspan="4">
<page string="General">
<field name="manager_id"/>
<field name="notes" colspan="4"/>
<newline/>
@ -67,7 +92,8 @@
</field>
</record>
<!-- Holidays -->
<!-- Holidays: Company Allocation -->
<record model="ir.ui.view" id="allocation_company_new">
<field name="name">Company Allocation</field>
<field name="model">hr.holidays</field>
@ -81,7 +107,6 @@
<field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
<field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
<field name="number_of_days_temp"/>
<notebook colspan="4">
<page string="General">
<field name="manager_id"/>
@ -106,7 +131,7 @@
<field name="model">hr.holidays</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Employee Leaves">
<tree string="Leaves">
<field name="name"/>
<field name="employee_id"/>
<field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@ -121,24 +146,41 @@
<menuitem
name="Holidays Management"
name="Holidays Management"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"/>
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="name">Leave Request(s)</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="domain">[('type','=','remove')]</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem
name="New Holidays Request"
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<menuitem
name="Holidays Requests"
parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new"
action="open_ask_holidays"/>
<record model="ir.actions.act_window" id="open_allocation_holidays">
<field name="name">Allocation Request(s)</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="context">{'type':'add'}</field>
@ -146,27 +188,26 @@
<field name="view_id" ref="allocation_leave_new" />
</record>
<menuitem
name="New Allocation Request"
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/>
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="allocation_company_new"/>
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<menuitem
name="Allocation Requests"
parent="menu_open_ask_holidays"
id="menu_open_allocation_holidays"
action="open_allocation_holidays"/>
<record model="ir.actions.act_window" id="open_company_allocation">
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_id" ref="allocation_company_new" />
<field name="context">{'allocation_type':'company'}</field>
</record>
<menuitem
name="Leaves Management"
parent="menu_open_ask_holidays"
id="menu_open_company_allocation"
action="open_company_allocation"
groups="hr.group_hr_manager"/>
<!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form">
<field name="name">hr.holidays.status.form</field>
@ -201,150 +242,12 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
action="open_view_holiday_status"
id="menu_open_view_holiday_status"
parent="hr.menu_hr_configuration"/>
<!-- Menu Items -->
<record id="view_hr_holidays_filter" model="ir.ui.view">
<field name="name">hr.holidays.filter</field>
<field name="model">hr.holidays</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Leave">
<group col='6' colspan='4'>
<filter icon="gtk-execute" string="My Leaves" domain="[('user_id','=',uid)]" separator="1" help="Leaves Related to Current User"/>
<filter icon="gtk-execute" string="My Departments Leaves" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
<field name="state" select="1">
<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Holidays"/>
<filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
<filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
</field>
<field name="name" select='1'/>
<field name="user_id" select="1" widget="selection"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_all_holiday">
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem name="All Leave Requests"
parent="menu_open_ask_holidays"
id="menu_action_all_holiday"
action="action_all_holiday"
groups="hr.group_hr_manager"/>
<record model="ir.actions.act_window" id="action_my_holiday">
<field name="name">My Leave Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_my_holiday_draft">
<field name="name">My Draft Leave Request</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_my_holiday_waiting">
<field name="name">My Awaiting Confirmation Leave Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_my_holiday_validate">
<field name="name">My Validated Leave Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_my_holiday_refuse">
<field name="name">My Refused Leave Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_departments_my_holiday">
<field name="name">My Department's Leave Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id', 'child_of', [uid])]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_extended"/>
<record model="ir.actions.act_window" id="action_my_departments_holiday_waiting">
<field name="name">Leave Requests to Validate</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id', 'child_of', [uid]), ('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_action_my_departments_holiday" id="menu_action_my_departments_holiday_waiting" action="action_my_departments_holiday_waiting" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_holiday_waiting">
<field name="name">Requests Awaiting for Validation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<menuitem parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" groups="base.group_extended" />
<!-- Shortcuts -->
<act_window name="My Holiday Requests"
domain="[('employee_id', '=', active_id), ('type','=','remove')]"

2
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -83,7 +83,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form" groups="base.group_extended"/>
<record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
@ -110,7 +109,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form" groups="base.group_extended"/>
<record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.employee.extd_form</field>

24
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -15,7 +15,7 @@
<field name="to_invoice" widget="selection" />
<field name="amount_max"/>
<field name="amount_invoiced"/>
<separator colspan="4" string="Status"/>
<separator colspan="4" string="State"/>
<field name="state"/>
</group>
</field>
@ -108,18 +108,14 @@
</record>
<menuitem action="action_hr_analytic_timesheet_open_tree" id="menu_hr_analytic_timesheet_tree" parent="account.menu_finance_periodical_processing"/>
<record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
<field name="name">Uninvoiced Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="menu_hr_analytic_timesheet_tree"/>
<record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
<field name="name">My Uninvoiced Entries</field>
@ -127,9 +123,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="menu_hr_analytic_timesheet_tree"/>
<record id="action_open_analytic_accounts" model="ir.actions.act_window">
<field name="name">Open Analytic Accounts</field>
@ -138,8 +133,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view')]</field>
</record>
<menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="account.account_analytic_def_chart"/>
<record id="action_open_invoice_analytic_accounts" model="ir.actions.act_window">
<field name="name">Unclosed Invoiceable Accounts</field>
@ -148,9 +141,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view'),('pricelist_id','&lt;&gt;',False)]</field>
</record>
<menuitem action="action_open_invoice_analytic_accounts" id="menu_action_open_invoice_analytic_accounts" parent="hr_timesheet_invoice.menu_action_open_analytic_accounts"/>
<record id="action_draft_analytic_accounts" model="ir.actions.act_window">
<field name="name">Draft Analytic Accounts</field>
@ -159,9 +149,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft'),('type','&lt;&gt;','view')]</field>
</record>
<menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="account.account_analytic_def_chart"/>
<record id="action_pending_analytic_accounts" model="ir.actions.act_window">
<field name="name">Pending Analytic Accounts</field>
@ -170,11 +157,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','pending'),('type','&lt;&gt;','view')]</field>
</record>
<menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="account.account_analytic_def_chart"/>
<record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.form</field>

14
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -175,15 +175,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Timesheet">
<group col='6' colspan='4'>
<group col='8' colspan='4'>
<filter icon="terp-partner" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheet"/>
<filter icon="terp-crm" string="My departments timesheets" domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
<separator orientation="vertical"/>
<field name="state">
<filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
</field>
<field name="name" select='1'/>
<field name="user_id" select="1" widget="selection">
<filter icon="gtk-execute" domain="[('user_id','=',uid)]" help="My Timesheet"/>
<filter icon="gtk-execute" domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
</field>
</group>
</search>
@ -224,7 +225,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" groups="base.group_extended"/>
<record id="act_hr_timesheet_sheet_form_my_department" model="ir.actions.act_window">
<field name="name">My Department's Timesheets</field>
@ -248,7 +248,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_my_confirm_department" id="menu_act_hr_timesheet_sheet_form_my_confirm_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended"/>
<record id="act_hr_timesheet_sheet_form_my_validate_department" model="ir.actions.act_window">
<field name="name">My Department's Timesheets to Validate</field>
@ -260,7 +259,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_my_validate_department" id="menu_act_hr_timesheet_sheet_form_my_validate_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended"/>
<wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
@ -276,8 +274,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended"/>
<record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
<field name="name">Timesheets To Validate</field>
<field name="type">ir.actions.act_window</field>
@ -288,7 +284,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended"/>
<!--
Company inheritancy
@ -386,6 +381,5 @@
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended"/>
</data>
</openerp>

4
addons/idea/idea.py
View File

@ -119,7 +119,9 @@ class idea_idea(osv.osv):
'count_votes' : fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
'category_id': fields.many2one('idea.category', 'Category', required=True ),
'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'Status', readonly=True),
'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True,
help='When the Idea is created the state is \'Draft\'.\n It is opened by the user, the state is \'Opened\'.\
\nIf the idea is accepted, the state is \'Accepted\'.'),
'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
}

13
addons/idea/idea_view.xml
View File

@ -193,8 +193,6 @@
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open" groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_idea_idea_my_idea">
<field name="name">My Ideas</field>
@ -213,11 +211,6 @@
<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem
name="My Draft Ideas" parent="menu_idea_idea_my_idea"
id="menu_idea_idea_draft_my"
action="action_idea_idea_draft_my"
groups="base.group_extended" />
<record model="ir.actions.act_window" id="action_idea_idea_open_my">
<field name="name">My Open Ideas</field>
@ -227,12 +220,6 @@
<field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem
name="My Open Ideas" parent="menu_idea_idea_my_idea"
id="menu_idea_idea_open_my"
action="action_idea_idea_open_my"
groups="base.group_extended"
/>
<record model="ir.ui.view" id="view_idea_vote_stat_graph">
<field name="name">idea.vote_stat.graph</field>

23
addons/membership/membership_view.xml
View File

@ -137,6 +137,7 @@
<field name="name">Paid members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'paid')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_paid_view_tree">
@ -152,10 +153,6 @@
<field name="act_window_id" ref="action_membership_members_paid"/>
</record>
<menuitem name="Paid members" parent="menu_members"
id="menu_members_paid"
action="action_membership_members_paid"/>
<!-- MEMBERSHIP/MEMBERS/FREE MEMBERS -->
@ -163,6 +160,7 @@
<field name="name">Free members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'free')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_free_view_tree">
@ -178,13 +176,6 @@
<field name="act_window_id" ref="action_membership_members_free"/>
</record>
<menuitem name="Free members" parent="menu_members"
id="menu_members_free"
action="action_membership_members_free"/>
<!-- MEMBERSHIP/MEMBERS/ASSOCIATED MEMBERS -->
<record model="ir.ui.view" id="membership_members_associated_tree">
<field name="name">associate members</field>
@ -205,6 +196,7 @@
<field name="name">Associated members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('associate_member', '!=', False), ('membership_state', '!=', 'none')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_associated_view_tree">
@ -220,10 +212,6 @@
<field name="act_window_id" ref="action_membership_members_associated"/>
</record>
<menuitem name="Associated members" parent="menu_members"
id="menu_members_associated"
action="action_membership_members_associated"/>
<!-- MEMBERSHIP/MEMBERS/INVOICED MEMBERS -->
@ -231,6 +219,7 @@
<field name="name">Invoiced members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state', '=', 'invoiced')]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_invoiced_view_tree">
@ -246,10 +235,6 @@
<field name="act_window_id" ref="action_membership_members_invoiced"/>
</record>
<menuitem name="Invoiced members" parent="menu_members"
id="menu_members_invoiced"
action="action_membership_members_invoiced"/>
<!-- MEMBERSHIP/MEMBERS/FUTURE MEMBERS -->

10
addons/mrp/mrp.py
View File

@ -435,8 +435,10 @@ class mrp_production(osv.osv):
'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True),
'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\
\nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
@ -820,7 +822,9 @@ class mrp_procurement(osv.osv):
('cancel','Cancel'),
('ready','Ready'),
('done','Done'),
('waiting','Waiting')], 'Status', required=True),
('waiting','Waiting')], 'State', required=True,
help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
\nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
'note' : fields.text('Note'),
}
_defaults = {

16
addons/mrp/mrp_view.xml
View File

@ -560,11 +560,6 @@
<field name="view_mode">gantt,tree,form,calendar,graph</field>
<field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
</record>
<menuitem
action="mrp_production_action2_gantt"
id="menu_production_orders_start_gantt"
parent="menu_mrp_production_action"
sequence="20" icon="terp-calendar"/>
<record id="mrp_production_action2" model="ir.actions.act_window">
<field name="name">Production Orders To Start</field>
@ -576,7 +571,7 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_mrp_production_filter"/>
</record>
<menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_extended" />
<record id="mrp_production_action3" model="ir.actions.act_window">
<field name="name">Production Orders in Progress</field>
<field name="type">ir.actions.act_window</field>
@ -587,7 +582,7 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_mrp_production_filter"/>
</record>
<menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_extended"/>
<record id="mrp_production_action4" model="ir.actions.act_window">
<field name="name">Production Orders Waiting Products</field>
<field name="type">ir.actions.act_window</field>
@ -598,7 +593,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_mrp_production_filter"/>
</record>
<menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_extended"/>
<record id="mrp_production_new" model="ir.actions.act_window">
<field name="name">New Production Order</field>
@ -607,7 +601,6 @@
<field name="view_type">form</field>
<field name="view_mode">form,tree,calendar,graph,gantt</field>
</record>
<menuitem action="mrp_production_new" id="menu_production_orders_new" parent="mrp.menu_mrp_production_action"/>
<record id="mrp_production_lot_form_view" model="ir.ui.view">
<field name="name">mrp.production.lot.line.form</field>
@ -787,7 +780,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirmed')]</field>
</record>
<menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_extended"/>
<record id="mrp_procurement_action5" model="ir.actions.act_window">
<field name="name">Exceptions Procurements</field>
@ -797,7 +789,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','exception')]</field>
</record>
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_extended"/>
<record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Exceptions Procurements to Fix</field>
@ -808,7 +799,6 @@
<field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended"/>
<record id="mrp_procurement_action11" model="ir.actions.act_window">
<field name="name">Temporary Procurement Exceptions</field>
@ -818,7 +808,6 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
</record>
<menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended"/>
<record id="mrp_procurement_new" model="ir.actions.act_window">
<field name="name">New Procurement</field>
@ -827,7 +816,6 @@
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action"/>
<!-- Order Point -->
<record id="view_warehouse_orderpoint_tree" model="ir.ui.view">

2
addons/mrp_operations/mrp_operations.py
View File

@ -68,7 +68,7 @@ class mrp_production_workcenter_line(osv.osv):
return res
_inherit = 'mrp.production.workcenter.line'
_columns = {
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'State', readonly=True),
'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),
'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),

3
addons/mrp_operations/mrp_operations_view.xml
View File

@ -176,9 +176,6 @@
</record>
<menuitem name="All Work Orders" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
<menuitem name="Work Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/>
<menuitem name="Future Work Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/>
<menuitem parent="menu_mrp_production_wc_action" action="mrp_production_wc_action_planning" id="menu_mrp_production_wc_draft_action_planning"/>
<!-- Operation codes -->

2
addons/mrp_repair/mrp_repair.py
View File

@ -503,7 +503,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
'move_id': fields.many2one('stock.move', 'Inventory Move', readonly=True),
'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'State', required=True, readonly=True),
}
_defaults = {
'state': lambda *a: 'draft',

15
addons/mrp_repair/mrp_repair_view.xml
View File

@ -191,6 +191,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_repair_progress_tree" model="ir.actions.act_window">
@ -200,6 +201,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','under_repair')]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_repair_ready_tree" model="ir.actions.act_window">
@ -209,6 +211,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),]</field>
<field name="filter" eval="True"/>
</record>
<record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">
@ -218,20 +221,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','2binvoiced')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs" sequence="50"/>
<menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
<menuitem action="action_repair_progress_tree" id="menu_repair_progress" parent="menu_repair_order"/>
<menuitem action="action_repair_ready_tree" id="menu_repair_ready" parent="menu_repair_order"/>
<menuitem action="action_repair_2binvoiced_tree" id="menu_repair_2binvoiced" parent="menu_repair_order"/>
<menuitem action="action_repair_order_form" id="menu_repair_form" parent="menu_repair_order" sequence = "50"/>
</data>
</openerp>

17
addons/point_of_sale/pos_view.xml
View File

@ -141,7 +141,7 @@
</field>
</record>
<menuitem name="Point of Sale" id="menu_point_root" />
<menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_pos_form"/>
<wizard
string="Wizard default journals"
model="pos.config.journal"
@ -170,27 +170,26 @@
<!-- <menuitem name="Point of Sale/Point of Sale/Orders not invoiced" id="menu_action_pos_order_tree" action="action_pos_order_tree"/> -->
<record model="ir.actions.act_window" id="action_pos_order_tree2">
<field name="name">Point of Sale</field>
<field name="name">Orders of the day</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_pos_order_tree"/>
<field name="filter" eval="True"/>
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-%d')),('date_order','&lt;=',time.strftime('%Y-%m-%d'))]</field>
</record>
<menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/>
<menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
<record model="ir.actions.act_window" id="action_pos_order_tree3">
<field name="name">Point of Sale</field>
<field name="name">All orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_pos_order_tree"/>
<field name="filter" eval="True"/>
</record>
<menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/>
<record model="ir.ui.view" id="view_pos_order_line">
<field name="name">Sale lines</field>
@ -235,15 +234,15 @@
<menuitem name="POS Lines" parent="menu_point_root" id="menu_action_pos_order_line" action="action_pos_order_line"/>
<record model="ir.actions.act_window" id="action_pos_order_line_day">
<field name="name">Sale line</field>
<field name="name">POS Lines of the day</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.order.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_pos_order_line"/>
<field name="filter" eval="True"/>
<field name="domain">[('create_date', '&gt;=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
</record>
<menuitem name="POS Lines of the day" parent="menu_action_pos_order_line" id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
<!-- report -->

2
addons/product/product.py
View File

@ -289,7 +289,7 @@ class product_template(osv.osv):
'warranty': fields.float('Warranty (months)'),
'sale_ok': fields.boolean('Can be sold', help="Determine if the product can be visible in the list of product within a selection from a sale order line."),
'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must in the same category than the default unit of measure."),
'uos_id' : fields.many2one('product.uom', 'Unit of Sale',

8
addons/project/project.py
View File

@ -115,7 +115,9 @@ class project(osv.osv):
'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."),
'notes': fields.text('Notes', help="Internal description of the project."),
'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True),
'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
help='The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
\n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
'company_id': fields.many2one('res.company', 'Company'),
}
@ -280,7 +282,9 @@ class task(osv.osv):
'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
'sequence': fields.integer('Sequence'),
'type': fields.many2one('project.task.type', 'Type'),
'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
help='If the task is created the state \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
\n If the task is over, the states is set to \'Done\'.'),
'date_start': fields.datetime('Starting Date'),
'date_deadline': fields.datetime('Deadline'),
'date_close': fields.datetime('Date Closed', readonly=True),

16
addons/project/project_view.xml
View File

@ -164,7 +164,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_project_project_filter"/>
</record>
<menuitem action="open_view_project_open" id="menu_open_view_project_open" groups="base.group_extended" parent="menu_open_view_project_all"/>
<record id="open_view_template_project" model="ir.actions.act_window">
<field name="name">Templates of Projects</field>
@ -249,11 +248,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_project_project_filter"/>
</record>
<menuitem
action="open_view_my_project_my_run"
id="menu_open_view_my_project_my_run"
groups="base.group_extended"
parent="menu_open_view_my_project"/>
<record id="open_view_my_project_open" model="ir.actions.act_window">
<field name="name">Projects Structure</field>
@ -566,7 +560,6 @@
<field name="view_id" ref="my_pending_task"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" groups="base.group_extended" parent="menu_action_view_task4"/>
<record id="action_view_task5_prog" model="ir.actions.act_window">
<field name="name">My Current Tasks</field>
@ -579,7 +572,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="menu_action_view_task4" sequence="1"/>
<record id="action_view_task5_prog_prog" model="ir.actions.act_window">
<field name="name">My Tasks in Progress</field>
@ -591,7 +583,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_prog_prog" id="menu_tasks_yours_prog_prog" groups="base.group_extended" parent="menu_tasks_yours_prog"/>
<record id="action_view_task5_prog_draft" model="ir.actions.act_window">
<field name="name">My Draft Tasks</field>
@ -603,7 +594,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_prog_draft" id="menu_tasks_yours_prog_draft" groups="base.group_extended" parent="menu_tasks_yours_prog"/>
<record id="action_view_task5_departments_pending" model="ir.actions.act_window">
<field name="name">My Department's Pending Tasks</field>
@ -615,7 +605,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_departments_pending" id="menu_tasks_yours_departments_pending" groups="base.group_extended" parent="menu_action_view_department_tasks"/>
<record id="action_view_task5_departments_prog" model="ir.actions.act_window">
<field name="name">My Department's Current Tasks</field>
@ -627,7 +616,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_departments_prog" id="menu_tasks_yours_departments_prog" parent="menu_action_view_department_tasks" sequence="1"/>
<record id="action_view_task5_departments_prog_prog" model="ir.actions.act_window">
<field name="name">My Department's Tasks in Progress</field>
@ -638,7 +626,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_departments_prog_prog" id="menu_tasks_yours_departments_prog_prog" groups="base.group_extended" parent="menu_tasks_yours_departments_prog"/>
<record id="action_view_task5_departments_prog_draft" model="ir.actions.act_window">
<field name="name">My Department's Draft Tasks</field>
@ -649,7 +636,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task5_departments_prog_draft" id="menu_tasks_yours_departments_prog_draft" groups="base.group_extended" parent="menu_tasks_yours_departments_prog"/>
<record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
<field name="name">Overpassed Tasks</field>
@ -677,7 +663,6 @@
<field name="search_view_id" ref="view_task_search_form"/>
<field name="domain">[('state','=','open')]</field>
</record>
<menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task" groups="base.group_extended"/>
<record id="action_view_task7" model="ir.actions.act_window">
<field name="name">Unassigned Tasks</field>
@ -688,7 +673,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/>
</record>
<menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task" groups="base.group_extended"/>
<!-- Opening task when double clicking on project -->
<record id="dblc_proj" model="ir.actions.act_window">

6
addons/purchase/process/purchase_process.xml
View File

@ -17,7 +17,7 @@
-->
<record id="process_node_packinginvoice0" model="process.node">
<field name="menu_id" ref="stock.menu_picking_waiting"/>
<field name="menu_id" ref="stock.menu_action_picking_tree"/>
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/>
@ -84,7 +84,7 @@
</record>
<record id="process_node_invoicecontrol0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree8"/>
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
@ -119,7 +119,7 @@
</record>
<record id="process_node_productrecept0" model="process.node">
<field name="menu_id" ref="stock.menu_picking_waiting"/>
<field name="menu_id" ref="stock.menu_action_picking_tree"/>
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/>

2
addons/purchase/purchase.py
View File

@ -163,7 +163,7 @@ class purchase_order(osv.osv):
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
'notes': fields.text('Notes'),

34
addons/purchase/purchase_view.xml
View File

@ -142,13 +142,45 @@
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
<record id="purchase_form_action2" model="ir.actions.act_window">
<field name="name">Request For Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_form_action3" model="ir.actions.act_window">
<field name="name">Purchase Order Waiting Approval</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','confirmed')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_form_action4" model="ir.actions.act_window">
<field name="name">Purchase Orders in Progress</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','approved')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_form_action_new" model="ir.actions.act_window">
<field name="name">New Purchase Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="purchase_form_action_new" id="menu_purchase_form_action_new" parent="purchase.menu_purchase_root"/>
<record id="purchase_form_action3" model="ir.actions.act_window">
<field name="name">Purchase Order Waiting Approval</field>

2
addons/purchase_manual/purchase_manual.py
View File

@ -26,7 +26,7 @@ import netsvc
class purchase_order_line(osv.osv):
_inherit='purchase.order.line'
_columns = {
'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True),
'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
'invoiced': fields.boolean('Invoiced', readonly=True),
'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),

25
addons/report_account/report_receivable.py
View File

@ -24,6 +24,7 @@ import datetime
import mx.DateTime
import pooler
import tools
from osv import fields,osv
@ -207,21 +208,25 @@ class report_account_type_sales(osv.osv):
_description = "Report of the Sales by Account Type"
_auto = False
_columns = {
'name': fields.char('Month', size=64, readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'period_id': fields.many2one('account.period', 'Force Period',readonly=True),
'product_id': fields.many2one('product.product', 'Product',readonly=True),
'quantity': fields.float('Quantity', readonly=True),
'user_type': fields.many2one('account.account.type', 'Account Type', readonly=True),
'amount_total': fields.float('Total', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,amount_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_account_type_sales')
cr.execute("""create or replace view report_account_type_sales as (
select
min(inv_line.id) as id,
to_char(inv.date_invoice, 'YYYY-MM-01') as name,
to_char(inv.date_invoice, 'YYYY') as name,
to_char(inv.date_invoice,'MM') as month,
sum(inv_line.price_subtotal) as amount_total,
inv.currency_id as currency_id,
inv.period_id,
@ -235,7 +240,7 @@ class report_account_type_sales(osv.osv):
where
inv.state in ('open','paid')
group by
to_char(inv.date_invoice, 'YYYY-MM-01'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type
to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type
)""")
report_account_type_sales()
@ -245,21 +250,25 @@ class report_account_sales(osv.osv):
_description = "Report of the Sales by Account"
_auto = False
_columns = {
'name': fields.char('Month', size=64, readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'period_id': fields.many2one('account.period', 'Force Period',readonly=True),
'product_id': fields.many2one('product.product', 'Product',readonly=True),
'quantity': fields.float('Quantity', readonly=True),
'account_id': fields.many2one('account.account', 'Account', readonly=True),
'amount_total': fields.float('Total', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,amount_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_account_sales')
cr.execute("""create or replace view report_account_sales as (
select
min(inv_line.id) as id,
to_char(inv.date_invoice, 'YYYY-MM-01') as name,
to_char(inv.date_invoice, 'YYYY') as name,
to_char(inv.date_invoice,'MM') as month,
sum(inv_line.price_subtotal) as amount_total,
inv.currency_id as currency_id,
inv.period_id,
@ -273,7 +282,7 @@ class report_account_sales(osv.osv):
where
inv.state in ('open','paid')
group by
to_char(inv.date_invoice, 'YYYY-MM-01'),inv.currency_id, inv.period_id, inv_line.product_id, account.id
to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.id
)""")
report_account_sales()

17
addons/report_account/report_receivable_view.xml
View File

@ -124,8 +124,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sales by Account">
<field name="name"/>
<field name="period_id"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id"/>
<field name="account_id"/>
<field name="quantity"/>
@ -175,6 +175,7 @@
<field name="arch" type="xml">
<tree string="Sales by Account type">
<field name="name"/>
<field name="month"/>
<field name="period_id"/>
<field name="product_id"/>
<field name="user_type"/>
@ -185,6 +186,18 @@
</field>
</record>
<record id="view_report_account_type_sales_form" model="ir.ui.view">
<field name="name">report.account_type.sales.form</field>
<field name="model">report.account_type.sales</field>
<field name="type">form</field>
<field name="arch" type="xml">
<tree string="Sales by Account type">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
</tree>
</field>
</record>
<record id="view_report_account_type_sales_graph" model="ir.ui.view">
<field name="name">report.account_type.sales.graph</field>

11
addons/report_analytic_line/report_analytic_line.py
View File

@ -20,27 +20,32 @@
##############################################################################
from osv import fields,osv
import tools
class report_account_analytic_line_to_invoice(osv.osv):
_name = "report.account.analytic.line.to.invoice"
_description = "Analytic lines to invoice report"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
'product_uom_id':fields.many2one('product.uom', 'UoM', readonly=True),
'unit_amount': fields.float('Units', readonly=True),
'sale_price': fields.float('Sale price', readonly=True),
'amount': fields.float('Amount', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, product_id asc, account_id asc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_account_analytic_line_to_invoice')
cr.execute("""
CREATE OR REPLACE VIEW report_account_analytic_line_to_invoice AS (
SELECT
DISTINCT(to_char(l.date,'YYYY-MM-DD')) AS name,
DISTINCT(to_char(l.date,'MM')) as month,
to_char(l.date, 'YYYY') as name,
MIN(l.id) AS id,
l.product_id,
l.account_id,
@ -57,7 +62,7 @@ class report_account_analytic_line_to_invoice(osv.osv):
WHERE
(invoice_id IS NULL) and (to_invoice IS NOT NULL)
GROUP BY
to_char(l.date,'YYYY-MM-DD'), product_id, product_uom_id, account_id
to_char(l.date, 'YYYY'), to_char(l.date,'MM'), product_id, product_uom_id, account_id
)
""")
report_account_analytic_line_to_invoice()

1
addons/report_analytic_line/report_analytic_line_view.xml
View File

@ -9,6 +9,7 @@
<field name="arch" type="xml">
<form string="Analytic Lines to Invoice">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
<newline/>
<field name="product_id" select="1"/>

31
addons/report_crm/report_crm.py
View File

@ -20,6 +20,7 @@
##############################################################################
from osv import fields,osv
import tools
AVAILABLE_STATES = [
('draft','Draft'),
@ -34,7 +35,7 @@ class report_crm_case_user(osv.osv):
_description = "Cases by user and section"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
@ -44,14 +45,18 @@ class report_crm_case_user(osv.osv):
'probability': fields.float('Avg. Probability', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'delay_close': fields.char('Delay to close', size=20, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, user_id, section_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_crm_case_user')
cr.execute("""
create or replace view report_crm_case_user as (
select
min(c.id) as id,
to_char(c.create_date, 'YYYY-MM-01') as name,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.state,
c.user_id,
c.section_id,
@ -63,7 +68,7 @@ class report_crm_case_user(osv.osv):
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
from
crm_case c
group by to_char(c.create_date, 'YYYY-MM-01'), c.state, c.user_id, c.section_id
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id, c.section_id
)""")
report_crm_case_user()
@ -72,7 +77,7 @@ class report_crm_case_categ(osv.osv):
_description = "Cases by section and category"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
@ -82,14 +87,18 @@ class report_crm_case_categ(osv.osv):
'probability': fields.float('Avg. Probability', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'delay_close': fields.char('Delay Close', size=20, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, categ_id, section_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_crm_case_categ')
cr.execute("""
create or replace view report_crm_case_categ as (
select
min(c.id) as id,
to_char(c.create_date, 'YYYY-MM-01') as name,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.state,
c.categ_id,
c.section_id,
@ -101,7 +110,7 @@ class report_crm_case_categ(osv.osv):
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
from
crm_case c
group by to_char(c.create_date, 'YYYY-MM-01'), c.state, c.categ_id, c.section_id
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.categ_id, c.section_id
)""")
report_crm_case_categ()
@ -134,7 +143,7 @@ class report_crm_case_section(osv.osv):
return res
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
# 'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr_cases': fields.integer('# of Cases', readonly=True),
@ -142,14 +151,18 @@ class report_crm_case_section(osv.osv):
'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
'delay_close': fields.char('Delay to close', size=20, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, section_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_crm_case_section')
cr.execute("""
create or replace view report_crm_case_section as (
select
min(c.id) as id,
to_char(c.create_date, 'YYYY-MM-01') as name,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.section_id as section_id,
count(*) as nbr_cases,
0 as avg_answers,
@ -158,7 +171,7 @@ class report_crm_case_section(osv.osv):
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
from
crm_case c
group by to_char(c.create_date, 'YYYY-MM-01'),c.section_id
group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
)""")
report_crm_case_section()

7
addons/report_crm/report_crm_view.xml
View File

@ -12,7 +12,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Cases by User and Section">
<field name="name"/>
<field name="name" />
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="nbr"/>
@ -32,6 +33,7 @@
<field name="arch" type="xml">
<form string="Cases by User and Section">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
@ -103,6 +105,7 @@
<field name="arch" type="xml">
<tree string="Cases by User and Section">
<field name="name"/>
<field name="month"/>
<field name="categ_id"/>
<field name="section_id"/>
<field name="nbr"/>
@ -122,6 +125,7 @@
<field name="arch" type="xml">
<form string="Cases by User and Section">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="categ_id" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
@ -165,6 +169,7 @@
<field name="arch" type="xml">
<tree string="Cases by Section">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr_cases" select="1"/>
<field name="avg_answers"/>

12
addons/report_document/report_document.py
View File

@ -32,7 +32,7 @@
from osv import fields,osv
import time
import tools
class report_document_user(osv.osv):
_name = "report.document.user"
@ -81,7 +81,7 @@ class report_files_partner(osv.osv):
_description = "Files details by Partners"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'file_title': fields.char('File Name',size=64,readonly=True),
'directory': fields.char('Directory',size=64,readonly=True),
'create_date': fields.datetime('Date Created', readonly=True),
@ -90,19 +90,23 @@ class report_files_partner(osv.osv):
'nbr':fields.integer('# of Files', readonly=True),
'type':fields.char('Directory Type',size=64,readonly=True),
'partner':fields.char('Partner',size=64,readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_files_partner')
cr.execute("""
create or replace view report_files_partner as (
select min(f.id) as id,count(*) as nbr,
min(to_char(f.create_date,'YYYY-MM-01')) as name,
to_char(f.create_date,'YYYY') as name,
min(to_char(f.create_date,'MM')) as month,
min(f.title) as file_title,
p.name as partner
from ir_attachment f
inner join res_partner p
on (f.partner_id=p.id)
where f.datas_fname is not null
group by p.name
group by p.name, to_char(f.create_date,'YYYY')
)
""")
report_files_partner()

21
addons/report_document/report_document_view.xml
View File

@ -209,13 +209,14 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Files by Month">
<field name="name" />
<field name="name"/>
<field name="month"/>
<field name="nbr"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_view_files_by_month_graph">
<record model="ir.actions.act_window" id="action_view_files_by_month_graph">
<field name="name">Files by Month</field>
<field name="res_model">report.document.user</field>
<field name="view_id" ref="view_files_by_month_graph"></field>
@ -269,11 +270,27 @@
<field name="arch" type="xml">
<tree string="Files per Month">
<field name="name"/>
<field name="month"/>
<field name="partner"/>
<field name="nbr"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_files_by_partner_form">
<field name="name">view.files.partner.form</field>
<field name="model">report.files.partner</field>
<field name="type">form</field>
<field name="arch" type="xml">
<tree string="Files per Month">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="partner"/>
<field name="nbr"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_view_files_by_partner">
<field name="name">Files Per Partner</field>
<field name="res_model">report.files.partner</field>

23
addons/report_project/report_project.py
View File

@ -20,13 +20,14 @@
##############################################################################
from osv import fields,osv
import tools
class report_project_task_user(osv.osv):
_name = "report.project.task.user"
_description = "Tasks by user and project"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'project_id':fields.many2one('project.project', 'Project', readonly=True),
'hours_planned': fields.float('Planned Hours', readonly=True),
@ -34,14 +35,19 @@ class report_project_task_user(osv.osv):
'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
'task_closed': fields.integer('Task Closed', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, project_id'
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'report_project_task_user')
cr.execute("""
create or replace view report_project_task_user as (
select
min(t.id) as id,
to_char(date_close, 'YYYY-MM-01') as name,
to_char(date_close, 'YYYY') as name,
to_char(date_close, 'MM') as month,
count(distinct t.id) as task_closed,
t.user_id,
t.project_id,
@ -54,7 +60,7 @@ class report_project_task_user(osv.osv):
where
t.state='done'
group by
to_char(date_close, 'YYYY-MM-01'),t.user_id,project_id
to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),t.user_id,project_id
)
""")
report_project_task_user()
@ -65,21 +71,26 @@ class report_project_task(osv.osv):
_description = "Tasks by project"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'project_id':fields.many2one('project.project', 'Project', readonly=True),
'hours_planned': fields.float('Planned Hours', readonly=True),
'hours_effective': fields.float('Effective Hours', readonly=True),
'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
'task_closed': fields.integer('Task Closed', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, project_id'
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'report_project_task')
cr.execute("""
create or replace view report_project_task as (
select
min(t.id) as id,
to_char(date_close, 'YYYY-MM-01') as name,
to_char(date_close, 'YYYY') as name,
to_char(date_close, 'MM') as month,
count(distinct t.id) as task_closed,
t.project_id,
sum(planned_hours) as hours_planned,
@ -91,7 +102,7 @@ class report_project_task(osv.osv):
where
t.state='done'
group by
to_char(date_close, 'YYYY-MM-01'),project_id
to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),project_id
)
""")
report_project_task()

4
addons/report_project/report_project_view.xml
View File

@ -10,6 +10,7 @@
<field name="arch" type="xml">
<form string="Tasks by Project and User">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
@ -29,6 +30,7 @@
<field name="arch" type="xml">
<tree string="Tasks by projects and users">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
@ -65,6 +67,7 @@
<field name="arch" type="xml">
<form string="Tasks by Project">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
<field name="hours_planned" select="1"/>
@ -81,6 +84,7 @@
<field name="arch" type="xml">
<tree string="Tasks by project">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="project_id" select="1"/>
<field name="task_closed" select="1"/>
<field name="hours_planned" select="1"/>

22
addons/report_purchase/report_purchase.py
View File

@ -24,13 +24,14 @@
#
from osv import fields,osv
import tools
class report_purchase_order_product(osv.osv):
_name = "report.purchase.order.product"
_description = "Purchases Orders by Products"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'state': fields.selection([
('draft','Quotation'),
('waiting_date','Waiting Schedule'),
@ -46,14 +47,19 @@ class report_purchase_order_product(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,price_total desc'
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'report_purchase_order_product')
cr.execute("""
create or replace view report_purchase_order_product as (
select
min(l.id) as id,
to_char(s.date_order, 'YYYY-MM-01') as name,
to_char(s.date_order, 'YYYY') as name,
to_char(s.date_order, 'MM') as month,
s.state,
l.product_id,
sum(l.product_qty*u.factor) as quantity,
@ -64,7 +70,7 @@ class report_purchase_order_product(osv.osv):
left join purchase_order_line l on (s.id=l.order_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_id is not null
group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
)
""")
report_purchase_order_product()
@ -74,7 +80,7 @@ class report_purchase_order_category(osv.osv):
_description = "Purchases Orders by Categories"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'state': fields.selection([
('draft','Quotation'),
('waiting_date','Waiting Schedule'),
@ -90,14 +96,18 @@ class report_purchase_order_category(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,price_total desc'
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'report_purchase_order_category')
cr.execute("""
create or replace view report_purchase_order_category as (
select
min(l.id) as id,
to_char(s.date_order, 'YYYY-MM-01') as name,
to_char(s.date_order, 'YYYY') as name,
to_char(s.date_order, 'MM') as month,
s.state,
t.categ_id as category_id,
sum(l.product_qty*u.factor) as quantity,
@ -110,7 +120,7 @@ class report_purchase_order_category(osv.osv):
left join product_template t on (t.id=p.product_tmpl_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_id is not null
group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
group by t.categ_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
)
""")
report_purchase_order_category()

2
addons/report_purchase/report_purchase_view.xml
View File

@ -10,6 +10,7 @@
<field name="arch" type="xml">
<form string="Purchases by products">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="count"/>
<field name="quantity" select="1"/>
@ -75,6 +76,7 @@
<field name="arch" type="xml">
<form string="Purchases by Category of Products">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="category_id" select="1"/>
<field name="count"/>
<field name="quantity" select="1"/>

47
addons/report_sale/report_sale.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -15,18 +15,20 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import tools
from osv import fields,osv
class report_sale_order_product(osv.osv):
_name = "report.sale.order.product"
_description = "Sales Orders by Products"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'state': fields.selection([
('draft','Quotation'),
('waiting_date','Waiting Schedule'),
@ -42,14 +44,18 @@ class report_sale_order_product(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,price_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_sale_order_product')
cr.execute("""
create or replace view report_sale_order_product as (
select
min(l.id) as id,
to_char(s.date_order, 'YYYY-MM-01') as name,
to_char(s.date_order, 'YYYY') as name,
to_char(s.date_order,'MM') as month,
s.state,
l.product_id,
sum(l.product_uom_qty*u.factor) as quantity,
@ -60,7 +66,7 @@ class report_sale_order_product(osv.osv):
right join sale_order_line l on (s.id=l.order_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_uom_qty != 0
group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state
)
""")
report_sale_order_product()
@ -70,7 +76,7 @@ class report_sale_order_category(osv.osv):
_description = "Sales Orders by Categories"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'state': fields.selection([
('draft','Quotation'),
('waiting_date','Waiting Schedule'),
@ -86,14 +92,19 @@ class report_sale_order_category(osv.osv):
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
'count': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,price_total desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_sale_order_category')
cr.execute("""
create or replace view report_sale_order_category as (
select
min(l.id) as id,
to_char(s.date_order, 'YYYY-MM-01') as name,
to_char(s.date_order, 'YYYY') as name,
to_char(s.date_order,'MM') as month,
s.state,
t.categ_id as category_id,
sum(l.product_uom_qty*u.factor) as quantity,
@ -105,8 +116,8 @@ class report_sale_order_category(osv.osv):
left join product_product p on (p.id=l.product_id)
left join product_template t on (t.id=p.product_tmpl_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_uom_qty != 0
group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
where l.product_uom_qty != 0
group by t.categ_id,to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state
)
""")
report_sale_order_category()
@ -119,13 +130,13 @@ class report_turnover_per_month(osv.osv):
'name': fields.date('Month', readonly=True),
'turnover': fields.float('Total Turnover', readonly=True),
}
def init(self, cr):
cr.execute("""
create or replace view report_turnover_per_month as (
select min(am.id) as id, sum(credit) as turnover,to_char(am.date, 'YYYY-MM-01') as name from account_move_line am
where am.account_id in (select distinct(account_id) from account_invoice_line)
and
where am.account_id in (select distinct(account_id) from account_invoice_line)
and
am.move_id in(select distinct(aw.move_id) from account_invoice aw,account_invoice_line l where l.invoice_id=aw.id)
group by to_char(am.date, 'YYYY-MM-01')
)
@ -137,17 +148,17 @@ class report_turnover_per_product(osv.osv):
_description = "Turnover Per Product"
_auto = False
_rec_name = 'product_id'
_columns = {
'product_id': fields.many2one('product.product','Product', readonly=True),
'turnover': fields.float('Total Turnover', readonly=True),
}
def init(self, cr):
cr.execute("""
create or replace view report_turnover_per_product as (
select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id
from account_move_line am
select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id
from account_move_line am
group by am.product_id
)
""")
@ -176,12 +187,12 @@ class report_sale_order_created(osv.osv):
'create_date' : fields.datetime('Create Date', readolnly=True)
}
_order = 'create_date'
def init(self, cr):
cr.execute("""create or replace view report_sale_order_created as (
select
sale.id as id, sale.date_order as date_order, sale.name as name,
sale.partner_id as partner_id,
sale.partner_id as partner_id,
sale.partner_shipping_id as partner_shipping_id,
sale.amount_untaxed as amount_untaxed, sale.state as state,
sale.create_date as create_date

2
addons/report_sale/report_sale_view.xml
View File

@ -9,6 +9,7 @@
<field name="arch" type="xml">
<form string="Sale Orders by Product">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="count"/>
<field name="quantity" select="2"/>
@ -73,6 +74,7 @@
<field name="arch" type="xml">
<form string="Sale Orders by category">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="category_id" select="1"/>
<field name="count"/>
<field name="quantity" select="2"/>

30
addons/report_timesheet/report_timesheet.py
View File

@ -27,10 +27,12 @@ class report_timesheet_user(osv.osv):
_description = "Timesheet per day"
_auto = False
_columns = {
'name': fields.date('Date', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'quantity': fields.float('Quantity', readonly=True),
'cost': fields.float('Cost', readonly=True)
'cost': fields.float('Cost', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,user_id desc'
def init(self, cr):
@ -39,7 +41,8 @@ class report_timesheet_user(osv.osv):
create or replace view report_timesheet_user as (
select
min(l.id) as id,
l.date as name,
to_char(l.date,'YYYY') as name,
to_char(l.date,'MM') as month,
l.user_id,
sum(l.unit_amount) as quantity,
sum(l.amount) as cost
@ -47,7 +50,7 @@ class report_timesheet_user(osv.osv):
account_analytic_line l
where
user_id is not null
group by l.date, l.user_id
group by l.date, to_char(l.date,'YYYY'),to_char(l.date,'MM'), l.user_id
)
""")
report_timesheet_user()
@ -57,10 +60,13 @@ class report_timesheet_account(osv.osv):
_description = "Timesheet per account"
_auto = False
_columns = {
'name': fields.date('Month', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
'quantity': fields.float('Quantity', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,account_id desc,user_id desc'
def init(self, cr):
@ -69,14 +75,15 @@ class report_timesheet_account(osv.osv):
create or replace view report_timesheet_account as (
select
min(id) as id,
to_char(create_date, 'YYYY-MM-01') as name,
to_char(create_date, 'YYYY') as name,
to_char(create_date,'MM') as month,
user_id,
account_id,
sum(unit_amount) as quantity
from
account_analytic_line
group by
to_char(create_date, 'YYYY-MM-01'), user_id, account_id
to_char(create_date, 'YYYY'),to_char(create_date, 'MM'), user_id, account_id
)
""")
report_timesheet_account()
@ -87,10 +94,12 @@ class report_timesheet_account_date(osv.osv):
_description = "Daily timesheet per account"
_auto = False
_columns = {
'name': fields.date('Date', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
'quantity': fields.float('Quantity', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,account_id desc,user_id desc'
@ -100,14 +109,15 @@ class report_timesheet_account_date(osv.osv):
create or replace view report_timesheet_account_date as (
select
min(id) as id,
date as name,
to_char(date,'YYYY') as name,
to_char(date,'MM') as month,
user_id,
account_id,
sum(unit_amount) as quantity
from
account_analytic_line
group by
date, user_id, account_id
to_char(date,'YYYY'),to_char(date,'MM'), user_id, account_id
)
""")
report_timesheet_account_date()

3
addons/report_timesheet/report_timesheet_view.xml
View File

@ -25,6 +25,7 @@
<field name="arch" type="xml">
<form string="Timesheet by user">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
</form>
</field>
@ -185,6 +186,7 @@
<field name="arch" type="xml">
<form string="Daily timesheet by account">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
<field name="user_id" select="1"/>
<field name="quantity"/>
@ -246,6 +248,7 @@
<field name="arch" type="xml">
<form string="Timesheet by account">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="account_id" select="1"/>
<field name="user_id" select="1"/>
<field name="quantity"/>

12
addons/sale/process/sale_process.xml
View File

@ -41,7 +41,7 @@
</record>
<record id="process_node_quotation0" model="process.node">
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="menu_id" ref="sale.menu_action_order_tree"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
@ -52,7 +52,7 @@
</record>
<record id="process_node_saleorder0" model="process.node">
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="menu_id" ref="sale.menu_action_order_tree"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
@ -75,7 +75,7 @@
</record>
<record id="process_node_packinglist0" model="process.node">
<field name="menu_id" ref="stock.menu_picking_waiting"/>
<field name="menu_id" ref="stock.menu_action_picking_tree"/>
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>
@ -86,7 +86,7 @@
</record>
<record id="process_node_deliveryorder0" model="process.node">
<field name="menu_id" ref="stock.menu_picking_waiting_delivery"/>
<field name="menu_id" ref="stock.menu_action_picking_tree_delivery"/>
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
@ -97,7 +97,7 @@
</record>
<record id="process_node_invoice0" model="process.node">
<field name="menu_id" ref="account.menu_invoice_draft"/>
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
@ -109,7 +109,7 @@
</record>
<record id="process_node_invoiceafterdelivery0" model="process.node">
<field name="menu_id" ref="account.menu_invoice_draft"/>
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>

2
addons/sale/sale.py
View File

@ -764,7 +764,7 @@ class sale_order_line(osv.osv):
'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
'notes': fields.text('Notes'),
'th_weight': fields.float('Weight'),
'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'Status', required=True, readonly=True),
'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'State', required=True, readonly=True),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
'salesman_id':fields.related('order_id','user_id',type='many2one',relation='res.users',string='Salesman'),
'company_id': fields.related('order_id','company_id',type='many2one',object='res.company',string='Company')

76
addons/sale/sale_view.xml
View File

@ -252,6 +252,27 @@
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">My Sales Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended"/>
<record id="action_order_tree_all" model="ir.actions.act_window">
<field name="name">All Sales Order</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended"/>
<record id="action_order_tree_new" model="ir.actions.act_window">
<field name="name">New Quotation</field>
<field name="type">ir.actions.act_window</field>
@ -290,10 +311,61 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree" model="ir.actions.act_window">
<record id="action_order_tree5" model="ir.actions.act_window">
<field name="name">All Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft')]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree7" model="ir.actions.act_window">
<field name="name">My sales in shipping exception</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree8" model="ir.actions.act_window">
<field name="name">My sales order waiting Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree9" model="ir.actions.act_window">
<field name="name">My sales order in progress</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree10" model="ir.actions.act_window">
<field name="name">My Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">Old Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>

8
addons/sale_journal/sale_journal_view.xml
View File

@ -314,8 +314,7 @@
</record>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
<menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
<menuitem name="Sales by Journal (This Month)" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_month"/>
<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
<field name="res_model">sale_journal.sale.stats</field>
@ -323,9 +322,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
<menuitem name="Sales by Journal (All Months)" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
<act_window name="Monthly sales"
domain="[('journal_id', '=', active_id)]"

72
addons/scrum/i18n/zh_CN.po
View File

@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-01-30 13:29+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2009-11-26 02:10+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 04:54+0000\n"
"X-Launchpad-Export-Date: 2009-11-26 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: scrum
#: view:scrum.product.backlog:0
msgid "Scrum Product backlog"
msgstr ""
msgstr "sc"
#. module: scrum
#: field:scrum.meeting,name:0
msgid "Meeting Name"
msgstr ""
msgstr "会议主题"
#. module: scrum
#: model:process.transition,note:scrum.process_transition_backlogtask0
@ -35,13 +35,13 @@ msgstr ""
#: model:ir.actions.act_window,name:scrum.action_view_task4
#: model:ir.ui.menu,name:scrum.menu_action_view_task4
msgid "My tasks"
msgstr ""
msgstr "我的任务"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
#: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
msgid "My opened sprints (Product Owner)"
msgstr ""
msgstr "我进行中的冲刺（项目负责人）"
#. module: scrum
#: model:process.node,note:scrum.process_node_productbacklog0
@ -51,17 +51,17 @@ msgstr ""
#. module: scrum
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "操作定义中使用了无效的模式名称。"
#. module: scrum
#: model:ir.module.module,shortdesc:scrum.module_meta_information
msgid "Scrum, Agile Development Method"
msgstr ""
msgstr "Scrum，敏捷开发方法"
#. module: scrum
#: field:scrum.project,progress_rate:0
msgid "Progress"
msgstr ""
msgstr "进度"
#. module: scrum
#: help:scrum.task,remaining_hours:0
@ -73,7 +73,7 @@ msgstr ""
#. module: scrum
#: field:scrum.project,child_id:0
msgid "Subproject"
msgstr ""
msgstr "子项目"
#. module: scrum
#: view:scrum.meeting:0
@ -88,34 +88,34 @@ msgstr ""
#. module: scrum
#: field:scrum.project,members:0
msgid "Project Members"
msgstr ""
msgstr "项目成员"
#. module: scrum
#: view:scrum.project:0
msgid "Scrum Projects"
msgstr ""
msgstr "Scrum 项目列表"
#. module: scrum
#: field:scrum.task,child_ids:0
msgid "Delegated Tasks"
msgstr ""
msgstr "已委托的任务列表"
#. module: scrum
#: help:scrum.project,warn_header:0
msgid ""
"Header added at the beginning of the email for the warning message sent to "
"the customer when a task is closed."
msgstr ""
msgstr "任务关闭时通知客户的消息邮件的头"
#. module: scrum
#: field:scrum.task,priority:0
msgid "Importance"
msgstr ""
msgstr "优先级"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_task
msgid "Scrum Task"
msgstr ""
msgstr "Scrum 任务"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.dblc_proj
@ -126,13 +126,13 @@ msgstr ""
#: help:scrum.project,members:0
msgid ""
"Project's member. Not used in any computation, just for information purpose."
msgstr ""
msgstr "项目成员没有被任何统计计算所使用，而是仅仅为了记录信息。"
#. module: scrum
#: selection:scrum.product.backlog,priority:0
#: selection:scrum.task,priority:0
msgid "Very urgent"
msgstr ""
msgstr "非常紧急"
#. module: scrum
#: field:scrum.sprint,retrospective:0
@ -142,7 +142,7 @@ msgstr ""
#. module: scrum
#: field:scrum.sprint,name:0
msgid "Sprint Name"
msgstr ""
msgstr "冲刺主题"
#. module: scrum
#: help:scrum.task,planned_hours:0
@ -155,7 +155,7 @@ msgstr ""
#: field:scrum.project,notes:0
#: field:scrum.task,notes:0
msgid "Notes"
msgstr ""
msgstr "备注"
#. module: scrum
#: model:ir.model,name:scrum.model_scrum_product_backlog
@ -167,20 +167,20 @@ msgstr ""
#: field:scrum.sprint,project_id:0
#: field:scrum.task,project_id:0
msgid "Project"
msgstr ""
msgstr "项目"
#. module: scrum
#: help:scrum.project,warn_manager:0
msgid ""
"If you check this field, the project manager will receive a request each "
"time a task is completed by his team."
msgstr ""
msgstr "如果选中此字段，项目经理当他的团队完成每一个任务的时候将收到一个请求。"
#. module: scrum
#: selection:scrum.project,state:0
#: selection:scrum.task,state:0
msgid "Cancelled"
msgstr ""
msgstr "已取消"
#. module: scrum
#: field:scrum.team,name:0
@ -190,7 +190,7 @@ msgstr ""
#. module: scrum
#: field:scrum.project,warn_header:0
msgid "Mail Header"
msgstr ""
msgstr "邮件头"
#. module: scrum
#: field:scrum.project,sprint_size:0
@ -200,12 +200,12 @@ msgstr ""
#. module: scrum
#: field:scrum.sprint,date_stop:0
msgid "Ending Date"
msgstr ""
msgstr "结束时间"
#. module: scrum
#: help:scrum.task,effective_hours:0
msgid "Computed using the sum of the task work done."
msgstr ""
msgstr "任务完成的工作时间合计"
#. module: scrum
#: help:scrum.project,warn_customer:0
@ -217,12 +217,12 @@ msgstr ""
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
msgid "View sprint Tasks"
msgstr ""
msgstr "查看冲刺任务列表"
#. module: scrum
#: field:scrum.project,category_id:0
msgid "Analytic Account"
msgstr ""
msgstr "分析科目"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_view_task
@ -233,25 +233,25 @@ msgstr "所有任务"
#. module: scrum
#: field:scrum.task,date_deadline:0
msgid "Deadline"
msgstr ""
msgstr "截止日期"
#. module: scrum
#: field:scrum.project,partner_id:0
#: field:scrum.task,partner_id:0
msgid "Partner"
msgstr ""
msgstr "业务伙伴"
#. module: scrum
#: field:scrum.product.backlog,planned_hours:0
#: field:scrum.sprint,planned_hours:0
#: field:scrum.task,planned_hours:0
msgid "Planned Hours"
msgstr ""
msgstr "计划小时数"
#. module: scrum
#: selection:scrum.project,state:0
msgid "Template"
msgstr ""
msgstr "模版"
#. module: scrum
#: field:scrum.product.backlog,priority:0
@ -262,7 +262,7 @@ msgstr ""
#: field:scrum.project,state:0
#: view:scrum.sprint:0
msgid "State"
msgstr ""
msgstr "状态"
#. module: scrum
#: help:scrum.project,progress_rate:0
@ -272,7 +272,7 @@ msgstr ""
#. module: scrum
#: help:scrum.project,notes:0
msgid "Internal description of the project."
msgstr ""
msgstr "项目的内部说明"
#. module: scrum
#: field:scrum.sprint,meetings_id:0
@ -282,7 +282,7 @@ msgstr ""
#. module: scrum
#: help:scrum.task,total_hours:0
msgid "Computed as: Time Spent + Remaining Time."
msgstr ""
msgstr "计算方法：花费时间－剩余时间"
#. module: scrum
#: field:scrum.task,type:0

4
addons/scrum/scrum.py
View File

@ -98,7 +98,7 @@ class scrum_sprint(osv.osv):
'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True),
'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True),
}
_defaults = {
'state': lambda *a: 'draft',
@ -166,7 +166,7 @@ class scrum_product_backlog(osv.osv):
'sequence' : fields.integer('Sequence'),
'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
'tasks_id': fields.one2many('scrum.task', 'product_backlog_id', 'Tasks Details'),
'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True),
'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True),
'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours')

7
addons/scrum/scrum_view.xml
View File

@ -126,7 +126,6 @@
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended"/>
<record id="action_product_backlog_form_open" model="ir.actions.act_window">
<field name="name">Opened Backlogs</field>
@ -136,7 +135,6 @@
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended"/>
<!--
Scrum Sprint
@ -438,7 +436,7 @@
<field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task" groups="base.group_extended"/>
<menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_extended"/>
<record id="action_view_task5" model="ir.actions.act_window">
<field name="name">My opened tasks</field>
@ -448,7 +446,6 @@
<field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4" groups="base.group_extended"/>
<record id="action_view_task6" model="ir.actions.act_window">
<field name="name">Opened tasks</field>
@ -456,8 +453,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open'),('scrum','=',1)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task" />
</data>
</openerp>

12
addons/stock/stock.py
View File

@ -453,7 +453,11 @@ class stock_picking(osv.osv):
('assigned', 'Available'),
('done', 'Done'),
('cancel', 'Cancelled'),
], 'Status', readonly=True, select=True),
], 'State', readonly=True, select=True,
help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed picking. \
\n* The \'Confirmed\' state is used for stock movement to do with unavailable products. \
\n* The \'Available\' state is set automatically when the products are ready to be moved.\
\n* The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
'date': fields.datetime('Date Order', help="Date of Order"),
@ -979,7 +983,9 @@ class stock_move(osv.osv):
'note': fields.text('Notes'),
'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True),
'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the packing it done the state is \'Done\'.\
\nThe state is \'Waiting\' if the move is waiting for another one.'),
'price_unit': fields.float('Unit Price',
digits=(16, int(config['price_accuracy']))),
}
@ -1340,7 +1346,7 @@ class stock_inventory(osv.osv):
'date_done': fields.datetime('Date done'),
'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'Status', readonly=True),
'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True),
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),

13
addons/stock/stock_view.xml
View File

@ -91,7 +91,7 @@
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_extended"/>
<record id="action_inventory_form_new" model="ir.actions.act_window">
<field name="name">New Periodical Inventory</field>
<field name="type">ir.actions.act_window</field>
@ -100,8 +100,6 @@
<field name="view_mode">form,tree</field>
<field name="domain">[('state','=','draft')]</field>
</record>
<menuitem action="action_inventory_form_new" id="menu_action_inventory_form_new" parent="menu_action_inventory_form"/>
=============================
Lot
@ -767,7 +765,6 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree2_delivery"/>
</record>
<menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended" />
<record id="action_picking_tree3_delivery" model="ir.actions.act_window">
<field name="name">Future Delivery Orders</field>
@ -797,7 +794,6 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree3_delivery"/>
</record>
<menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended" />
<record id="action_picking_calendar_delivery" model="ir.actions.act_window">
<field name="name">Calendar of Deliveries</field>
@ -808,7 +804,6 @@
<field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
<field name="context">{'contact_display': 'partner'}</field>
</record>
<menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended" />
#
# Sending Products
@ -966,7 +961,6 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree2"/>
</record>
<menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_extended"/>
<record id="action_picking_tree3" model="ir.actions.act_window">
<field name="name">Confirmed Packing Waiting Availability</field>
@ -996,7 +990,6 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree3"/>
</record>
<menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_extended"/>
#
# Reception of Products
@ -1211,7 +1204,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_extended"/>
<record id="action_picking_tree8" model="ir.actions.act_window">
<field name="name">Confirmed Packing Waiting Availability</field>
@ -1224,7 +1216,6 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_extended"/>
<record id="action_picking_tree9" model="ir.actions.act_window">
<field name="name">New Internal Packing</field>
@ -1327,7 +1318,6 @@
<field name="view_id" ref="view_move_tree"/>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_extended"/>
<record id="action_move_form4" model="ir.actions.act_window">
<field name="name">Available Moves</field>
@ -1338,7 +1328,6 @@
<field name="view_id" ref="view_move_tree"/>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_extended"/>
<record id="action_picking_all" model="ir.actions.act_window">
<field name="name">Packing</field>

2
addons/subscription/subscription.py
View File

@ -70,7 +70,7 @@ class subscription_subscription(osv.osv):
'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
'exec_init': fields.integer('Number of documents'),
'date_init': fields.datetime('First Date'),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
'cron_id': fields.many2one('ir.cron', 'Cron Job')

6
addons/wiki/wiki_view.xml
View File

@ -158,8 +158,6 @@
<field name="domain">[('create_uid','=',uid)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_mypages" string="My Pages"
action="action_wiki_mypages" groups="base.group_extended"/>
<!-- Pages Waiting Review -->
<record model="ir.actions.act_window" id="action_wiki_review">
@ -172,9 +170,7 @@
<field name="domain">[('review','=',True)]</field>
<field name="filter" eval="True"/>
</record>
<menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_review" string="Pages Waiting Review"
action="action_wiki_review" groups="base.group_extended"/>
<record model="ir.ui.view" id="view_wiki_history_tree">
<field name="name">wiki.wiki.history.tree</field>
<field name="model">wiki.wiki.history</field>