[IMP] merge addons23
bzr revid: fp@openerp.com-20121130100516-r0gspmovo8ebdqi0
This commit is contained in:
commit
33048d7c79
|
@ -22,8 +22,11 @@
|
|||
{
|
||||
'name': 'Reset Password',
|
||||
'description': """
|
||||
Reset Password
|
||||
==============
|
||||
|
||||
Allow users to reset their password from the login page.
|
||||
========================================================
|
||||
Allow administrator to click a button to send a "Reset Password" request to a user.
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'version': '1.0',
|
||||
|
|
|
@ -272,6 +272,10 @@ class crm_lead(base_stage, format_address, osv.osv):
|
|||
'color': 0,
|
||||
}
|
||||
|
||||
_sql_constraints = [
|
||||
('check_probability', 'check(probability >= 0 and probability <= 100)', 'The probability of closing the deal should be between 0% and 100%!')
|
||||
]
|
||||
|
||||
def create(self, cr, uid, vals, context=None):
|
||||
obj_id = super(crm_lead, self).create(cr, uid, vals, context)
|
||||
section_id = self.browse(cr, uid, obj_id, context=context).section_id
|
||||
|
|
|
@ -264,9 +264,9 @@
|
|||
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
|
||||
<field name="name">stock.picking_withweight.internal.move.form.view</field>
|
||||
<field name="model">stock.move</field>
|
||||
<field name="inherit_id" ref="stock.view_move_picking_tree"/>
|
||||
<field name="inherit_id" ref="stock.view_move_picking_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='product_uom']" position="after">
|
||||
<xpath expr="//field[@name='date_expected']" position="after">
|
||||
<field name="weight"/>
|
||||
<field name="weight_net" groups="base.group_no_one"/>
|
||||
</xpath>
|
||||
|
|
|
@ -53,7 +53,7 @@ access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.
|
|||
access_mrp_production_product_line_manager,mrp.production.product.line manager,model_mrp_production_product_line,mrp.group_mrp_manager,1,0,0,0
|
||||
access_account_sequence_fiscalyear_system,account.sequence.fiscalyear.system,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
|
||||
access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
|
||||
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_manager,1,0,0,0
|
||||
access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0
|
||||
access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0
|
||||
access_report_mrp_inout_user,report.mrp.inout user,model_report_mrp_inout,mrp.group_mrp_user,1,0,0,0
|
||||
access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0
|
||||
|
|
|
|
@ -538,7 +538,7 @@ def Project():
|
|||
# Prevent double project creation when 'use_tasks' is checked!
|
||||
context = dict(context, project_creation_in_progress=True)
|
||||
mail_alias = self.pool.get('mail.alias')
|
||||
if not vals.get('alias_id'):
|
||||
if not vals.get('alias_id') and vals.get('name', False):
|
||||
vals.pop('alias_name', None) # prevent errors during copy()
|
||||
alias_id = mail_alias.create_unique_alias(cr, uid,
|
||||
# Using '+' allows using subaddressing for those who don't
|
||||
|
|
|
@ -98,7 +98,8 @@
|
|||
sequence="5" groups="base.group_hr_attendance" />
|
||||
|
||||
<menuitem id="menu_project_billing" name="Invoicing"
|
||||
parent="base.menu_main_pm" sequence="5"/>
|
||||
parent="base.menu_main_pm" sequence="5"
|
||||
groups="project.group_project_manager"/>
|
||||
<menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
|
||||
parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
|
||||
|
||||
|
|
|
@ -1845,7 +1845,7 @@ class stock_move(osv.osv):
|
|||
if move.state == 'done':
|
||||
if frozen_fields.intersection(vals):
|
||||
raise osv.except_osv(_('Operation forbidden !'),
|
||||
_('Quantities, Unit of Measures, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
|
||||
_('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
|
||||
return super(stock_move, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
|
|
|
@ -1151,7 +1151,7 @@
|
|||
<field name="date" groups="base.group_no_one"/>
|
||||
<field name="date_expected"/>
|
||||
<field name="state"/>
|
||||
<button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
|
||||
<button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward" help="Done"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -1458,7 +1458,7 @@
|
|||
states="assigned" class="oe_highlight"/>
|
||||
<button name="action_done" states="draft,assigned,confirmed"
|
||||
icon="gtk-go-forward" type="object"
|
||||
class="oe_highlight"/>
|
||||
class="oe_highlight" help="Done"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue