From d1016c8728778cf59ccde810f03ebcdd2bd1ffd9 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya
Date: Mon, 10 Dec 2012 11:13:34 +0530
Subject: [PATCH 01/21] [IMP] add a class to preference_save button.
bzr revid: vba@tinyerp.com-20121210054334-8r3ohu4324aopyzu
---
openerp/addons/base/res/res_users_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index b5c88e4c24b..0ff1c9d7cba 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -257,7 +257,7 @@
From 259054160791c25f44a4ea88b444557a3fea6850 Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin
Date: Fri, 18 Jan 2013 12:33:09 +0100
Subject: [PATCH 02/21] [IMP] Document the description fields on Products, and
assume that invoices must get either the Purchase Description or the Sale
Description.
lp bug: https://launchpad.net/bugs/1101146 fixed
bzr revid: ls@numerigraphe.fr-20130118113309-vpq65omrvges1th8
---
addons/account/account_invoice.py | 7 +++++--
addons/product/product.py | 11 ++++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c9cf90789cb..cb91943b66e 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1454,8 +1454,13 @@ class account_invoice_line(osv.osv):
if type in ('out_invoice', 'out_refund'):
taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+ if res.description_sale:
+ result['name'] += '\n'+res.description_sale
else:
taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+ if res.description_purchase:
+ result['name'] += '\n'+res.description_purchase
+
tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
if type in ('in_invoice', 'in_refund'):
@@ -1465,8 +1470,6 @@ class account_invoice_line(osv.osv):
result['name'] = res.partner_ref
result['uos_id'] = uom_id or res.uom_id.id
- if res.description:
- result['name'] += '\n'+res.description
domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]}
diff --git a/addons/product/product.py b/addons/product/product.py
index 1cacb58df23..fad975d3cb3 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -296,9 +296,14 @@ class product_template(osv.osv):
_columns = {
'name': fields.char('Name', size=128, required=True, translate=True, select=True),
'product_manager': fields.many2one('res.users','Product Manager'),
- 'description': fields.text('Description',translate=True),
- 'description_purchase': fields.text('Purchase Description',translate=True),
- 'description_sale': fields.text('Sale Description',translate=True),
+ 'description': fields.text('Description',translate=True,
+ help="A precise description of the Product, used only for internal information purposes."),
+ 'description_purchase': fields.text('Purchase Description',translate=True,
+ help="A description of the Product that you want to communicate to your customers. "
+ "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
+ 'description_sale': fields.text('Sale Description',translate=True,
+ help="A description of the Product that you want to communicate to your suppliers. "
+ "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."),
'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
'rental': fields.boolean('Can be Rent'),
From 03b7ffd0b5112baec72a7cd18fe1541ff26191f9 Mon Sep 17 00:00:00 2001
From: "Ravish(OpenERP)" <>
Date: Thu, 24 Jan 2013 15:20:52 +0100
Subject: [PATCH 03/21] [FIX] borrow an additionnal fix from
lp:~openerp-dev/openobject-addons/trunk-bug-1101146-rmu
bzr revid: ls@numerigraphe.fr-20130124142052-ob4xxtzh88r1javw
---
addons/account/account_invoice.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index cb91943b66e..fd950ad19e2 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1440,6 +1440,7 @@ class account_invoice_line(osv.osv):
result = {}
res = self.pool.get('product.product').browse(cr, uid, product, context=context)
+ result['name'] = res.partner_ref
if type in ('out_invoice','out_refund'):
a = res.property_account_income.id
if not a:
@@ -1467,7 +1468,6 @@ class account_invoice_line(osv.osv):
result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
else:
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
- result['name'] = res.partner_ref
result['uos_id'] = uom_id or res.uom_id.id
From c4670af9d8d182685bb2b7538e86ca9cf9548672 Mon Sep 17 00:00:00 2001
From: "Ravish(OpenERP)" <>
Date: Thu, 24 Jan 2013 15:41:56 +0100
Subject: [PATCH 04/21] [FIX] purchase/sale description helps are inverted -
borrowed from lp:~openerp-dev/openobject-addons/trunk-bug-1101146-rmu
bzr revid: ls@numerigraphe.fr-20130124144156-sguv4wtpk5c20zea
---
addons/product/product.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/product/product.py b/addons/product/product.py
index fad975d3cb3..fbe89490036 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -299,11 +299,11 @@ class product_template(osv.osv):
'description': fields.text('Description',translate=True,
help="A precise description of the Product, used only for internal information purposes."),
'description_purchase': fields.text('Purchase Description',translate=True,
- help="A description of the Product that you want to communicate to your customers. "
- "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
- 'description_sale': fields.text('Sale Description',translate=True,
help="A description of the Product that you want to communicate to your suppliers. "
"This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."),
+ 'description_sale': fields.text('Sale Description',translate=True,
+ help="A description of the Product that you want to communicate to your customers. "
+ "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
'rental': fields.boolean('Can be Rent'),
From d0920dea504b0a9872586e72032caebbad0e991f Mon Sep 17 00:00:00 2001
From: "Ishwar Malvi (OpenERP Trainee)"
Date: Wed, 17 Apr 2013 17:01:19 +0530
Subject: [PATCH 05/21] [IMP] when create contact of a supplier it should be
supplier instead of customer.
bzr revid: nco@tinyerp.com-20130417113119-ilgy4k945h31azod
---
openerp/addons/base/res/res_partner.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 31e2d44b306..3085a5bfde5 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -378,6 +378,7 @@ class res_partner(osv.osv, format_address):
context = {}
# Update parent and siblings records
if vals.get('parent_id'):
+ is_supplier = self.browse(cr, uid, vals.get('parent_id'), context=context).supplier
if 'use_parent_address' in vals:
use_parent_address = vals['use_parent_address']
else:
@@ -395,6 +396,9 @@ class res_partner(osv.osv, format_address):
for key, value in onchange_values.iteritems()
if key in ADDRESS_FIELDS and key not in vals))
+ if is_supplier:
+ vals.update({'supplier': 1,'customer': 0})
+
return super(res_partner, self).create(cr, uid, vals, context=context)
def update_address(self, cr, uid, ids, vals, context=None):
From 33ae814ff6f91868465cafb5d07eaddacb02fe59 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Thu, 18 Apr 2013 17:18:27 +0200
Subject: [PATCH 06/21] [IMP] tools convert: allow to use relative delta in xml
file
bzr revid: chm@openerp.com-20130418151827-coda7ldtjd7hw7to
---
openerp/tools/convert.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index cdcaff35b9e..409b9810fab 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -48,6 +48,7 @@ except:
from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
from lxml import etree
import misc
from config import config
@@ -86,7 +87,9 @@ def _get_idref(self, cr, uid, model_str, context, idref):
idref2 = dict(idref,
time=time,
DateTime=datetime,
+ datetime=datetime,
timedelta=timedelta,
+ relativedelta=relativedelta,
version=openerp.release.major_version,
ref=_ref(self, cr),
pytz=pytz)
From d45ee609b4dd251b8b8182cb3ee75041639e4f1b Mon Sep 17 00:00:00 2001
From: "Ishwar Malvi (OpenERP Trainee)"
Date: Fri, 19 Apr 2013 14:12:18 +0530
Subject: [PATCH 07/21] [IMP] when create company from the supplier it should
be set supplier.
bzr revid: nco@tinyerp.com-20130419084218-e3pflb3jqq6kihfa
---
openerp/addons/base/res/res_partner_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 88a1266b689..8251f4f6dd6 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -138,7 +138,7 @@
From dd7614e71623848d84c7f89c5416dd6dc6c0023c Mon Sep 17 00:00:00 2001
From: ggh-openerp
Date: Mon, 29 Apr 2013 12:59:38 +0530
Subject: [PATCH 08/21] [IMP] Remove space before Exclamation marks [!] in
Warning
bzr revid: ggh@tinyerp.com-20130429072938-knas9ymmny5o2z0v
---
openerp/addons/base/ir/ir_actions.py | 2 +-
openerp/addons/base/ir/ir_values.py | 4 ++--
openerp/addons/base/module/wizard/base_module_import.py | 6 +++---
openerp/addons/base/module/wizard/base_module_upgrade.py | 2 +-
openerp/addons/base/res/res_lang.py | 6 +++---
openerp/addons/base/res/res_partner.py | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index a130ab13a32..aaaa8513925 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -657,7 +657,7 @@ class actions_server(osv.osv):
if action.state=='client_action':
if not action.action_id:
- raise osv.except_osv(_('Error'), _("Please specify an action to launch !"))
+ raise osv.except_osv(_('Error'), _("Please specify an action to launch!"))
return self.pool[action.action_id.type].read(cr, uid, action.action_id.id, context=context)
if action.state=='code':
diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index dd8501230ec..a21b034d1b0 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -411,8 +411,8 @@ class ir_values(osv.osv):
(tuple(groups), uid))
if not cr.fetchone():
if action['name'] == 'Menuitem':
- raise osv.except_osv('Error !',
- 'You do not have the permission to perform this operation !!!')
+ raise osv.except_osv('Error!',
+ 'You do not have the permission to perform this operation!!!')
continue
# keep only the first action registered for each action name
results[action['name']] = (action['id'], action['name'], action_def)
diff --git a/openerp/addons/base/module/wizard/base_module_import.py b/openerp/addons/base/module/wizard/base_module_import.py
index 67408b60669..61694d5f8c3 100644
--- a/openerp/addons/base/module/wizard/base_module_import.py
+++ b/openerp/addons/base/module/wizard/base_module_import.py
@@ -55,7 +55,7 @@ class base_module_import(osv.osv_memory):
try:
file_data = zipfile.ZipFile(fp, 'r')
except zipfile.BadZipfile:
- raise osv.except_osv(_('Error !'), _('File is not a zip file!'))
+ raise osv.except_osv(_('Error!'), _('File is not a zip file!'))
init_file_name = sorted(file_data.namelist())[0]
module_name = os.path.split(init_file_name)[0]
@@ -63,8 +63,8 @@ class base_module_import(osv.osv_memory):
try:
zip_file = open(file_path, 'wb')
except IOError:
- raise osv.except_osv(_('Error !'),
- _('Can not create the module file: %s !') % \
+ raise osv.except_osv(_('Error!'),
+ _('Can not create the module file: %s!') % \
(file_path,) )
zip_file.write(zip_data)
zip_file.close()
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index c081663d8ed..c75058ab835 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -81,7 +81,7 @@ class base_module_upgrade(osv.osv_memory):
(tuple(ids), ('uninstalled',)))
unmet_packages = [x[0] for x in cr.fetchall()]
if unmet_packages:
- raise osv.except_osv(_('Unmet dependency !'),
+ raise osv.except_osv(_('Unmet Dependency!'),
_('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
ir_module.download(cr, uid, ids, context=context)
diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py
index 9abab79e46c..160e86fd8d2 100644
--- a/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@ -182,11 +182,11 @@ class lang(osv.osv):
for language in languages:
ctx_lang = context.get('lang')
if language['code']=='en_US':
- raise osv.except_osv(_('User Error'), _("Base Language 'en_US' can not be deleted !"))
+ raise osv.except_osv(_('User Error'), _("Base Language 'en_US' can not be deleted!"))
if ctx_lang and (language['code']==ctx_lang):
- raise osv.except_osv(_('User Error'), _("You cannot delete the language which is User's Preferred Language !"))
+ raise osv.except_osv(_('User Error'), _("You cannot delete the language which is User's Preferred Language!"))
if language['active']:
- raise osv.except_osv(_('User Error'), _("You cannot delete the language which is Active !\nPlease de-activate the language first."))
+ raise osv.except_osv(_('User Error'), _("You cannot delete the language which is Active!\nPlease de-activate the language first."))
trans_obj = self.pool.get('ir.translation')
trans_ids = trans_obj.search(cr, uid, [('lang','=',language['code'])], context=context)
trans_obj.unlink(cr, uid, trans_ids, context=context)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 404fe5696c7..5ac5f1212f7 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -446,7 +446,7 @@ class res_partner(osv.osv, format_address):
commercial_fields = self._commercial_fields(cr, uid, context=context)
sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
commercial_fields, context=context)
- return self.write(cr, uid, partner.id, sync_vals, context=context)
+ partner.write(sync_vals)
def _commercial_sync_to_children(self, cr, uid, partner, context=None):
""" Handle sync of commercial fields to descendants """
@@ -472,7 +472,7 @@ class res_partner(osv.osv, format_address):
use_parent_address=partner.use_parent_address,
parent_id=partner.parent_id.id,
context=context).get('value', {})
- self.update_address(cr, uid, partner.id, onchange_vals, context=context)
+ partner.update_address(onchange_vals)
# 2. To DOWNSTREAM: sync children
if partner.child_ids:
@@ -575,7 +575,7 @@ class res_partner(osv.osv, format_address):
context = {}
name, email = self._parse_partner_name(name, context=context)
if context.get('force_email') and not email:
- raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !"))
+ raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address!"))
if not name and email:
name = email
rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
From 058c816a8e79dcef85528f0ab418887e03007215 Mon Sep 17 00:00:00 2001
From: ggh-openerp
Date: Mon, 29 Apr 2013 16:28:49 +0530
Subject: [PATCH 09/21] [IMP] Improved code
bzr revid: ggh@tinyerp.com-20130429105849-2peih2y8kknt65tu
---
openerp/addons/base/ir/ir_mail_server.py | 4 ++--
openerp/addons/base/ir/ir_model.py | 2 +-
openerp/addons/base/ir/workflow/workflow.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 10fc5f82187..93b213461a7 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -213,14 +213,14 @@ class ir_mail_server(osv.osv):
password=smtp_server.smtp_pass, encryption=smtp_server.smtp_encryption,
smtp_debug=smtp_server.smtp_debug)
except Exception, e:
- raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
+ raise osv.except_osv(_("Connection Test Failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
finally:
try:
if smtp: smtp.quit()
except Exception:
# ignored, just a consequence of the previous exception
pass
- raise osv.except_osv(_("Connection test succeeded!"), _("Everything seems properly set up!"))
+ raise osv.except_osv(_("Connection Test Succeeded!"), _("Everything seems properly set up!"))
def connect(self, host, port, user=None, password=None, encryption=False, smtp_debug=False):
"""Returns a new SMTP connection to the give SMTP server, authenticated
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 222d8f34c9c..165fd8a4be9 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -82,7 +82,7 @@ class ir_model(osv.osv):
return []
__, operator, value = domain[0]
if operator not in ['=', '!=']:
- raise osv.except_osv(_('Invalid search criterions'), _('The osv_memory field can only be compared with = and != operator.'))
+ raise osv.except_osv(_("Invalid Search Criteria"), _('The osv_memory field can only be compared with = and != operator.'))
value = bool(value) if operator == '=' else not bool(value)
all_model_ids = self.search(cr, uid, [], context=context)
is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context)
diff --git a/openerp/addons/base/ir/workflow/workflow.py b/openerp/addons/base/ir/workflow/workflow.py
index 0ce951940a9..a7e792072e3 100644
--- a/openerp/addons/base/ir/workflow/workflow.py
+++ b/openerp/addons/base/ir/workflow/workflow.py
@@ -94,7 +94,7 @@ class wkf_activity(osv.osv):
def unlink(self, cr, uid, ids, context=None):
if context is None: context = {}
if not context.get('_force_unlink') and self.pool.get('workflow.workitem').search(cr, uid, [('act_id', 'in', ids)]):
- raise osv.except_osv(_('Operation forbidden'),
+ raise osv.except_osv(_('Operation Forbidden'),
_('Please make sure no workitems refer to an activity before deleting it!'))
super(wkf_activity, self).unlink(cr, uid, ids, context=context)
From de13720f0e09c36c2a65d8bf16c88deee7db8c84 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Mon, 29 Apr 2013 14:24:23 +0200
Subject: [PATCH 10/21] [IMP] rng of field tag in data xml
also fix nonsensical XML files specifying @ref and @model
bzr revid: xmo@openerp.com-20130429122423-qubsy2ccwo5tb8bq
---
openerp/addons/base/ir/ir_actions.xml | 2 +-
openerp/addons/base/ir/ir_filters.xml | 2 +-
openerp/addons/base/res/res_security.xml | 4 +-
openerp/import_xml.rng | 94 ++++++++++++++++++------
4 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 82514692c06..145627058ef 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -297,7 +297,7 @@
Property multi-company
-
+
['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 72c5dad8885..88cc4b9838a 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -4,7 +4,7 @@
ir.filters.owner
-
+
[('user_id','in',[False,user.id])]
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 783243411ef..0c8c0202d60 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -16,7 +16,7 @@
company rule
-
+
[('id','child_of',[user.company_id.id])]
@@ -25,7 +25,7 @@
user rule
-
+
[('company_ids','child_of',[user.company_id.id])]
diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index 5f4c40b65d3..c055009a35d 100644
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -1,17 +1,18 @@
-
+
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -125,19 +126,66 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ char
+ file
+
+
-
-
+
+
+ int
+
+
+ None
+
+
+
+ float
+
+
+
+
+
+ list
+ tuple
+
+
+
+
+
+
+
+ html
+ xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From de4c781392fbf6a818e0f98605bb6277762c0fa2 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Mon, 29 Apr 2013 14:38:31 +0200
Subject: [PATCH 11/21] [FIX] turns out @model is optional on field when using
@search
it's required on @value though.
or on recursive @field calls, but let's just ignore that eldritch horror
bzr revid: xmo@openerp.com-20130429123831-waj3snv8pqcfda1n
---
openerp/import_xml.rng | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index c055009a35d..716a525b496 100644
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -178,7 +178,7 @@
-
+
From 7a2d912964ee6d6f4076c31bb4e4e8213846df75 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Mon, 29 Apr 2013 14:43:33 +0200
Subject: [PATCH 12/21] [REM] bunch of nonsensical @model + @ref
bzr revid: xmo@openerp.com-20130429124333-p1h11fpy04y3sljy
---
.../security/account_analytic_default_security.xml | 2 +-
.../account_followup/security/account_followup_security.xml | 2 +-
.../account_payment/security/account_payment_security.xml | 6 +++---
.../account_voucher/security/account_voucher_security.xml | 4 ++--
addons/analytic/security/analytic_security.xml | 4 ++--
addons/hr/security/hr_security.xml | 4 ++--
addons/hr_attendance/security/ir_rule.xml | 4 ++--
addons/hr_evaluation/security/hr_evaluation_security.xml | 4 ++--
addons/hr_expense/security/ir_rule.xml | 6 +++---
addons/hr_holidays/security/ir_rule.xml | 4 ++--
addons/hr_payroll/security/hr_security.xml | 4 ++--
addons/hr_recruitment/security/hr_recruitment_security.xml | 2 +-
addons/hr_timesheet/security/hr_timesheet_security.xml | 4 ++--
addons/mrp_repair/security/mrp_repair_security.xml | 2 +-
addons/note/security/ir.rule.xml | 4 ++--
15 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml
index 63c6e30eb22..cdce2a9955e 100644
--- a/addons/account_analytic_default/security/account_analytic_default_security.xml
+++ b/addons/account_analytic_default/security/account_analytic_default_security.xml
@@ -4,7 +4,7 @@
Analytic Default multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index 1586403d701..69c9a44a1b9 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -4,7 +4,7 @@
Account Follow-up multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bca00eaa6d..fbe29699e86 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -15,21 +15,21 @@
Payment Mode company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Payment order multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Payment line multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml
index 04540fd8aa0..daa5934b256 100644
--- a/addons/account_voucher/security/account_voucher_security.xml
+++ b/addons/account_voucher/security/account_voucher_security.xml
@@ -3,13 +3,13 @@
Voucher multi-company
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Voucher Line multi-company
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 70688275de2..bf103ca8988 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -4,14 +4,14 @@
Analytic multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Analytic line multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8f3697f234a..4383f2d6c74 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -25,13 +25,13 @@
Department multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Job multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index 857fc2f54ae..0bf3b73d76e 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -9,13 +9,13 @@
Manager Attendance
-
+
[(1,'=',1)]
Employee Attendance
-
+
[('employee_id.user_id','=',user.id)]
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 7c7d6f43ee3..209ca281396 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -31,14 +31,14 @@
Evaluation Plan multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
Evaluation Plan Phase multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index b9ad5778d1e..3c3cb018489 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -4,19 +4,19 @@
Manager Expense
-
+
[(1,'=',1)]
Employee Expense
-
+
[('employee_id.user_id','=',user.id)]
Expense multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index ff0270026a4..e2c0ffb1a6f 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -3,14 +3,14 @@
Employee Holidays
-
+
[('employee_id.user_id','=',user.id)]
Holidays Officer
-
+
[(1,'=',1)]
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index d55f1c81cce..e410eae7250 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -8,10 +8,10 @@
Employee Payslip
-
+
['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]
-
\ No newline at end of file
+
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index 570b0f036cd..4fccca1a791 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -4,7 +4,7 @@
Applicant multi company rule
-
+
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index d7cf34fa1fd..c5549d1ed27 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -4,14 +4,14 @@
Manager HR Analytic Timesheet
-
+
[(1,'=',1)]
Employee HR Analytic Timesheet
-
+
[('user_id', '=', user.id)]
diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml
index 0b34310fc4e..e94b675b57f 100644
--- a/addons/mrp_repair/security/mrp_repair_security.xml
+++ b/addons/mrp_repair/security/mrp_repair_security.xml
@@ -11,4 +11,4 @@
-
\ No newline at end of file
+
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index b0c79561355..2c6e9f3bc7f 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -3,7 +3,7 @@
Only followers can access a sticky notes
-
+
[('message_follower_ids','=',user.partner_id.id)]
@@ -14,7 +14,7 @@
Each user have his stage name
-
+
['|',('user_id','=',False),('user_id','=',user.id)]
From 07607f054bc8f3b427a98f479f0b3d3cb92224c1 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Mon, 29 Apr 2013 14:52:17 +0200
Subject: [PATCH 13/21] [REM] more nonsensical @model + @ref
bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6
---
.../process/customer_invoice_process.xml | 32 ++++++-------
addons/account/process/statement_process.xml | 14 +++---
.../process/supplier_invoice_process.xml | 28 +++++------
.../crm/process/crm_configuration_process.xml | 12 ++---
addons/hr/process/hr_process.xml | 10 ++--
.../hr_expense/process/hr_expense_process.xml | 26 +++++-----
.../process/hr_holidays_process.xml | 26 +++++-----
.../process/hr_timesheet_sheet_process.xml | 24 +++++-----
.../membership/process/membership_process.xml | 22 ++++-----
addons/mrp/process/procurement_process.xml | 48 +++++++++----------
.../mrp/process/service_product_process.xml | 6 +--
.../mrp/process/stockable_product_process.xml | 8 ++--
.../process/mrp_operation_process.xml | 16 +++----
addons/product/process/product_process.xml | 4 +-
addons/project/process/task_process.xml | 12 ++---
.../process/project_mrp_process.xml | 12 ++---
.../process/project_timesheet_process.xml | 12 ++---
addons/purchase/process/purchase_process.xml | 36 +++++++-------
addons/sale/process/sale_process.xml | 12 ++---
addons/sale_crm/process/sale_crm_process.xml | 16 +++----
.../sale_stock/process/sale_stock_process.xml | 20 ++++----
21 files changed, 198 insertions(+), 198 deletions(-)
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 8971235c1f7..e45f8080518 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -123,24 +123,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -148,40 +148,40 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
index c10b34c8866..1ebebec7809 100644
--- a/addons/sale_stock/process/sale_stock_process.xml
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -72,40 +72,40 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -403,8 +403,8 @@
TOEJ
situation
-
-
+
+
@@ -413,8 +413,8 @@
USD Bank Journal - (test)
TUBK
bank
-
-
+
+
SJ
- San José
-
+ San José
+
A
Alajuela
-
+
H
Heredia
-
+
C
Cartago
-
+
P
Puntarenas
-
+
G
Guanacaste
-
+
L
- Limón
-
+ Limón
+
@@ -66,13 +65,13 @@
-
-
+
+
-
-
+
+
@@ -85,9 +84,9 @@
OpenERP Partner
create_date
-
+
-
+
\ No newline at end of file
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 141981a21d6..f6eb8a1d905 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -1,11 +1,10 @@
-
Dummy Action
dummy
-
+
@@ -40,10 +39,10 @@
- Hello,
- Thanks for the genuine interest you have shown in OpenERP.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>Thanks for the genuine interest you have shown in OpenERP.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
For OpenERP OnDemand Free Trial 2010
@@ -53,11 +52,11 @@
- Hello,
- We have very good offer that might suit you.
- We suggest you subscribe to the OpenERP Discovery Day on May 2010.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>We have very good offer that might suit you.
+ We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
For OpenERP Discovery Day on May 2010
@@ -68,10 +67,10 @@
- Hello,
- Thanks for showing interest and for subscribing to the OpenERP Discovery Day.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
For OpenERP Discovery Day
@@ -82,10 +81,10 @@
- Hello,
- Thanks for showing interest and buying the OpenERP book.
+ <p>Hello,</p>
+ <p>Thanks for showing interest and buying the OpenERP book.</p>
If any further information required kindly revert back.
- Regards,OpenERP Team,
]]>
+ <p>Regards,OpenERP Team,</p>
For OpenERP book
@@ -95,11 +94,11 @@
- Hello,
- We have very good offer that might suit you.
- For our gold partners,We are arranging free technical training on june,2010.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>We have very good offer that might suit you.
+ For our gold partners,We are arranging free technical training on june,2010.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
technical training to gold partners
@@ -110,11 +109,11 @@
- Hello,
- We have very good offer that might suit you.
- For our silver partners,We are paid technical training on june,2010.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>We have very good offer that might suit you.
+ For our silver partners,We are paid technical training on june,2010.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
training to silver partners
@@ -125,11 +124,11 @@
- Hello,
- We have very good offer that might suit you.
- For our silver partners, we are offering Gold partnership.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>We have very good offer that might suit you.
+ For our silver partners, we are offering Gold partnership.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
gold partnership to silver partners
@@ -140,11 +139,11 @@
- Hello,
- Thanks for showing interest and for subscribing to technical training.
- If any further information required kindly revert back.I really appreciate your co-operation on this.
- If any further information is required, do not hesitate to reply to this message.
- Regards,OpenERP Team,
]]>
+ <p>Hello,</p>
+ <p>Thanks for showing interest and for subscribing to technical training.</p>
+ If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
+ <p>If any further information is required, do not hesitate to reply to this message.</p>
+ <p>Regards,OpenERP Team,</p>
subscribing to technical training
@@ -171,7 +170,7 @@
Propose a 1 month free trial for an OnDemand offer
-
+
report
@@ -180,27 +179,27 @@
Thanks for showing interest
-
+
Propose to subscribe to the OpenERP Discovery Day on May 2010
-
+
Thanks for subscribing to the OpenERP Discovery Day
-
+
Propose to buy the OpenERP Book
-
+
report
@@ -209,81 +208,81 @@
Thanks for buying the OpenERP book
-
+
Propose a free technical training to Gold partners
-
+
Propose paid training to Silver partners
-
+
Propose gold partnership to silver partners
-
+
Thanks for subscribing to technical training
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -296,4 +295,4 @@
-
+
\ No newline at end of file
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml
index 31c48046d64..67d610c65c9 100644
--- a/addons/procurement/stock_orderpoint.xml
+++ b/addons/procurement/stock_orderpoint.xml
@@ -1,4 +1,3 @@
-
@@ -7,50 +6,50 @@
25.0
5.0
-
+
-
+
10.0
5.0
-
+
-
+
12.0
5.0
-
+
-
+
50.0
10.0
-
+
-
+
15.0
5.0
-
+
-
+
5.0
3.0
-
+
-
+
-
+
\ No newline at end of file
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 11936db0bed..68a6cd12733 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -57,7 +57,7 @@
invoice
subflow
-
+
action_invoice_create()
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 6578a961ff3..d9a220daef6 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -1,4 +1,3 @@
-
@@ -73,7 +72,7 @@
-
+
@@ -89,4 +88,4 @@
-
+
\ No newline at end of file
From 7542d8885d5ab01d7447448c707618e1f97d0928 Mon Sep 17 00:00:00 2001
From: "Dharmraj Zala (OpenERP Trainee)"
Date: Thu, 9 May 2013 17:06:15 +0530
Subject: [PATCH 16/21] [FIX] set ondelete restrict on state and country.
bzr revid: nco@tinyerp.com-20130509113615-u2xedxu5ihn9lqh9
---
openerp/addons/base/res/res_partner.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 404fe5696c7..d50f38a77ee 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -259,8 +259,8 @@ class res_partner(osv.osv, format_address):
'street2': fields.char('Street2', size=128),
'zip': fields.char('Zip', change_default=True, size=24),
'city': fields.char('City', size=128),
- 'state_id': fields.many2one("res.country.state", 'State'),
- 'country_id': fields.many2one('res.country', 'Country'),
+ 'state_id': fields.many2one("res.country.state", 'State', ondelete='restrict'),
+ 'country_id': fields.many2one('res.country', 'Country', ondelete='restrict'),
'country': fields.related('country_id', type='many2one', relation='res.country', string='Country',
deprecated="This field will be removed as of OpenERP 7.1, use country_id instead"),
'email': fields.char('Email', size=240),
@@ -446,7 +446,7 @@ class res_partner(osv.osv, format_address):
commercial_fields = self._commercial_fields(cr, uid, context=context)
sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
commercial_fields, context=context)
- return self.write(cr, uid, partner.id, sync_vals, context=context)
+ partner.write(sync_vals)
def _commercial_sync_to_children(self, cr, uid, partner, context=None):
""" Handle sync of commercial fields to descendants """
@@ -472,7 +472,7 @@ class res_partner(osv.osv, format_address):
use_parent_address=partner.use_parent_address,
parent_id=partner.parent_id.id,
context=context).get('value', {})
- self.update_address(cr, uid, partner.id, onchange_vals, context=context)
+ partner.update_address(onchange_vals)
# 2. To DOWNSTREAM: sync children
if partner.child_ids:
From d0236bd31e0c7773d68dc3f365c2c82c0e1dbc7a Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)"
Date: Wed, 15 May 2013 13:21:40 +0530
Subject: [PATCH 17/21] [FIX] set defalut customer and add field customer to
store value of customer.
bzr revid: nco@tinyerp.com-20130515075140-dql9dhnygtgi7319
---
openerp/addons/base/res/res_partner_view.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5b9d21045aa..1d196cda0ed 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -186,7 +186,7 @@
-
+
@@ -286,6 +286,7 @@
+
From b2c84a83109a0260631e2e836cbfd39d4a08c5df Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)"
Date: Thu, 23 May 2013 10:54:03 +0530
Subject: [PATCH 18/21] [IMP] when create company form supplier it should be
supplier by default, same for the customer and when both the company should
be both customer and supplier.
bzr revid: nco@tinyerp.com-20130523052403-lk8e1ghfglwtavg5
---
openerp/addons/base/res/res_partner_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 0ed26a5353a..32cb4e83e25 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -138,7 +138,7 @@
From dcf8b5e830152f4d92842f2371dad1b514b157a0 Mon Sep 17 00:00:00 2001
From: "Sejal Bhut (OpenERP Trainee)"
Date: Mon, 3 Jun 2013 14:56:30 +0530
Subject: [PATCH 19/21] [FIX] Database Backup Problem
lp bug: https://launchpad.net/bugs/1100721 fixed
bzr revid: sejalpatel125@gmail.com-20130603092630-3rh4bewi3kihmub7
---
openerp/service/db.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/openerp/service/db.py b/openerp/service/db.py
index a480b65440a..4901ceef4d6 100644
--- a/openerp/service/db.py
+++ b/openerp/service/db.py
@@ -197,7 +197,7 @@ def exp_drop(db_name):
return True
@contextlib.contextmanager
-def _set_pg_password_in_environment(self):
+def _set_pg_password_in_environment():
""" On systems where pg_restore/pg_dump require an explicit
password (i.e. when not connecting via unix sockets, and most
importantly on Windows), it is necessary to pass the PG user
@@ -213,10 +213,10 @@ def _set_pg_password_in_environment(self):
SaaS (giving SaaS users the super-admin password is not a good idea
anyway)
"""
- if os.environ.get('PGPASSWORD') or not tools.config['db_password']:
+ if os.environ.get('PGPASSWORD') or not openerp.tools.config['db_password']:
yield
else:
- os.environ['PGPASSWORD'] = tools.config['db_password']
+ os.environ['PGPASSWORD'] = openerp.tools.config['db_password']
try:
yield
finally:
From a75706ea81d82ba6893a4cb82aa2a1b82c91acb7 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu
Date: Mon, 3 Jun 2013 13:54:36 +0200
Subject: [PATCH 20/21] [IMP] module_data.xml: added Survey category (should
replace Extra Tools soon).
bzr revid: vmt@openerp.com-20130603115436-35z1rfvxtgdggryn
---
openerp/addons/base/module/module_data.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 247c2caa145..f59de0af973 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -84,6 +84,12 @@
11
+
+ Survey
+ Lets you create, send, share and answer to surveys.
+ 11
+
+
Marketing
Helps you manage your marketing campaigns step by step.
@@ -132,11 +138,11 @@
-
+
-
+
From d86f6f24c00812d73904e5e321365d127a421858 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Mon, 3 Jun 2013 17:41:58 +0200
Subject: [PATCH 21/21] [IMP] suppress button oe_demo_play
bzr revid: chm@openerp.com-20130603154158-7k9tvdwmn6ukp5x3
---
addons/account/html/index.html | 1 -
addons/account_voucher/html/index.html | 1 -
addons/crm/html/index.html | 1 -
addons/hr/html/index.html | 1 -
addons/mail/html/index.html | 1 -
addons/mrp/html/index.html | 1 -
addons/note/html/index.html | 1 -
addons/point_of_sale/html/index.html | 1 -
addons/project/html/index.html | 1 -
addons/purchase/html/index.html | 1 -
addons/sale/html/index.html | 1 -
addons/stock/html/index.html | 1 -
12 files changed, 12 deletions(-)
diff --git a/addons/account/html/index.html b/addons/account/html/index.html
index 9a32fb015aa..09a58fb3246 100644
--- a/addons/account/html/index.html
+++ b/addons/account/html/index.html
@@ -7,7 +7,6 @@
-
diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html
index 84e90f63679..d59c110dde5 100644
--- a/addons/account_voucher/html/index.html
+++ b/addons/account_voucher/html/index.html
@@ -7,7 +7,6 @@
-
diff --git a/addons/crm/html/index.html b/addons/crm/html/index.html
index 355fdb0be36..5ae542f5c91 100644
--- a/addons/crm/html/index.html
+++ b/addons/crm/html/index.html
@@ -9,7 +9,6 @@
-
diff --git a/addons/hr/html/index.html b/addons/hr/html/index.html
index acfa5041a9d..0bc3db084a4 100644
--- a/addons/hr/html/index.html
+++ b/addons/hr/html/index.html
@@ -7,7 +7,6 @@
-
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html
index ad7f9daf1a9..b564cf3ab1e 100644
--- a/addons/mail/html/index.html
+++ b/addons/mail/html/index.html
@@ -9,7 +9,6 @@
-
diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html
index d3e7a048490..5777eb5f147 100644
--- a/addons/mrp/html/index.html
+++ b/addons/mrp/html/index.html
@@ -9,7 +9,6 @@
-
diff --git a/addons/note/html/index.html b/addons/note/html/index.html
index 4e7db34df58..7ef37c646e9 100644
--- a/addons/note/html/index.html
+++ b/addons/note/html/index.html
@@ -7,7 +7,6 @@
-
diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/html/index.html
index 41f935d8ad9..130806ddb11 100644
--- a/addons/point_of_sale/html/index.html
+++ b/addons/point_of_sale/html/index.html
@@ -9,7 +9,6 @@
-
diff --git a/addons/project/html/index.html b/addons/project/html/index.html
index c1b6c3b966f..93f1be8a41d 100644
--- a/addons/project/html/index.html
+++ b/addons/project/html/index.html
@@ -7,7 +7,6 @@
-
diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html
index 9134c1ab9d2..67b122ac557 100644
--- a/addons/purchase/html/index.html
+++ b/addons/purchase/html/index.html
@@ -9,7 +9,6 @@
-
diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html
index be0d9ac0f94..1eb6215db2f 100644
--- a/addons/sale/html/index.html
+++ b/addons/sale/html/index.html
@@ -7,7 +7,6 @@
-
diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html
index 21d2800e0dc..aac71e529ae 100644
--- a/addons/stock/html/index.html
+++ b/addons/stock/html/index.html
@@ -9,7 +9,6 @@
-