[MERGE] forward port of branch 7.0 up to 0b7db55
This commit is contained in:
commit
f92b2f8d4d
|
@ -12,6 +12,7 @@ access_product_pricelist_type_user,product.pricelist.type.user,model_product_pri
|
||||||
access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0
|
access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0
|
||||||
access_product_pricelist_version_user,product.pricelist.version.user,model_product_pricelist_version,base.group_user,1,0,0,0
|
access_product_pricelist_version_user,product.pricelist.version.user,model_product_pricelist_version,base.group_user,1,0,0,0
|
||||||
access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0
|
access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0
|
||||||
|
access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1
|
||||||
access_product_pricelist_type_partner_manager,product.pricelist.type partner manager,model_product_pricelist_type,base.group_partner_manager,1,0,0,0
|
access_product_pricelist_type_partner_manager,product.pricelist.type partner manager,model_product_pricelist_type,base.group_partner_manager,1,0,0,0
|
||||||
access_product_pricelist_partner_manager,product.pricelist partner manager,model_product_pricelist,base.group_partner_manager,1,0,0,0
|
access_product_pricelist_partner_manager,product.pricelist partner manager,model_product_pricelist,base.group_partner_manager,1,0,0,0
|
||||||
access_product_product_employee,product.product employee,model_product_product,base.group_user,1,0,0,0
|
access_product_product_employee,product.product employee,model_product_product,base.group_user,1,0,0,0
|
||||||
|
|
|
|
@ -490,7 +490,7 @@ class share_wizard(osv.TransientModel):
|
||||||
# already granted
|
# already granted
|
||||||
for dummy, model in fields_relations:
|
for dummy, model in fields_relations:
|
||||||
# mail.message is transversal: it should not received directly the access rights
|
# mail.message is transversal: it should not received directly the access rights
|
||||||
if model.model in ['mail.message']: continue
|
if model.model in ['mail.message', 'mail.notification']: continue
|
||||||
values = {
|
values = {
|
||||||
'name': _('Copied access for sharing'),
|
'name': _('Copied access for sharing'),
|
||||||
'group_id': group_id,
|
'group_id': group_id,
|
||||||
|
@ -622,7 +622,7 @@ class share_wizard(osv.TransientModel):
|
||||||
if domain:
|
if domain:
|
||||||
for rel_field, model in fields_relations:
|
for rel_field, model in fields_relations:
|
||||||
# mail.message is transversal: it should not received directly the access rights
|
# mail.message is transversal: it should not received directly the access rights
|
||||||
if model.model in ['mail.message']: continue
|
if model.model in ['mail.message', 'mail.notification']: continue
|
||||||
related_domain = []
|
related_domain = []
|
||||||
if not rel_field: continue
|
if not rel_field: continue
|
||||||
for element in domain:
|
for element in domain:
|
||||||
|
@ -896,8 +896,8 @@ class share_result_line(osv.osv_memory):
|
||||||
for this in self.browse(cr, uid, ids, context=context):
|
for this in self.browse(cr, uid, ids, context=context):
|
||||||
data = dict(dbname=cr.dbname, login=this.login, password=this.password)
|
data = dict(dbname=cr.dbname, login=this.login, password=this.password)
|
||||||
if this.share_wizard_id and this.share_wizard_id.action_id:
|
if this.share_wizard_id and this.share_wizard_id.action_id:
|
||||||
data['action_id'] = this.share_wizard_id.action_id.id
|
data['action'] = this.share_wizard_id.action_id.id
|
||||||
ctx = dict(context, share_url_template_hash_arguments=['action_id'])
|
ctx = dict(context, share_url_template_hash_arguments=['action'])
|
||||||
result[this.id] = this.share_wizard_id.share_url_template(context=ctx) % data
|
result[this.id] = this.share_wizard_id.share_url_template(context=ctx) % data
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,6 @@ access_account_invoice_line_user,account.invoice.line stock user,account.model_a
|
||||||
access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
|
access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
|
||||||
access_account_journal_user,account.journal stock user,account.model_account_journal,stock.group_stock_user,1,0,0,0
|
access_account_journal_user,account.journal stock user,account.model_account_journal,stock.group_stock_user,1,0,0,0
|
||||||
access_account_fiscalyear,account.fiscalyear stock user,account.model_account_fiscalyear,stock.group_stock_user,1,0,0,0
|
access_account_fiscalyear,account.fiscalyear stock user,account.model_account_fiscalyear,stock.group_stock_user,1,0,0,0
|
||||||
access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1
|
|
||||||
access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1
|
access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1
|
||||||
access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1
|
access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1
|
||||||
access_product_ul_stock_manager,product.ul stock_manager,product.model_product_ul,stock.group_stock_manager,1,1,1,1
|
access_product_ul_stock_manager,product.ul stock_manager,product.model_product_ul,stock.group_stock_manager,1,1,1,1
|
||||||
|
|
|
|
@ -878,7 +878,13 @@ class stock_picking(osv.osv):
|
||||||
This method is called at the end of the workflow by the activity "done".
|
This method is called at the end of the workflow by the activity "done".
|
||||||
@return: True
|
@return: True
|
||||||
"""
|
"""
|
||||||
self.write(cr, uid, ids, {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
|
for picking in self.browse(cr, uid, ids, context=context):
|
||||||
|
values = {
|
||||||
|
'state': 'done'
|
||||||
|
}
|
||||||
|
if not picking.date_done:
|
||||||
|
values['date_done'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
|
||||||
|
picking.write(values)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def action_move(self, cr, uid, ids, context=None):
|
def action_move(self, cr, uid, ids, context=None):
|
||||||
|
|
|
@ -196,7 +196,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
|
||||||
+ ' ' + normalize_format(l10n.time_format));
|
+ ' ' + normalize_format(l10n.time_format));
|
||||||
case 'date':
|
case 'date':
|
||||||
if (typeof(value) == "string")
|
if (typeof(value) == "string")
|
||||||
value = instance.web.str_to_date(value.substring(0,10));
|
value = instance.web.auto_str_to_date(value);
|
||||||
return value.toString(normalize_format(l10n.date_format));
|
return value.toString(normalize_format(l10n.date_format));
|
||||||
case 'time':
|
case 'time':
|
||||||
if (typeof(value) == "string")
|
if (typeof(value) == "string")
|
||||||
|
|
Loading…
Reference in New Issue