bugfix_lp_335179
bzr revid: fp@tinyerp.com-20090227061520-qtjps532ribbexjy
This commit is contained in:
Fabien Pinckaers
+994
-726
File diff suppressed because it is too large
Load Diff
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Codi"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr "Utilitzat com el missatge entre client que ordena l'actual companyia. Descriu 'Què vol dir-li al receptor referent a aquesta ordre?'"
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Kurzbezeichnung"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr "Verwendungszweck"
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Código"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr "Utilizado como el mensaje entre cliente que ordena y la actual compañía. Describe '¿Qué quiere decirle al receptor sobre esta orden?'"
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Code"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Codice"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Code"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr "Wordt gebruikt als het bericht tussen de klant en het bedrijf. Zoiets als 'Wat wilt u zeggen tegen de ontvanger van deze order'"
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Código"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -419,7 +419,7 @@ msgstr "Код"
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -418,7 +418,7 @@ msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
#: help:payment.line,communication:0
|
||||
msgid "Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"
|
||||
msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order?'"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_payment
|
||||
|
||||
@@ -372,7 +372,7 @@ class payment_line(osv.osv):
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Your Reference', size=64, required=True),
|
||||
'communication': fields.char('Communication', size=64, required=True,help="Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"),
|
||||
'communication': fields.char('Communication', size=64, required=True,help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"),
|
||||
'communication2': fields.char('Communication 2', size=64,help='The successor message of Communication.'),
|
||||
'move_line_id': fields.many2one('account.move.line','Entry line', domain=[('reconcile_id','=', False), ('account_id.type', '=','payable')],help='This Entry Line will be referred for the information of the ordering customer.'),
|
||||
'amount_currency': fields.float('Amount in Partner Currency', digits=(16,2),
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
|
||||
<report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
|
||||
|
||||
<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet"/>
|
||||
<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
|
||||
<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/><menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"/>
|
||||
|
||||
<wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print my timesheet"/>
|
||||
<wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
|
||||
<menuitem action="wizard_hr_timesheet_my" id="menu_wizard_hr_timesheet_my" parent="hr_timesheet.next_id_48" type="wizard"/>
|
||||
|
||||
<report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
|
||||
<report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
|
||||
|
||||
<wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees timesheet"/>
|
||||
<wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
|
||||
<menuitem action="wizard_hr_timesheet_users" id="menu_wizard_hr_timesheet_users" parent="hr_timesheet.next_id_48" type="wizard"/>
|
||||
|
||||
</data>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
menu="False"
|
||||
model="account.analytic.line"
|
||||
name="account.analytic.profit"
|
||||
string="Timesheet profit"
|
||||
string="Timesheet Profit"
|
||||
groups="account.group_account_manager"/>
|
||||
|
||||
<menuitem action="account_analytic_profit" id="print_account_analytic_profit" parent="hr.menu_hr_reporting" type="wizard"/>
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
import wizard
|
||||
import datetime
|
||||
import pooler
|
||||
|
||||
form='''<?xml version="1.0"?>
|
||||
<form string="Choose">
|
||||
@@ -34,8 +35,26 @@ form='''<?xml version="1.0"?>
|
||||
class wizard_report(wizard.interface):
|
||||
def _date_from(*a):
|
||||
return datetime.datetime.today().strftime('%Y-%m-1')
|
||||
|
||||
def _date_to(*a):
|
||||
return datetime.datetime.today().strftime('%Y-%m-%d')
|
||||
|
||||
def _check(self, cr, uid, data, context):
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
line_obj = pool.get('account.analytic.line')
|
||||
product_obj = pool.get('product.product')
|
||||
price_obj = pool.get('product.pricelist')
|
||||
ids = line_obj.search(cr, uid, [
|
||||
('date', '>=', data['form']['date_from']),
|
||||
('date', '<=', data['form']['date_to']),
|
||||
('journal_id', 'in', data['form']['journal_ids'][0][2]),
|
||||
('user_id', 'in', data['form']['employee_ids'][0][2]),
|
||||
])
|
||||
if not ids:
|
||||
raise wizard.except_wizard(_('Data Insufficient!'), _('No Records Found for Report!'))
|
||||
|
||||
return data['form']
|
||||
|
||||
|
||||
fields={
|
||||
'date_from':{
|
||||
@@ -70,7 +89,7 @@ class wizard_report(wizard.interface):
|
||||
'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('report', 'Print')]}
|
||||
},
|
||||
'report':{
|
||||
'actions':[],
|
||||
'actions':[_check],
|
||||
'result':{'type':'print', 'report':'account.analytic.profit', 'state':'end'}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ class invoice_create(wizard.interface):
|
||||
" AND id IN (%s)"
|
||||
" AND product_id=%%s"
|
||||
" AND to_invoice=%%s" % ','.join(['%s']*len(data['ids'])),
|
||||
(account.id, data['ids'], product_id, factor_id))
|
||||
tuple([account.id]+ data['ids']+[ product_id, factor_id]))
|
||||
line_ids = cr.dictfetchall()
|
||||
note = []
|
||||
for line in line_ids:
|
||||
|
||||
@@ -1172,6 +1172,13 @@ class stock_warehouse_orderpoint(osv.osv):
|
||||
v = {'product_uom':prod.uom_id.id}
|
||||
return {'value': v}
|
||||
return {}
|
||||
def copy(self, cr, uid, id, default=None,context={}):
|
||||
if not default:
|
||||
default = {}
|
||||
default.update({
|
||||
'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
|
||||
})
|
||||
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
|
||||
stock_warehouse_orderpoint()
|
||||
|
||||
|
||||
|
||||
@@ -271,7 +271,7 @@ class task(osv.osv):
|
||||
'history': fields.function(_history_get, method=True, string="Task Details", type="text"),
|
||||
'notes': fields.text('Notes'),
|
||||
|
||||
'planned_hours': fields.float('Planned Hours', readonly=True, states={'draft':[('readonly',False)]}, required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
|
||||
'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
|
||||
'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', store=True, help="Computed using the sum of the task work done."),
|
||||
'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
|
||||
'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."),
|
||||
@@ -280,7 +280,7 @@ class task(osv.osv):
|
||||
|
||||
'user_id': fields.many2one('res.users', 'Assigned to'),
|
||||
'partner_id': fields.many2one('res.partner', 'Partner'),
|
||||
'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done', readonly=False, states={'draft':[('readonly',True)]}),
|
||||
'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
|
||||
}
|
||||
_defaults = {
|
||||
'user_id': lambda obj,cr,uid,context: uid,
|
||||
|
||||
@@ -243,11 +243,11 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Task edition">
|
||||
<group colspan="6" col="6">
|
||||
<field name="name" select="1"/>
|
||||
<field name="project_id" required="1" select="1"/>
|
||||
<field name="total_hours" widget="float_time"/>
|
||||
<field name="user_id" select="1"/>
|
||||
<field name="date_deadline" select="2"/>
|
||||
<field name="name" select="1" attrs="{'readonly':[('state','=','done')]}" />
|
||||
<field name="project_id" required="1" select="1" attrs="{'readonly':[('state','=','done')]}" />
|
||||
<field name="total_hours" widget="float_time" attrs="{'readonly':[('state','=','done')]}" />
|
||||
<field name="user_id" select="1" attrs="{'readonly':[('state','=','done')]}" />
|
||||
<field name="date_deadline" select="2" attrs="{'readonly':[('state','=','done')]}" />
|
||||
<field name="progress" widget="progressbar"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
@@ -256,6 +256,7 @@
|
||||
<field
|
||||
name="planned_hours"
|
||||
widget="float_time"
|
||||
attrs="{'readonly':[('state','!=','draft')]}"
|
||||
on_change="onchange_planned(planned_hours,effective_hours)"/>
|
||||
<field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
|
||||
<button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending"/>
|
||||
@@ -265,8 +266,15 @@
|
||||
<field name="effective_hours" widget="float_time"/>
|
||||
</group>
|
||||
|
||||
<field colspan="4" name="description" nolabel="1" select="2"/>
|
||||
<field colspan="4" name="work_ids" nolabel="1"/>
|
||||
<field colspan="4" name="description" nolabel="1" select="2" attrs="{'readonly':[('state','=','done')]}" />
|
||||
<field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
|
||||
<tree string="Task Work" editable="top">
|
||||
<field name="date" />
|
||||
<field name="user_id" />
|
||||
<field name="hours" widget="float_time" />
|
||||
<field name="name" />
|
||||
</tree>
|
||||
</field>
|
||||
<newline/>
|
||||
<group col="11" colspan="4">
|
||||
<field name="state" select="1"/>
|
||||
@@ -282,7 +290,7 @@
|
||||
</page>
|
||||
<page groups="base.group_extended" string="Delegations">
|
||||
<field colspan="4" name="history" nolabel="1"/>
|
||||
<field colspan="4" height="150" name="child_ids" nolabel="1">
|
||||
<field colspan="4" height="150" name="child_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
|
||||
<tree string="Delegated tasks">
|
||||
<field name="name"/>
|
||||
<field name="user_id"/>
|
||||
@@ -294,7 +302,7 @@
|
||||
</field>
|
||||
<field colspan="4" name="parent_id"/>
|
||||
</page>
|
||||
<page groups="base.group_extended" string="Extra Info">
|
||||
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','in',['draft','done'])]}">
|
||||
<separator string="Planning" colspan="2"/>
|
||||
<separator string="Dates" colspan="2"/>
|
||||
<field name="priority"/>
|
||||
|
||||
@@ -444,7 +444,7 @@ class stock_picking(osv.osv):
|
||||
if default is None:
|
||||
default = {}
|
||||
default = default.copy()
|
||||
default['name'] = False
|
||||
default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
|
||||
return super(stock_picking, self).copy(cr, uid, id, default, context)
|
||||
|
||||
def onchange_partner_in(self, cr, uid, context, partner_id=None):
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
<field name="padding">7</field>
|
||||
<field name="number_next">1</field>
|
||||
<field name="number_increment">1</field>
|
||||
<field eval="False" name="active"/>
|
||||
</record>
|
||||
|
||||
<record id="sequence_type_tracking" model="ir.sequence.type">
|
||||
|
||||
Reference in New Issue
Block a user