parent
c4c5ef9f4f
commit
cac4fe35ca
|
@ -166,7 +166,9 @@ class account_analytic_account(osv.osv):
|
||||||
'type' : lambda *a : 'normal',
|
'type' : lambda *a : 'normal',
|
||||||
'company_id': _default_company,
|
'company_id': _default_company,
|
||||||
'state' : lambda *a : 'draft',
|
'state' : lambda *a : 'draft',
|
||||||
'user_id' : lambda self,cr,uid,ctx : uid
|
'user_id' : lambda self,cr,uid,ctx : uid,
|
||||||
|
'partner_id': lambda self,cr, uid, ctx: ctx.get('partner_id', False),
|
||||||
|
'contact_id': lambda self,cr, uid, ctx: ctx.get('contact_id', False),
|
||||||
}
|
}
|
||||||
|
|
||||||
def check_recursion(self, cr, uid, ids, parent=None):
|
def check_recursion(self, cr, uid, ids, parent=None):
|
||||||
|
|
|
@ -60,7 +60,8 @@
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="quantity_max"/>
|
<field name="quantity_max"/>
|
||||||
<field name="user_id"/>
|
<field name="user_id"/>
|
||||||
<separator colspan="4" string="Note"/>
|
</page>
|
||||||
|
<page string="Description">
|
||||||
<field colspan="4" name="description" nolabel="1"/>
|
<field colspan="4" name="description" nolabel="1"/>
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="view_account_journal_form_inherit2">
|
<record model="ir.ui.view" id="view_account_journal_form_inherit2">
|
||||||
<field name="name">account.journal.form.inherit2</field>
|
<field name="name">account.journal.form.inherit2</field>
|
||||||
<field name="model">account.journal</field>
|
<field name="model">account.journal</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="account.view_account_journal_form"/>
|
<field name="inherit_id" ref="account.view_account_journal_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="user_id" position="after">
|
<field name="user_id" position="after">
|
||||||
<field name="allow_date" />
|
<field name="allow_date" />
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -72,8 +72,8 @@
|
||||||
<field name="inherit_id" ref="account.view_move_line_form"/>
|
<field name="inherit_id" ref="account.view_move_line_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="date_created" position="after">
|
<field name="date_created" position="after">
|
||||||
<field name="followup_date"/>
|
|
||||||
<field name="followup_line_id"/>
|
<field name="followup_line_id"/>
|
||||||
|
<field name="followup_date"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
<field name="inherit_id" ref="account.view_tax_form"/>
|
<field name="inherit_id" ref="account.view_tax_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="python_compute" position="after">
|
<field name="python_compute" position="after">
|
||||||
<field colspan="4" name="python_compute_inv" nolabel="1"/>
|
|
||||||
<separator colspan="4" string="Compute Code for Taxes included prices"/>
|
<separator colspan="4" string="Compute Code for Taxes included prices"/>
|
||||||
|
<field colspan="4" name="python_compute_inv" nolabel="1"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -1,83 +1,83 @@
|
||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<!-- analytic_journal_rate_grid views -->
|
<!-- analytic_journal_rate_grid views -->
|
||||||
<record model="ir.ui.view" id="analytic_journal_rate_grid_tree">
|
<record model="ir.ui.view" id="analytic_journal_rate_grid_tree">
|
||||||
<field name="name">analytic_journal_rate_grid.tree</field>
|
<field name="name">analytic_journal_rate_grid.tree</field>
|
||||||
<field name="model">analytic_journal_rate_grid</field>
|
<field name="model">analytic_journal_rate_grid</field>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Billing Rate per Journal for this Analytic Account" editable="bottom">
|
<tree string="Billing Rate per Journal for this Analytic Account" editable="bottom">
|
||||||
<field name="journal_id" required="1"/>
|
<field name="journal_id" required="1"/>
|
||||||
<field name="rate_id" />
|
<field name="rate_id" />
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="analytic_journal_rate_grid_form">
|
<record model="ir.ui.view" id="analytic_journal_rate_grid_form">
|
||||||
<field name="name">analytic_journal_rate_grid.form</field>
|
<field name="name">analytic_journal_rate_grid.form</field>
|
||||||
<field name="model">analytic_journal_rate_grid</field>
|
<field name="model">analytic_journal_rate_grid</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Billing Rate per Journal for this Analytic Account" editable="bottom">
|
<form string="Billing Rate per Journal for this Analytic Account" editable="bottom">
|
||||||
<field name="journal_id" required="1"/>
|
<field name="journal_id" required="1"/>
|
||||||
<field name="rate_id" />
|
<field name="rate_id" />
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- account.analytic.account inherited view -->
|
<!-- account.analytic.account inherited view -->
|
||||||
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
|
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
|
||||||
<field name="name">account.analytic.account.form</field>
|
<field name="name">account.analytic.account.form</field>
|
||||||
<field name="model">account.analytic.account</field>
|
<field name="model">account.analytic.account</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
|
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/notebook/page/field[@name='to_invoice']" position="after">
|
<xpath expr="/form/notebook/page/field[@name='to_invoice']" position="after">
|
||||||
<!--<field name="to_invoice" string="Default Invoicing Percentage"/>-->
|
<!--<field name="to_invoice" string="Default Invoicing Percentage"/>-->
|
||||||
<field name="journal_rate_ids" colspan="4"/>
|
<field name="journal_rate_ids" colspan="4"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- hr_timesheet_sheet.sheet inherited view -->
|
<!-- hr_timesheet_sheet.sheet inherited view -->
|
||||||
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
|
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
|
||||||
<field name="name">hr.timesheet.sheet.form</field>
|
<field name="name">hr.timesheet.sheet.form</field>
|
||||||
<field name="model">hr_timesheet_sheet.sheet</field>
|
<field name="model">hr_timesheet_sheet.sheet</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
|
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
|
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
|
||||||
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)"/>
|
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- hr.analytic.timesheet inherited views -->
|
<!-- hr.analytic.timesheet inherited views -->
|
||||||
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
|
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
|
||||||
<field name="name">hr.analytic.timesheet.form</field>
|
<field name="name">hr.analytic.timesheet.form</field>
|
||||||
<field name="model">hr.analytic.timesheet</field>
|
<field name="model">hr.analytic.timesheet</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/field[@name='account_id']" position="replace">
|
<xpath expr="/form/field[@name='account_id']" position="replace">
|
||||||
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)" select="1"/>
|
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)" select="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
|
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
|
||||||
<field name="name">hr.analytic.timesheet.form</field>
|
<field name="name">hr.analytic.timesheet.form</field>
|
||||||
<field name="model">hr.analytic.timesheet</field>
|
<field name="model">hr.analytic.timesheet</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/field[@name='journal_id']" position="replace">
|
<xpath expr="/form/field[@name='journal_id']" position="replace">
|
||||||
<field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
|
<field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -1,109 +1,109 @@
|
||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<!-- analytic_user_funct_grid views -->
|
<!-- analytic_user_funct_grid views -->
|
||||||
<record model="ir.ui.view" id="analytic_user_funct_grid_tree">
|
<record model="ir.ui.view" id="analytic_user_funct_grid_tree">
|
||||||
<field name="name">analytic_user_funct_grid.tree</field>
|
<field name="name">analytic_user_funct_grid.tree</field>
|
||||||
<field name="model">analytic_user_funct_grid</field>
|
<field name="model">analytic_user_funct_grid</field>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="User's Product for this Analytic Account" editable="bottom">
|
<tree string="User's Product for this Analytic Account" editable="bottom">
|
||||||
<field name="user_id" required="1"/>
|
<field name="user_id" required="1"/>
|
||||||
<field name="product_id" required="1" />
|
<field name="product_id" required="1" />
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="analytic_user_funct_grid_form">
|
<record model="ir.ui.view" id="analytic_user_funct_grid_form">
|
||||||
<field name="name">analytic_user_funct_grid.form</field>
|
<field name="name">analytic_user_funct_grid.form</field>
|
||||||
<field name="model">analytic_user_funct_grid</field>
|
<field name="model">analytic_user_funct_grid</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="User's Product for this Analytic Account">
|
<form string="User's Product for this Analytic Account">
|
||||||
<field name="user_id" required="1"/>
|
<field name="user_id" required="1"/>
|
||||||
<field name="product_id" required="1"/>
|
<field name="product_id" required="1"/>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- account.analytic.account inherited view -->
|
<!-- account.analytic.account inherited view -->
|
||||||
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
|
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
|
||||||
<field name="name">account.analytic.account.form</field>
|
<field name="name">account.analytic.account.form</field>
|
||||||
<field name="model">account.analytic.account</field>
|
<field name="model">account.analytic.account</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
|
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/notebook/page" position="after">
|
<xpath expr="/form/notebook/page" position="after">
|
||||||
<page string="Users/Products Rel.">
|
<page string="Users/Products Rel.">
|
||||||
<field name="user_product_ids" colspan="4" nolabel="1"/>
|
<field name="user_product_ids" colspan="4" nolabel="1"/>
|
||||||
</page>
|
</page>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- hr_timesheet_sheet.sheet inherited view -->
|
<!-- hr_timesheet_sheet.sheet inherited view -->
|
||||||
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
|
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
|
||||||
<field name="name">hr.timesheet.sheet.form</field>
|
<field name="name">hr.timesheet.sheet.form</field>
|
||||||
<field name="model">hr_timesheet_sheet.sheet</field>
|
<field name="model">hr_timesheet_sheet.sheet</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="priority" eval="18"/>
|
<field name="priority" eval="18"/>
|
||||||
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
|
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
|
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
|
||||||
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/>
|
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- hr.analytic.timesheet inherited views -->
|
<!-- hr.analytic.timesheet inherited views -->
|
||||||
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
|
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
|
||||||
<field name="name">hr.analytic.timesheet.form</field>
|
<field name="name">hr.analytic.timesheet.form</field>
|
||||||
<field name="model">hr.analytic.timesheet</field>
|
<field name="model">hr.analytic.timesheet</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/field[@name='account_id']" position="replace">
|
<xpath expr="/form/field[@name='account_id']" position="replace">
|
||||||
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
|
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
|
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
|
||||||
<field name="name">hr.analytic.timesheet.form</field>
|
<field name="name">hr.analytic.timesheet.form</field>
|
||||||
<field name="model">hr.analytic.timesheet</field>
|
<field name="model">hr.analytic.timesheet</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/form/field[@name='user_id']" position="replace">
|
<xpath expr="/form/field[@name='user_id']" position="replace">
|
||||||
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
|
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
|
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
|
||||||
<field name="name">hr.analytic.timesheet.tree</field>
|
<field name="name">hr.analytic.timesheet.tree</field>
|
||||||
<field name="model">hr.analytic.timesheet</field>
|
<field name="model">hr.analytic.timesheet</field>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
|
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/tree/field[@name='account_id']" position="replace">
|
<xpath expr="/tree/field[@name='account_id']" position="replace">
|
||||||
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
|
<field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
|
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
|
||||||
<field name="name">hr.analytic.timesheet.tree</field>
|
<field name="name">hr.analytic.timesheet.tree</field>
|
||||||
<field name="model">hr.analytic.timesheet</field>
|
<field name="model">hr.analytic.timesheet</field>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
|
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="/tree/field[@name='user_id']" position="replace">
|
<xpath expr="/tree/field[@name='user_id']" position="replace">
|
||||||
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
|
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -8,11 +8,11 @@
|
||||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="property_account_position" position="after">
|
<field name="property_account_position" position="after">
|
||||||
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
|
|
||||||
<group colspan="1" col="2">
|
<group colspan="1" col="2">
|
||||||
<label string="VAT :" align="1.0"/>
|
<label string="VAT :" align="1.0"/>
|
||||||
<field name="vat_subjected" nolabel="1"/>
|
<field name="vat_subjected" nolabel="1"/>
|
||||||
</group>
|
</group>
|
||||||
|
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -137,8 +137,8 @@
|
||||||
<field name="inherit_id" ref="stock.view_picking_out_form"/>
|
<field name="inherit_id" ref="stock.view_picking_out_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="address_id" position="after">
|
<field name="address_id" position="after">
|
||||||
<field name="weight"/>
|
|
||||||
<field name="carrier_id"/>
|
<field name="carrier_id"/>
|
||||||
|
<field name="weight"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -150,8 +150,8 @@
|
||||||
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
|
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="address_id" position="after">
|
<field name="address_id" position="after">
|
||||||
<field name="weight"/>
|
|
||||||
<field name="carrier_id"/>
|
<field name="carrier_id"/>
|
||||||
|
<field name="weight"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -161,7 +161,7 @@
|
||||||
<field name="res_model">stock.picking</field>
|
<field name="res_model">stock.picking</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
|
<field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>
|
<menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<record id="view_attendance_form" model="ir.ui.view">
|
<record id="view_attendance_form" model="ir.ui.view">
|
||||||
<field name="name">hr.attendance.form</field>
|
<field name="name">hr.attendance.form</field>
|
||||||
<field name="model">hr.attendance</field>
|
<field name="model">hr.attendance</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
|
@ -91,12 +91,12 @@
|
||||||
<field name="inherit_id" ref="hr.view_employee_form"/>
|
<field name="inherit_id" ref="hr.view_employee_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="parent_id" position="after">
|
<field name="parent_id" position="after">
|
||||||
<field name="state"/>
|
<field name="state"/>
|
||||||
<button name="sign_in" states="absent" string="Sign In" type="object"/>
|
<button name="sign_in" states="absent" string="Sign In" type="object"/>
|
||||||
<button name="sign_out" states="present" string="Sign Out" type="object"/>
|
<button name="sign_out" states="present" string="Sign Out" type="object"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -1,99 +1,99 @@
|
||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<!-- Holidays -->
|
<!-- Holidays -->
|
||||||
<record model="ir.ui.view" id="edit_holiday_inherit_new">
|
<record model="ir.ui.view" id="edit_holiday_inherit_new">
|
||||||
<field name="name">hr.holidays.form.inherit</field>
|
<field name="name">hr.holidays.form.inherit</field>
|
||||||
<field name="model">hr.holidays</field>
|
<field name="model">hr.holidays</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" eval="False"/>
|
<field name="inherit_id" eval="False"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Employee holidays">
|
<form string="Employee holidays">
|
||||||
<field colspan="4" name="name" select="1"/>
|
<field colspan="4" name="name" select="1"/>
|
||||||
<field name="date_from" select="1"/>
|
<field name="date_from" select="1"/>
|
||||||
<field name="date_to" select="1"/>
|
<field name="date_to" select="1"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="holiday_status" select="1"/>
|
<field name="holiday_status" select="1"/>
|
||||||
<group col="12" colspan="2">
|
<group col="12" colspan="2">
|
||||||
<button string="Confirm" name="confirm" states="draft" type="workflow"/>
|
<button string="Confirm" name="confirm" states="draft" type="workflow"/>
|
||||||
<button string="Validate" name="validate" states="confirm" type="workflow"/>
|
<button string="Validate" name="validate" states="confirm" type="workflow"/>
|
||||||
<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
|
<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
|
||||||
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
|
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
|
||||||
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
|
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
|
||||||
</group>
|
</group>
|
||||||
<field name="state" select="1" colspan="2"/>
|
<field name="state" select="1" colspan="2"/>
|
||||||
<newline />
|
<newline />
|
||||||
<field name="notes" col="12" colspan="4"/>
|
<field name="notes" col="12" colspan="4"/>
|
||||||
<newline />
|
<newline />
|
||||||
<field name="manager_id" colspan="2"/>
|
<field name="manager_id" colspan="2"/>
|
||||||
<field name="employee_id" select="1" />
|
<field name="employee_id" select="1" />
|
||||||
<newline />
|
<newline />
|
||||||
<field name="number_of_days" colspan="2"/>
|
<field name="number_of_days" colspan="2"/>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="view_holiday">
|
<record model="ir.ui.view" id="view_holiday">
|
||||||
<field name="name">hr.holidays.tree</field>
|
<field name="name">hr.holidays.tree</field>
|
||||||
<field name="model">hr.holidays</field>
|
<field name="model">hr.holidays</field>
|
||||||
<field name="inherit_id" eval="False"/>
|
<field name="inherit_id" eval="False"/>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Employee holidays">
|
<tree string="Employee holidays">
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="date_from"/>
|
<field name="date_from"/>
|
||||||
<field name="date_to"/>
|
<field name="date_to"/>
|
||||||
<field name="holiday_status"/>
|
<field name="holiday_status"/>
|
||||||
<field name="state"/>
|
<field name="state"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="view_holiday_2">
|
<record model="ir.ui.view" id="view_holiday_2">
|
||||||
<field name="name">hr.holidays.tree</field>
|
<field name="name">hr.holidays.tree</field>
|
||||||
<field name="model">hr.holidays</field>
|
<field name="model">hr.holidays</field>
|
||||||
<field name="inherit_id" ref="view_holiday"/>
|
<field name="inherit_id" ref="view_holiday"/>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="name" position="after">
|
<field name="name" position="after">
|
||||||
<field name="number_of_days" string="Number of Days"/>
|
<field name="employee_id"/>
|
||||||
<field name="employee_id"/>
|
<field name="number_of_days" string="Number of Days"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- holidays status -->
|
<!-- holidays status -->
|
||||||
<record model="ir.ui.view" id="edit_holiday_status_form">
|
<record model="ir.ui.view" id="edit_holiday_status_form">
|
||||||
<field name="name">hr.holidays.status.form</field>
|
<field name="name">hr.holidays.status.form</field>
|
||||||
<field name="model">hr.holidays.status</field>
|
<field name="model">hr.holidays.status</field>
|
||||||
<field name="inherit_id" eval="False"/>
|
<field name="inherit_id" eval="False"/>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Define holiday status">
|
<form string="Define holiday status">
|
||||||
<field colspan="4" name="name" select="1"/>
|
<field colspan="4" name="name" select="1"/>
|
||||||
<field name="color_name" select="2"/>
|
<field name="color_name" select="2"/>
|
||||||
<field name="section_id" select="1" />
|
<field name="section_id" select="1" />
|
||||||
<field name="limit" select="2"/>
|
<field name="limit" select="2"/>
|
||||||
<field name="active" select="2"/>
|
<field name="active" select="2"/>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.ui.view" id="view_holiday_status_tree">
|
<record model="ir.ui.view" id="view_holiday_status_tree">
|
||||||
<field name="name">hr.holidays.status.tree</field>
|
<field name="name">hr.holidays.status.tree</field>
|
||||||
<field name="model">hr.holidays.status</field>
|
<field name="model">hr.holidays.status</field>
|
||||||
<field name="inherit_id" eval="False"/>
|
<field name="inherit_id" eval="False"/>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Holiday status">
|
<tree string="Holiday status">
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="color_name" />
|
<field name="color_name" />
|
||||||
<field name="section_id" />
|
<field name="section_id" />
|
||||||
<field name="limit" select="2"/>
|
<field name="limit" select="2"/>
|
||||||
<field name="active" select="2"/>
|
<field name="active" select="2"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="open_view_holiday_status" model="ir.actions.act_window">
|
<record id="open_view_holiday_status" model="ir.actions.act_window">
|
||||||
<field name="name">Holiday Status</field>
|
<field name="name">Holiday Status</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
|
@ -103,155 +103,155 @@
|
||||||
</record>
|
</record>
|
||||||
<menuitem action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
|
<menuitem action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
|
||||||
|
|
||||||
<!-- holidays per user -->
|
<!-- holidays per user -->
|
||||||
<record model="ir.ui.view" id="view_holidays_per_user_form">
|
<record model="ir.ui.view" id="view_holidays_per_user_form">
|
||||||
<field name="name">hr.holidays.per.user.form</field>
|
<field name="name">hr.holidays.per.user.form</field>
|
||||||
<field name="model">hr.holidays.per.user</field>
|
<field name="model">hr.holidays.per.user</field>
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Holidays Per Employee">
|
<form string="Holidays Per Employee">
|
||||||
<field name="employee_id" select="1" />
|
<field name="employee_id" select="1" />
|
||||||
<field name="holiday_status" select="1" />
|
<field name="holiday_status" select="1" />
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="max_leaves" select="2" colspan="2" />
|
<field name="max_leaves" select="2" colspan="2" />
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="leaves_taken" select="2" colspan="2" />
|
<field name="leaves_taken" select="2" colspan="2" />
|
||||||
<field name="active" select="2"/>
|
<field name="active" select="2"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="notes" colspan="4" />
|
<field name="notes" colspan="4" />
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.ui.view" id="view_holidays_per_user_tree">
|
<record model="ir.ui.view" id="view_holidays_per_user_tree">
|
||||||
<field name="name">hr.holidays.per.user.tree</field>
|
<field name="name">hr.holidays.per.user.tree</field>
|
||||||
<field name="model">hr.holidays.per.user</field>
|
<field name="model">hr.holidays.per.user</field>
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Holidays Per Employee">
|
<tree string="Holidays Per Employee">
|
||||||
<field name="employee_id"/>
|
<field name="employee_id"/>
|
||||||
<field name="holiday_status"/>
|
<field name="holiday_status"/>
|
||||||
<field name="max_leaves"/>
|
<field name="max_leaves"/>
|
||||||
<field name="leaves_taken"/>
|
<field name="leaves_taken"/>
|
||||||
<field name="active" select="2"/>
|
<field name="active" select="2"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="view_holidays_per_user_graph">
|
<record model="ir.ui.view" id="view_holidays_per_user_graph">
|
||||||
<field name="name">hr.holidays.per.user.graph</field>
|
<field name="name">hr.holidays.per.user.graph</field>
|
||||||
<field name="model">hr.holidays.per.user</field>
|
<field name="model">hr.holidays.per.user</field>
|
||||||
<field name="type">graph</field>
|
<field name="type">graph</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<graph type="bar" string="Holidays Allowed">
|
<graph type="bar" string="Holidays Allowed">
|
||||||
<field name="employee_id"/>
|
<field name="employee_id"/>
|
||||||
<field name="max_leaves" operator="+"/>
|
<field name="max_leaves" operator="+"/>
|
||||||
<field name="leaves_taken" operator="+"/>
|
<field name="leaves_taken" operator="+"/>
|
||||||
</graph>
|
</graph>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Menu Items -->
|
<!-- Menu Items -->
|
||||||
<record model="ir.actions.act_window" id="open_ask_holidays">
|
<record model="ir.actions.act_window" id="open_ask_holidays">
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_id" ref="edit_holiday_inherit_new" />
|
<field name="view_id" ref="edit_holiday_inherit_new" />
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="Holidays Request" parent="hr.menu_hr_root" id="menu_open_ask_holidays" action="open_ask_holidays"/>
|
<menuitem name="Holidays Request" parent="hr.menu_hr_root" id="menu_open_ask_holidays" action="open_ask_holidays"/>
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_all_holiday">
|
<record model="ir.actions.act_window" id="action_all_holiday">
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="All Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_all_holiday" action="action_all_holiday" />
|
<menuitem name="All Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_all_holiday" action="action_all_holiday" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_my_holiday">
|
<record model="ir.actions.act_window" id="action_my_holiday">
|
||||||
<field name="name">My Holidays Request</field>
|
<field name="name">My Holidays Request</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('user_id','=',uid)]</field>
|
<field name="domain">[('user_id','=',uid)]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="My Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" />
|
<menuitem name="My Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_my_holiday_draft">
|
<record model="ir.actions.act_window" id="action_my_holiday_draft">
|
||||||
<field name="name">My Holidays Request Draft</field>
|
<field name="name">My Holidays Request Draft</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
|
<field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
|
<menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_my_holiday_waiting">
|
<record model="ir.actions.act_window" id="action_my_holiday_waiting">
|
||||||
<field name="name">My Holidays Request Waiting confirmation</field>
|
<field name="name">My Holidays Request Waiting confirmation</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
|
<field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="My Awaiting Confirmation Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
|
<menuitem name="My Awaiting Confirmation Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_my_holiday_validate">
|
<record model="ir.actions.act_window" id="action_my_holiday_validate">
|
||||||
<field name="name">My Holidays Request Validated</field>
|
<field name="name">My Holidays Request Validated</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
|
<field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="My Validated Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" />
|
<menuitem name="My Validated Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_my_holiday_refuse">
|
<record model="ir.actions.act_window" id="action_my_holiday_refuse">
|
||||||
<field name="name">My Holidays Request Refused</field>
|
<field name="name">My Holidays Request Refused</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
|
<field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="My Refused Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" />
|
<menuitem name="My Refused Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_holiday_waiting">
|
<record model="ir.actions.act_window" id="action_holiday_waiting">
|
||||||
<field name="name">Requests Awaiting for Validation</field>
|
<field name="name">Requests Awaiting for Validation</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays</field>
|
<field name="res_model">hr.holidays</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain">[('state','=','confirm')]</field>
|
<field name="domain">[('state','=','confirm')]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="Holidays Requests Awaiting for Validation" parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" />
|
<menuitem name="Holidays Requests Awaiting for Validation" parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" />
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_holidays_per_user">
|
<record model="ir.actions.act_window" id="action_holidays_per_user">
|
||||||
<field name="name">Holidays Per Employee</field>
|
<field name="name">Holidays Per Employee</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays.per.user</field>
|
<field name="res_model">hr.holidays.per.user</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form,graph</field>
|
<field name="view_mode">tree,form,graph</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="Holidays Per Employee" parent="hr.menu_hr_configuration" id="menu_open_holidays_per_user" action="action_holidays_per_user"/>
|
<menuitem name="Holidays Per Employee" parent="hr.menu_hr_configuration" id="menu_open_holidays_per_user" action="action_holidays_per_user"/>
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_my_holiday_available">
|
<record model="ir.actions.act_window" id="action_my_holiday_available">
|
||||||
<field name="name">My Available Holidays</field>
|
<field name="name">My Available Holidays</field>
|
||||||
<field name="type">ir.actions.act_window</field>
|
<field name="type">ir.actions.act_window</field>
|
||||||
<field name="res_model">hr.holidays.per.user</field>
|
<field name="res_model">hr.holidays.per.user</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree</field>
|
<field name="view_mode">tree</field>
|
||||||
<field name="domain">[('user_id','=',uid)]</field>
|
<field name="domain">[('user_id','=',uid)]</field>
|
||||||
</record>
|
</record>
|
||||||
<menuitem name="My Available Holidays" parent="hr.menu_hr_reporting" id="menu_action_my_holiday_available" action="action_my_holiday_available" />
|
<menuitem name="My Available Holidays" parent="hr.menu_hr_reporting" id="menu_action_my_holiday_available" action="action_my_holiday_available" />
|
||||||
|
|
||||||
|
|
||||||
<!-- Shortcuts -->
|
<!-- Shortcuts -->
|
||||||
<act_window name="My Holiday Requests"
|
<act_window name="My Holiday Requests"
|
||||||
domain="[('employee_id', '=', active_id)]"
|
domain="[('employee_id', '=', active_id)]"
|
||||||
res_model="hr.holidays"
|
res_model="hr.holidays"
|
||||||
src_model="hr.employee"
|
src_model="hr.employee"
|
||||||
id="act_hr_employee_holiday_request"/>
|
id="act_hr_employee_holiday_request"/>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -65,8 +65,14 @@ class account_analytic_account(osv.osv):
|
||||||
_columns = {
|
_columns = {
|
||||||
'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
|
'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
|
||||||
'amount_max': fields.float('Max. Invoice Price'),
|
'amount_max': fields.float('Max. Invoice Price'),
|
||||||
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount'),
|
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
|
||||||
'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Invoicing'),
|
help="Total invoiced"),
|
||||||
|
'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Reinvoice Costs',
|
||||||
|
help="Check this field if you plan to automatically generate invoices based " \
|
||||||
|
"on the costs in this analytic account: timesheets, expenses, ..."),
|
||||||
|
}
|
||||||
|
_defaults = {
|
||||||
|
'pricelist_id': lambda self,cr, uid, ctx: ctx.get('pricelist_id', False),
|
||||||
}
|
}
|
||||||
account_analytic_account()
|
account_analytic_account()
|
||||||
|
|
||||||
|
|
|
@ -8,13 +8,16 @@
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
|
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="quantity_max" position="before">
|
<field name="user_id" position="after">
|
||||||
<separator colspan="4" string="Invoicing Data"/>
|
<group colspan="4" col="4">
|
||||||
<field name="pricelist_id"/>
|
<separator colspan="4" string="Invoicing Data"/>
|
||||||
<field name="to_invoice"/>
|
<field name="pricelist_id"/>
|
||||||
<field name="amount_max"/>
|
<field name="to_invoice"/>
|
||||||
<field name="amount_invoiced"/>
|
<field name="amount_max"/>
|
||||||
<field name="state"/>
|
<field name="amount_invoiced"/>
|
||||||
|
<separator colspan="4" string="Status"/>
|
||||||
|
<field name="state"/>
|
||||||
|
</group>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -284,7 +284,7 @@ class hr_timesheet_sheet(osv.osv):
|
||||||
|
|
||||||
|
|
||||||
_constraints = [
|
_constraints = [
|
||||||
(_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to']),
|
(_sheet_date, 'You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
|
||||||
(_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']),
|
(_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -9,13 +9,13 @@
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="hour" position="after">
|
<field name="hour" position="after">
|
||||||
<button name="button_done" string="Finished" states="startworking"/>
|
|
||||||
<button name="button_start_working" string="Start working" states="draft,pause"/>
|
|
||||||
<field name="uom"/>
|
|
||||||
<field name="qty"/>
|
|
||||||
<field name="product"/>
|
|
||||||
<field name="production_id"/>
|
|
||||||
<field name="state" />
|
<field name="state" />
|
||||||
|
<field name="production_id"/>
|
||||||
|
<field name="product"/>
|
||||||
|
<field name="qty"/>
|
||||||
|
<field name="uom"/>
|
||||||
|
<button name="button_start_working" string="Start working" states="draft,pause"/>
|
||||||
|
<button name="button_done" string="Finished" states="startworking"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -26,19 +26,19 @@
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
|
<field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="hour" position="after">
|
<field name="hour" position="after">
|
||||||
<group colspan="8" col="8">
|
<field name="production_id"/>
|
||||||
<field name="state" select="2"/>
|
<field name="delay"/>
|
||||||
<button name="button_draft" string="Set Draft" states="cancel"/>
|
<group colspan="8" col="8">
|
||||||
<button name="button_start_working" string="Start working" states="draft"/>
|
<field name="state" select="2"/>
|
||||||
<button name="button_resume" string="Resume" states="pause"/>
|
<button name="button_draft" string="Set Draft" states="cancel"/>
|
||||||
<button name="button_done" string="Finished" states="startworking"/>
|
<button name="button_start_working" string="Start working" states="draft"/>
|
||||||
<button name="button_pause" string="Pause" states="startworking"/>
|
<button name="button_resume" string="Resume" states="pause"/>
|
||||||
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
|
<button name="button_done" string="Finished" states="startworking"/>
|
||||||
</group>
|
<button name="button_pause" string="Pause" states="startworking"/>
|
||||||
<field name="delay"/>
|
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
|
||||||
<field name="production_id"/>
|
</group>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
|
@ -160,9 +160,9 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="partner_id" position="after">
|
<field name="partner_id" position="after">
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
|
|
||||||
<field name="context_id" select="2"/>
|
|
||||||
<separator string="Getting Things Done" colspan="4"/>
|
<separator string="Getting Things Done" colspan="4"/>
|
||||||
|
<field name="context_id" select="2"/>
|
||||||
|
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
|
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
|
||||||
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
|
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
|
||||||
<field domain="[('type','=','sale')]" name="pricelist_id"/>
|
<field domain="[('type','=','sale')]" name="pricelist_id"/>
|
||||||
<field name="project_id" select="2"/>
|
<field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id}"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
|
<field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
|
||||||
<form string="Sale Order Lines">
|
<form string="Sale Order Lines">
|
||||||
|
|
|
@ -135,8 +135,8 @@
|
||||||
<field name="inherit_id" ref="sale.view_order_form" />
|
<field name="inherit_id" ref="sale.view_order_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="client_order_ref" position="after">
|
<field name="client_order_ref" position="after">
|
||||||
<field name="journal_id" select="1"/>
|
|
||||||
<field name="invoice_type_id" select="1"/>
|
<field name="invoice_type_id" select="1"/>
|
||||||
|
<field name="journal_id" select="1"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -147,8 +147,8 @@
|
||||||
<field name="inherit_id" ref="sale.view_order_tree" />
|
<field name="inherit_id" ref="sale.view_order_tree" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="state" position="after">
|
<field name="state" position="after">
|
||||||
<field name="journal_id"/>
|
|
||||||
<field name="invoice_type_id"/>
|
<field name="invoice_type_id"/>
|
||||||
|
<field name="journal_id"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -160,9 +160,9 @@
|
||||||
<field name="inherit_id" ref="stock.view_picking_form" />
|
<field name="inherit_id" ref="stock.view_picking_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="origin" position="after">
|
<field name="origin" position="after">
|
||||||
<field name="invoice_type_id" select="1"/>
|
|
||||||
<field name="sale_journal_id" select="1"/>
|
|
||||||
<field name="journal_id" select="1"/>
|
<field name="journal_id" select="1"/>
|
||||||
|
<field name="sale_journal_id" select="1"/>
|
||||||
|
<field name="invoice_type_id" select="1"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -174,9 +174,9 @@
|
||||||
<field name="inherit_id" ref="stock.vpicktree" />
|
<field name="inherit_id" ref="stock.vpicktree" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="invoice_state" position="after">
|
<field name="invoice_state" position="after">
|
||||||
<field name="sale_journal_id" select="1"/>
|
|
||||||
<field name="invoice_type_id" select="1"/>
|
|
||||||
<field name="journal_id" select="1"/>
|
<field name="journal_id" select="1"/>
|
||||||
|
<field name="invoice_type_id" select="1"/>
|
||||||
|
<field name="sale_journal_id" select="1"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
<field name="inherit_id" ref="project.edit_project"/>
|
<field name="inherit_id" ref="project.edit_project"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="state" position="after">
|
<field name="state" position="after">
|
||||||
<newline/>
|
|
||||||
<field name="sprint_size"/>
|
|
||||||
<field name="product_owner_id" required="1" select="1"/>
|
|
||||||
<separator string="Scrum Data" colspan="4"/>
|
<separator string="Scrum Data" colspan="4"/>
|
||||||
|
<field name="product_owner_id" required="1" select="1"/>
|
||||||
|
<field name="sprint_size"/>
|
||||||
|
<newline/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -48,8 +48,8 @@
|
||||||
<field name="priority">26</field>
|
<field name="priority">26</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="property_account_expense" position="after">
|
<field name="property_account_expense" position="after">
|
||||||
<field name="property_stock_account_input"/>
|
|
||||||
<field name="property_stock_account_output"/>
|
<field name="property_stock_account_output"/>
|
||||||
|
<field name="property_stock_account_input"/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
Loading…
Reference in New Issue