From 820135d8acb5cdea5f26bb96a909d8d57115e54f Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Thu, 9 Jun 2011 14:50:59 +0530 Subject: [PATCH 001/169] remove_address_id bzr revid: rmu@tinyerp.com-20110609092059-tf6tn6e40xk3lbnj --- openerp/addons/base/base_update.xml | 6 ++-- openerp/addons/base/res/res_user.py | 50 ++++++++++++++--------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index 7432018fd94..220e9628c4e 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -119,7 +119,7 @@ context="{'user_preference': 0}" groups="base.group_multi_company" /> - + @@ -175,7 +175,7 @@ - + @@ -255,7 +255,7 @@ - + diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index 2ef2bb8d4d0..ca492c3fe96 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -136,7 +136,7 @@ class users(osv.osv): _('"email_from" needs to be set to send welcome mails ' 'to users')) return False - if not user.get('email'): + if not user.get('user_email'): return False return tools.email_send(email_from=None, email_to=[user['email']], @@ -175,24 +175,24 @@ class users(osv.osv): extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users'] return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids])) - def _email_get(self, cr, uid, ids, name, arg, context=None): - # perform this as superuser because the current user is allowed to read users, and that includes - # the email, even without any direct read access on the res_partner_address object. - return dict([(user.id, user.address_id.email) for user in self.browse(cr, 1, ids)]) # no context to avoid potential security issues as superuser - - def _email_set(self, cr, uid, ids, name, value, arg, context=None): - if not isinstance(ids,list): - ids = [ids] - address_obj = self.pool.get('res.partner.address') - for user in self.browse(cr, uid, ids, context=context): - # perform this as superuser because the current user is allowed to write to the user, and that includes - # the email even without any direct write access on the res_partner_address object. - if user.address_id: - address_obj.write(cr, 1, user.address_id.id, {'email': value or None}) # no context to avoid potential security issues as superuser - else: - address_id = address_obj.create(cr, 1, {'name': user.name, 'email': value or None}) # no context to avoid potential security issues as superuser - self.write(cr, uid, ids, {'address_id': address_id}, context) - return True +# def _email_get(self, cr, uid, ids, name, arg, context=None): +# # perform this as superuser because the current user is allowed to read users, and that includes +# # the email, even without any direct read access on the res_partner_address object. +# return dict([(user.id, user.address_id.email) for user in self.browse(cr, 1, ids)]) # no context to avoid potential security issues as superuser +# +# def _email_set(self, cr, uid, ids, name, value, arg, context=None): +# if not isinstance(ids,list): +# ids = [ids] +# address_obj = self.pool.get('res.partner.address') +# for user in self.browse(cr, uid, ids, context=context): +# # perform this as superuser because the current user is allowed to write to the user, and that includes +# # the email even without any direct write access on the res_partner_address object. +# if user.address_id: +# address_obj.write(cr, 1, user.address_id.id, {'email': value or None}) # no context to avoid potential security issues as superuser +# else: +# address_id = address_obj.create(cr, 1, {'name': user.name, 'email': value or None}) # no context to avoid potential security issues as superuser +# self.write(cr, uid, ids, {'address_id': address_id}, context) +# return True def _set_new_password(self, cr, uid, id, name, value, args, context=None): if value is False: @@ -217,13 +217,13 @@ class users(osv.osv): fnct_inv=_set_new_password, string='Change password', help="Only specify a value if you want to change the user password. " "This user will have to logout and login again!"), - 'email': fields.char('E-mail', size=64, + 'user_email': fields.char('E-mail', size=64, help='If an email is provided, the user will be sent a message ' 'welcoming him.\n\nWarning: if "email_from" and "smtp_server"' " aren't configured, it won't be possible to email new " "users."), 'signature': fields.text('Signature', size=64), - 'address_id': fields.many2one('res.partner.address', 'Address'), + # 'address_id': fields.many2one('res.partner.address', 'Address'), 'active': fields.boolean('Active'), 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."), 'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."), @@ -245,7 +245,7 @@ class users(osv.osv): 'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type, selection=[('simple','Simplified'),('extended','Extended')], string='Interface', help="Choose between the simplified interface and the extended one"), - 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240), + # 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240), 'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"), 'date': fields.datetime('Last Connection', readonly=True), } @@ -345,7 +345,7 @@ class users(osv.osv): 'company_id': _get_company, 'company_ids': _get_companies, 'groups_id': _get_group, - 'address_id': False, + # 'address_id': False, 'menu_tips':True } @@ -532,13 +532,13 @@ class config_users(osv.osv_memory): partner_id = self.pool.get('res.partner').main_partner(cr, uid) address = self.pool.get('res.partner.address').create( cr, uid, {'name': base_data['name'], - 'email': base_data['email'], + 'user_email': base_data['user_email'], 'partner_id': partner_id,}, context) user_data = dict( base_data, signature=self._generate_signature( - cr, base_data['name'], base_data['email'], context=context), + cr, base_data['name'], base_data['user_email'], context=context), address_id=address, ) new_user = self.pool.get('res.users').create( From 0187c6cf666e35b7541bfee0d6f36e8faa687baa Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Thu, 16 Jun 2011 17:55:21 +0530 Subject: [PATCH 002/169] user address bzr revid: rmu@tinyerp.com-20110616122521-xymw519yxvq6amxt --- openerp/addons/base/res/res_user.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index ca492c3fe96..ab2c56b42d5 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -513,10 +513,10 @@ class config_users(osv.osv_memory): _name = 'res.config.users' _inherit = ['res.users', 'res.config'] - def _generate_signature(self, cr, name, email, context=None): - return _('--\n%(name)s %(email)s\n') % { + def _generate_signature(self, cr, name, user_email, context=None): + return _('--\n%(name)s %(user_email)s\n') % { 'name': name or '', - 'email': email and ' <'+email+'>' or '', + 'user_mail': user_email and ' <'+user_email+'>' or '', } def create_user(self, cr, uid, new_id, context=None): @@ -529,21 +529,23 @@ class config_users(osv.osv_memory): with the user's data %-formatted into the mail body """ base_data = self.read(cr, uid, new_id, context=context) - partner_id = self.pool.get('res.partner').main_partner(cr, uid) - address = self.pool.get('res.partner.address').create( - cr, uid, {'name': base_data['name'], - 'user_email': base_data['user_email'], - 'partner_id': partner_id,}, - context) + #partner_id = self.pool.get('res.partner').main_partner(cr, uid) + #address = self.pool.get('res.partner.address').create( + + #cr, uid, {'name': base_data['name'], + #'email': base_data['email'], + #'partner_id': partner_id,},context) + user_data = dict( base_data, signature=self._generate_signature( - cr, base_data['name'], base_data['user_email'], context=context), - address_id=address, + cr, base_data['name'], base_data['user_email'], context=context) + #address_id=address, ) new_user = self.pool.get('res.users').create( cr, uid, user_data, context) self.send_welcome_email(cr, uid, new_user, context=context) + def execute(self, cr, uid, ids, context=None): 'Do nothing on execution, just launch the next action/todo' pass From 067b91a961698d57ab606afb9766fe6ac0e774c1 Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Fri, 17 Jun 2011 13:29:54 +0530 Subject: [PATCH 003/169] user address bzr revid: rmu@tinyerp.com-20110617075954-tis7gi2fezxjyjd9 --- openerp/addons/base/res/res_user.py | 44 +++++++---------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index ab2c56b42d5..42e7307aca0 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -113,6 +113,7 @@ class users(osv.osv): is to return config_users.WELCOME_MAIL_SUBJECT """ return self.WELCOME_MAIL_SUBJECT + def get_welcome_mail_body(self, cr, uid, context=None): """ Returns the subject of the mail new users receive (when created via the res.config.users wizard), default implementation @@ -175,24 +176,7 @@ class users(osv.osv): extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users'] return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids])) -# def _email_get(self, cr, uid, ids, name, arg, context=None): -# # perform this as superuser because the current user is allowed to read users, and that includes -# # the email, even without any direct read access on the res_partner_address object. -# return dict([(user.id, user.address_id.email) for user in self.browse(cr, 1, ids)]) # no context to avoid potential security issues as superuser -# -# def _email_set(self, cr, uid, ids, name, value, arg, context=None): -# if not isinstance(ids,list): -# ids = [ids] -# address_obj = self.pool.get('res.partner.address') -# for user in self.browse(cr, uid, ids, context=context): -# # perform this as superuser because the current user is allowed to write to the user, and that includes -# # the email even without any direct write access on the res_partner_address object. -# if user.address_id: -# address_obj.write(cr, 1, user.address_id.id, {'email': value or None}) # no context to avoid potential security issues as superuser -# else: -# address_id = address_obj.create(cr, 1, {'name': user.name, 'email': value or None}) # no context to avoid potential security issues as superuser -# self.write(cr, uid, ids, {'address_id': address_id}, context) -# return True + def _set_new_password(self, cr, uid, id, name, value, args, context=None): if value is False: @@ -217,14 +201,15 @@ class users(osv.osv): fnct_inv=_set_new_password, string='Change password', help="Only specify a value if you want to change the user password. " "This user will have to logout and login again!"), + 'user_email': fields.char('E-mail', size=64, help='If an email is provided, the user will be sent a message ' 'welcoming him.\n\nWarning: if "email_from" and "smtp_server"' " aren't configured, it won't be possible to email new " "users."), + 'signature': fields.text('Signature', size=64), - # 'address_id': fields.many2one('res.partner.address', 'Address'), - 'active': fields.boolean('Active'), + 'active': fields.boolean('Active'), 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."), 'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."), 'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'), @@ -245,8 +230,7 @@ class users(osv.osv): 'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type, selection=[('simple','Simplified'),('extended','Extended')], string='Interface', help="Choose between the simplified interface and the extended one"), - # 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240), - 'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"), + 'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"), 'date': fields.datetime('Last Connection', readonly=True), } @@ -345,7 +329,6 @@ class users(osv.osv): 'company_id': _get_company, 'company_ids': _get_companies, 'groups_id': _get_group, - # 'address_id': False, 'menu_tips':True } @@ -514,9 +497,9 @@ class config_users(osv.osv_memory): _inherit = ['res.users', 'res.config'] def _generate_signature(self, cr, name, user_email, context=None): - return _('--\n%(name)s %(user_email)s\n') % { + return _('--\n%(name)s %(email)s\n') % { 'name': name or '', - 'user_mail': user_email and ' <'+user_email+'>' or '', + 'email': email and ' <'+email+'>' or '', } def create_user(self, cr, uid, new_id, context=None): @@ -529,18 +512,11 @@ class config_users(osv.osv_memory): with the user's data %-formatted into the mail body """ base_data = self.read(cr, uid, new_id, context=context) - #partner_id = self.pool.get('res.partner').main_partner(cr, uid) - #address = self.pool.get('res.partner.address').create( - - #cr, uid, {'name': base_data['name'], - #'email': base_data['email'], - #'partner_id': partner_id,},context) - + user_data = dict( base_data, signature=self._generate_signature( - cr, base_data['name'], base_data['user_email'], context=context) - #address_id=address, + cr, base_data['name'], base_data['email'], context=context) ) new_user = self.pool.get('res.users').create( cr, uid, user_data, context) From e8b98c450b8ad55cb00b08cb3c4c37f01ec6faa2 Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Tue, 21 Jun 2011 16:07:29 +0530 Subject: [PATCH 004/169] user address bzr revid: rmu@tinyerp.com-20110621103729-6xbkj71rdkfp9q7y --- openerp/addons/base/res/res_user.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index 42e7307aca0..c91be997172 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -38,7 +38,7 @@ class groups(osv.osv): 'name': fields.char('Group Name', size=64, required=True), 'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'), 'rule_groups': fields.many2many('ir.rule', 'rule_group_rel', - 'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]), + 'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]), 'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'), 'comment' : fields.text('Comment',size=250), } @@ -113,7 +113,6 @@ class users(osv.osv): is to return config_users.WELCOME_MAIL_SUBJECT """ return self.WELCOME_MAIL_SUBJECT - def get_welcome_mail_body(self, cr, uid, context=None): """ Returns the subject of the mail new users receive (when created via the res.config.users wizard), default implementation @@ -201,13 +200,11 @@ class users(osv.osv): fnct_inv=_set_new_password, string='Change password', help="Only specify a value if you want to change the user password. " "This user will have to logout and login again!"), - 'user_email': fields.char('E-mail', size=64, help='If an email is provided, the user will be sent a message ' 'welcoming him.\n\nWarning: if "email_from" and "smtp_server"' " aren't configured, it won't be possible to email new " "users."), - 'signature': fields.text('Signature', size=64), 'active': fields.boolean('Active'), 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."), @@ -496,7 +493,7 @@ class config_users(osv.osv_memory): _name = 'res.config.users' _inherit = ['res.users', 'res.config'] - def _generate_signature(self, cr, name, user_email, context=None): + def _generate_signature(self, cr, name, email, context=None): return _('--\n%(name)s %(email)s\n') % { 'name': name or '', 'email': email and ' <'+email+'>' or '', @@ -512,7 +509,6 @@ class config_users(osv.osv_memory): with the user's data %-formatted into the mail body """ base_data = self.read(cr, uid, new_id, context=context) - user_data = dict( base_data, signature=self._generate_signature( From fa645f7f0bc9195886dc15e195721557c631b82b Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Tue, 21 Jun 2011 16:24:36 +0530 Subject: [PATCH 005/169] user address bzr revid: rmu@tinyerp.com-20110621105436-i4us13fk76ntx7gn --- openerp/addons/base/res/res_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index c91be997172..ea1f6b2142e 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -136,7 +136,7 @@ class users(osv.osv): _('"email_from" needs to be set to send welcome mails ' 'to users')) return False - if not user.get('user_email'): + if not user.get('email'): return False return tools.email_send(email_from=None, email_to=[user['email']], From 35a9d30b61405ab9c5ad2f1024afc1b8c53c1387 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Wed, 20 Jul 2011 10:51:21 +0530 Subject: [PATCH 006/169] [IMP]: removed domain from point of sale order line bzr revid: han@tinyerp.com-20110720052121-3945e40t0ylw7tmc --- addons/point_of_sale/point_of_sale_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 1435f6cc2b6..09a5ff232f2 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -269,7 +269,6 @@ form tree - [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))] From ba62b19daf132a6bfa6847987f3b29f7e7671b09 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 20 Jul 2011 14:48:19 +0530 Subject: [PATCH 007/169] usability bzr revid: tta@openerp.com-20110720091819-s49ianh7xgrf3eim --- addons/crm/report/crm_lead_report_view.xml | 3 +-- .../crm/report/crm_phonecall_report_view.xml | 6 ++---- .../crm_claim/report/crm_claim_report_view.xml | 7 +++---- .../report/hr_expense_report_view.xml | 3 +-- addons/hr_holidays/hr_holidays_view.xml | 7 ++----- .../report/timesheet_report_view.xml | 10 ++++------ .../report/pos_order_report_view.xml | 4 ++-- addons/project_issue/project_issue_view.xml | 4 ++-- .../report/project_issue_report_view.xml | 8 ++++---- .../purchase/report/purchase_report_view.xml | 4 ++-- addons/stock/report/report_stock_move_view.xml | 14 ++++++++------ addons/stock/stock_view.xml | 18 ++++++++---------- 12 files changed, 39 insertions(+), 49 deletions(-) diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 6c5d6dc65af..4c616309750 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -115,11 +115,10 @@ + - - diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index acc91cbef41..7cc0af11ddc 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -87,13 +87,11 @@ + - - - - + diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index e790183e5db..ff99d81a804 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -97,7 +97,8 @@ - + + @@ -106,9 +107,7 @@ domain="[('state','=','done')]"/> - - + domain="[('state','=','cancel')]"/> diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 0018a7e2ce2..623d8a638ec 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -74,11 +74,10 @@ + - - diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index cf725735641..e98d9129053 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -8,7 +8,7 @@ search - + @@ -28,12 +28,9 @@ domain="[('department_id.manager_id','=',uid)]" /> - - - - + diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 08abc6db63b..fbe54465bd6 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -73,15 +73,13 @@ + + + - - - - - - + diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index c72a6b6d415..759513fd4a1 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -71,11 +71,11 @@ help="My Sales" domain="[('user_id','=',uid)]"/> + - - + diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 2224527e9d2..1e3087866d4 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -221,11 +221,11 @@ + - - + diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 015a7750548..7bf5cc687f1 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -90,15 +90,15 @@ + + - - + - - + diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 804a1670467..463f415cc1b 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -78,10 +78,10 @@ + - - + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 25abf4d7333..2b440f900aa 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -98,11 +98,12 @@ + + + - - @@ -202,19 +203,20 @@ + + + - - + - - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3957494955c..2f55994c023 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1248,6 +1248,8 @@ + + @@ -1255,10 +1257,6 @@ - - - - @@ -1499,12 +1497,12 @@ + + - - - - + + @@ -1692,11 +1690,11 @@ + - - + From 3db1ea86dfb303a49b65ecfe5b2cf603cac800a9 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 20 Jul 2011 15:16:24 +0530 Subject: [PATCH 008/169] usability : crm extended seachview changes bzr revid: tta@openerp.com-20110720094624-bs2h1wh7u4ak3x8p --- addons/crm/crm_lead_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 0159141eb1c..6a96fc3a037 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -346,15 +346,15 @@ domain="[]" help="Show Sales Team"/> + + + + - - - - - + From 5bc8c72cf543cedb2ef1943b836eb37bb1e5973a Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Wed, 20 Jul 2011 15:34:54 +0530 Subject: [PATCH 009/169] [usability],tooltip on search button bzr revid: amb@tinyerp.com-20110720100454-ko6iub7h021u25ry --- addons/crm/crm_lead_view.xml | 2 +- addons/crm/crm_opportunity_view.xml | 2 +- addons/project/project_view.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 0159141eb1c..58bbe7ccc76 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -309,7 +309,7 @@ - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b720da13654..1e0834b7e07 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -267,7 +267,7 @@ - + From fae9022d84bfcc8d2798a381ac71f08d14ef88d5 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Wed, 20 Jul 2011 18:15:51 +0530 Subject: [PATCH 010/169] [IMP]: remove act window apply sxhedule upgrade bzr revid: han@tinyerp.com-20110720124551-7v46vtoyolif5ekg --- .../addons/base/module/wizard/base_module_upgrade_view.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml index 08638ac7fd0..313fbb885b9 100644 --- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml +++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml @@ -37,11 +37,6 @@ parent="menu_management" sequence="3"/> - - Module Upgrade Install base.module.upgrade @@ -71,4 +66,4 @@ - \ No newline at end of file + From 7be9b68c76e91e63db372be19a782363e72b928b Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Wed, 20 Jul 2011 18:57:42 +0530 Subject: [PATCH 011/169] [IMP] adding relate button on the product form bzr revid: aar@tinyerp.com-20110720132742-kkotpypy35kg2lf3 --- addons/mrp/mrp_view.xml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index fb029710eb3..3c374932f68 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -145,7 +145,8 @@ - + + @@ -269,7 +270,7 @@ tree - + @@ -735,7 +736,8 @@ - + + @@ -972,6 +974,13 @@ + + From 6398222a1501a5c7a83f6c22a88c47c6574e84aa Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Thu, 21 Jul 2011 14:28:53 +0530 Subject: [PATCH 012/169] [IMP] onchange costumer change teh to_invoice bzr revid: aar@tinyerp.com-20110721085853-mcld9nqm2q27ki3q --- addons/project/project.py | 8 ++++++-- addons/project_timesheet/project_timesheet.py | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index b1461da424c..782767d78f8 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -71,14 +71,18 @@ class project(osv.osv): res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name return res - def onchange_partner_id(self, cr, uid, ids, part=False, context=None): + def onchange_partner_id(self, cr, uid, ids, part=False, res=False, context=None): partner_obj = self.pool.get('res.partner') if not part: return {'value':{'contact_id': False, 'pricelist_id': False}} addr = partner_obj.address_get(cr, uid, [part], ['contact']) pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context) pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False - return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}} + if not res: + return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}} + else: + return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id, 'to_invoice': res}} + def _progress_rate(self, cr, uid, ids, names, arg, context=None): res = {}.fromkeys(ids, 0.0) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 141b5756271..36768b07793 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -28,7 +28,10 @@ from tools.translate import _ class project_project(osv.osv): _inherit = 'project.project' - + def onchange_partner_id(self, cr, uid, ids, part=False, context=None): + obj = self.pool.get('hr_timesheet_invoice.factor') + factor_ids = obj.search(cr, uid, [('customer_name','=','100%')]) + return super(project_project, self).onchange_partner_id(cr, uid, ids, part, factor_ids, context=context) project_project() class project_work(osv.osv): From 043c268c99880dc3eba28461126003def21b4650 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Thu, 21 Jul 2011 19:00:51 +0530 Subject: [PATCH 013/169] [IMP] demo data added in account_invoice bzr revid: han@tinyerp.com-20110721133051-6trhxwh0d6fjonlp --- addons/account/__openerp__.py | 1 + addons/account/demo/account_invoice_demo.xml | 812 +++++++++++++++++++ 2 files changed, 813 insertions(+) create mode 100644 addons/account/demo/account_invoice_demo.xml diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 2122f988d5d..b5161bd9031 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -129,6 +129,7 @@ module named account_voucher. 'project/project_demo.xml', 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', + 'demo/account_invoice_demo.xml', # 'account_unit_test.xml', ], 'test': [ diff --git a/addons/account/demo/account_invoice_demo.xml b/addons/account/demo/account_invoice_demo.xml new file mode 100644 index 00000000000..613d192f958 --- /dev/null +++ b/addons/account/demo/account_invoice_demo.xml @@ -0,0 +1,812 @@ + + + + + 2011-07-21 + + + + + + + none + + draft + in_invoice + + + 2011-06-01 + + + + + + + + + + + + + + + + [RPAN100] Rear Panel SHE100 + + + + + + + + + + + + + [RCK200] Rack 200cm + + + + + + + + + + + + + [RCK200] Rack 200cm + + + + + 2011-05-30 + + + + + + + none + + draft + in_invoice + + + 2011-05-01 + + + + + + + + + + + + + + + + [PC0] Complete PC With Peripherals + + + + + + + + + + + + + [PC1] Basic PC + + + + + + + + + + + + + [PC3] Medium PC + + + + + 2011-04-25 + + exj/2011/0001 + + + + + + none + + open + in_invoice + exj/2011/0001 + + + + / + 2011-04-01 + + + + + + + + + + + + + + + + + + [MB1] Mainboard ASUStek A7N8X + + + + + + + + + + + + + [METC000] Metal Cleats + + + + + + + + + + + + + [MOU] Mouse + + + + + 2011-03-30 + + + + + + + none + + draft + out_invoice + + + 2011-03-01 + + + + + + + + + + + + + + + + [HOT] Hotel Expenses + + + + + + + + + + + + + [KEYA] Keyboard - AZERTY + + + + + + + + + + + + + [KIT0] Kit Keyboard + Mouse + + + + + 2011-03-31 + + saj/2011/0003 + + + + + + none + + open + out_invoice + saj/2011/0003 + + + + / + 2011-02-01 + + + + + + + + + + + + + + + + + + [FAN2] Silent fan + + + + + + + + + + + + + [HDD1] HDD Seagate 7200.8 80GB + + + + + + + + + + + + + [HDD2] HDD Seagate 7200.8 120GB + + + + + 2011-02-28 + + saj/2011/0002 + + + + + + none + + open + out_invoice + saj/2011/0002 + + + + / + 2011-01-16 + + + + + + + + + + + + + + + + + + [CPU_GEN] Regular processor config + + + + + + + + + + + + + [EMPL] Employee + + + + + + + + + + + + + [FAN] Regular case fan 80mm + + + + + 2011-01-31 + + saj/2011/0001 + + + + + + none + + open + out_invoice + saj/2011/0001 + + + + / + 2011-01-01 + + + + + + + + + + + + + + + + + + [CPU1] Processor AMD Athlon XP 1800+ + + + + + + + + + + + + + [CPU2] High speed processor config + + + + + + + + + + + + + [CPU3] Processor AMD Athlon XP 2200+ + + + + + PO00002 + + + + + + PO00002 + + none + + draft + in_invoice + + + + + + PO00002 + + + + + + + + + + + + + [PC3] Medium PC + + + + + + + + + + + + + + + [PC3] Medium PC + + + + + + + + + + + + + + + [CPU1] Processor AMD Athlon XP 1800+ + + + + + + + + + + + + + + + [CPU2] High speed processor config + + + + + + + + + + + + + + + [CPU3] Processor AMD Athlon XP 2200+ + + + + + + + + + + + + + + + [CPU_GEN] Regular processor config + + + + + + + + + + + + + + + [EMPL] Employee + + + + + + + + + + + + + + + [FAN] Regular case fan 80mm + + + + + + + + + + + + + + + [FAN2] Silent fan + + + + + + + + + + + + + + + [HDD1] HDD Seagate 7200.8 80GB + + + + + + + + + + + + + + + [HDD2] HDD Seagate 7200.8 120GB + + + + + + + + + + + + + + + [HOT] Hotel Expenses + + + + + + + + + + + + + + + [KEYA] Keyboard - AZERTY + + + + + + + + + + + + + + + [KIT0] Kit Keyboard + Mouse + + + + + + + + + + + + + + + [MB1] Mainboard ASUStek A7N8X + + + + + + + + + + + + + + + [METC000] Metal Cleats + + + + + + + + + + + + + + + [MOU] Mouse + + + + + + + + + + + + + + + [PC0] Complete PC With Peripherals + + + + + + + + + + + + + + + [PC1] Basic PC + + + + + + + + + + + + + + + [PC3] Medium PC + + + + + + + + + + + + + + + [RPAN100] Rear Panel SHE100 + + + + + + + + + + + + + + + [RCK200] Rack 200cm + + + + + + + + + + + + + + + [RCK200] Rack 200cm + + + From 772719e00fe0127d72b686b9c9ab6c7a842d3c4d Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Fri, 22 Jul 2011 15:30:00 +0530 Subject: [PATCH 014/169] [usability],tooptip on search button bzr revid: amb@tinyerp.com-20110722100000-736i3hxq1rlxq5oq --- addons/crm/crm_lead_view.xml | 4 ++-- addons/crm/crm_opportunity_view.xml | 4 ++-- addons/project/project_view.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 58bbe7ccc76..d3299060fcb 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -309,8 +309,8 @@ + name="current" help="Draft, Open and Pending Documents." + domain="[('state','in',('draft','open','pending'))]"/> diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index f8d5237161b..73d098fe4b5 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -281,9 +281,9 @@ + domain="[('state','in',('draft','open','pending'))]"/> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 334e43ad1bd..6fb57817a3e 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -397,7 +397,7 @@ - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 1e0834b7e07..c3333b4145b 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -267,7 +267,7 @@ - + From 35f247bc7a8f5a9772ee7a8c6b5b8e4c21ae5526 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Fri, 22 Jul 2011 17:01:47 +0530 Subject: [PATCH 015/169] [IMP]: inserted demo data in several objects bzr revid: han@tinyerp.com-20110722113147-6mg9cjmkasdpn8ma --- addons/hr/hr_demo.xml | 27 ++++ addons/hr_holidays/hr_holidays_data.xml | 6 + addons/hr_holidays/hr_holidays_demo.xml | 24 +++ addons/hr_recruitment/hr_recruitment_demo.xml | 43 ++++++ addons/hr_timesheet/hr_timesheet_demo.xml | 41 ++++++ addons/purchase/purchase_demo.xml | 138 ++++++++++++++++++ addons/sale/sale_demo.xml | 67 +++++++++ 7 files changed, 346 insertions(+) diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml index 91b78ddeed5..9c45b665c19 100644 --- a/addons/hr/hr_demo.xml +++ b/addons/hr/hr_demo.xml @@ -79,6 +79,33 @@ + + Laith Jubair + + + + + + + Alexendar + + + + + + + Leonidas Micheal + + + + + + + Xexers Botha + + + + Employees ir.ui.menu diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml index 2c0debb3552..df654ce5f07 100644 --- a/addons/hr_holidays/hr_holidays_data.xml +++ b/addons/hr_holidays/hr_holidays_data.xml @@ -23,6 +23,12 @@ brown + + + Unpaid + True + brown + diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml index f68e3e01632..abd95ca3027 100644 --- a/addons/hr_holidays/hr_holidays_demo.xml +++ b/addons/hr_holidays/hr_holidays_demo.xml @@ -31,10 +31,34 @@ + + Summer Vacation + + + + add + draft + 7 + + + + + International Tour + + + + add + 7 + + + + + + diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index df34ec093c8..20a4fa0e17a 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -134,5 +134,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml index 9d977c1315a..4f365d50fa2 100644 --- a/addons/hr_timesheet/hr_timesheet_demo.xml +++ b/addons/hr_timesheet/hr_timesheet_demo.xml @@ -88,6 +88,47 @@ + + Training to partner + + + + + + + + + + + + + Presentation + + + + + + + + + + + + + + Training to trainee + + + + + + + + + + + + diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index f3f0ef0672c..6aa98f8cf6c 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -22,6 +22,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -54,7 +81,118 @@ 1 + + + + Onsite Senior Intervention + + + 900 + 10 + + + + + + Onsite Intervention + + + 100 + 5 + + + + + + [PC2] Basic+ PC (assembly on order) + + + 40 + 5 + + + + + + [MB1] Mainboard ASUStek A7N8X + + + 45 + 15 + + + + + + [MB2] Mainboard ASUStek A7V8X-X + + + 45 + 15 + + + + + + [CPU1] Processor AMD Athlon XP 1800+ + + + 60 + 3 + + + + + + [CPU3] Processor AMD Athlon XP 2200+ + + + 50 + 13 + + + + + + [HDD1] HDD Seagate 7200.8 80GB + + + 70 + 10 + + + + + + [HDD2] HDD Seagate 7200.8 120GB + + + 70 + 10 + + + + + + [RAM] DDR 256MB PC400 + + + 700 + 10 + + + + + + [RAM512] DDR 512MB PC400 + + + 1700 + 10 + + + diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 0e3126defc5..7b8908ae9cd 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -178,6 +178,73 @@ + + + + + + + + + + + + + + Onsite Senior Intervention + + + 4 + 250 + make_to_order + 15 + + + + Onsite Intervention + + + 4 + 500 + make_to_order + 15 + + + + + + + + + + + + + + + + + + [MB1] Mainboard ASUStek A7N8X + + + 4 + 250 + make_to_order + 15 + + + + [MB2 Mainboard ASUStek A7N8X + + + 4 + 500 + make_to_order + 15 + + + From 1b19585369b98087d5a7d5bb61702df9e1bd8848 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Fri, 22 Jul 2011 18:15:02 +0530 Subject: [PATCH 016/169] [IMP]: removed domain in point of sale order line bzr revid: han@tinyerp.com-20110722124502-8otd72ebn4j6x5qi --- addons/point_of_sale/point_of_sale_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 09a5ff232f2..2d0b0167b69 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -269,6 +269,7 @@ form tree + [] From 23c2685597bb1868edddb2fb5064b881d49e0b90 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 25 Jul 2011 14:32:01 +0530 Subject: [PATCH 017/169] [Usability] with Warehouse/product moves/ deliver products, prodlot_id set at right place. bzr revid: tta@openerp.com-20110725090201-n72bijk3qg52ldl2 --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 2f55994c023..f65fdc4056a 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1727,11 +1727,11 @@ + - - + From 76511fd3cf314009d08d9a265b883ff977b4cd6f Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Mon, 25 Jul 2011 14:44:54 +0530 Subject: [PATCH 018/169] [usability],improve tooltip on search button bzr revid: amb@tinyerp.com-20110725091454-mmcau026pyzze68f --- addons/crm/crm_lead_view.xml | 2 +- addons/crm/crm_opportunity_view.xml | 2 +- addons/project/project_view.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index d3299060fcb..e563fce39d7 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -309,7 +309,7 @@ - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index c3333b4145b..aae74d85cf3 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -267,7 +267,7 @@ - + From a2554a811b1000e54e1a2e8df89aa4db051656c9 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 25 Jul 2011 15:21:27 +0530 Subject: [PATCH 019/169] [Usability] project issues move id at first line. bzr revid: tta@openerp.com-20110725095127-bcspb7duz1v82r4u --- addons/project_issue/project_issue_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 1e3087866d4..77acf01e9cb 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -222,12 +222,11 @@ + - - - + From 44ab57643e4e27cac356936205941c61cddf5a08 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Mon, 25 Jul 2011 15:21:30 +0530 Subject: [PATCH 020/169] [usability],improve tooltip on search button tasks/phases bzr revid: amb@tinyerp.com-20110725095130-ttzkwmd36p4k3cba --- addons/project/project_view.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c20d971c845..b4645e9eac8 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -397,7 +397,7 @@ - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index aae74d85cf3..a7c0d26bc99 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -267,7 +267,7 @@ - + From ae6007b9cf9fe0e74dde7f0e29e33d868c2ab1e6 Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Mon, 25 Jul 2011 15:26:16 +0530 Subject: [PATCH 021/169] update_address_id_usr_email bzr revid: rmu@tinyerp.com-20110725095616-5p2lkyomcxyo4t0n --- openerp/addons/base/base_update.xml | 2 -- openerp/addons/base/res/res_user.py | 27 +++------------------------ 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index 1820c8df9f3..ed67b2f16ee 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -119,7 +119,6 @@ context="{'user_preference': 0}" groups="base.group_multi_company" /> - @@ -175,7 +174,6 @@ - diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index f3c0f635d14..edeb334d2fb 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -175,25 +175,6 @@ class users(osv.osv): extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users'] return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids])) - def _email_get(self, cr, uid, ids, name, arg, context=None): - # perform this as superuser because the current user is allowed to read users, and that includes - # the email, even without any direct read access on the res_partner_address object. - return dict([(user.id, user.address_id.email) for user in self.browse(cr, 1, ids)]) # no context to avoid potential security issues as superuser - - def _email_set(self, cr, uid, ids, name, value, arg, context=None): - if not isinstance(ids,list): - ids = [ids] - address_obj = self.pool.get('res.partner.address') - for user in self.browse(cr, uid, ids, context=context): - # perform this as superuser because the current user is allowed to write to the user, and that includes - # the email even without any direct write access on the res_partner_address object. - if user.address_id: - address_obj.write(cr, 1, user.address_id.id, {'email': value or None}) # no context to avoid potential security issues as superuser - else: - address_id = address_obj.create(cr, 1, {'name': user.name, 'email': value or None}) # no context to avoid potential security issues as superuser - self.write(cr, uid, ids, {'address_id': address_id}, context) - return True - def _set_new_password(self, cr, uid, id, name, value, args, context=None): if value is False: # Do not update the password if no value is provided, ignore silently. @@ -220,13 +201,12 @@ class users(osv.osv): fnct_inv=_set_new_password, string='Change password', help="Only specify a value if you want to change the user password. " "This user will have to logout and login again!"), - 'email': fields.char('E-mail', size=64, + 'user_email': fields.char('E-mail', size=64, help='If an email is provided, the user will be sent a message ' 'welcoming him.\n\nWarning: if "email_from" and "smtp_server"' " aren't configured, it won't be possible to email new " "users."), 'signature': fields.text('Signature', size=64), - 'address_id': fields.many2one('res.partner.address', 'Address'), 'active': fields.boolean('Active'), 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."), 'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."), @@ -247,7 +227,7 @@ class users(osv.osv): 'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type, selection=[('simple','Simplified'),('extended','Extended')], string='Interface', help="OpenERP offers a simplified and an extended user interface. If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier to use. You can switch to the other interface from the User/Preferences menu at any time."), - 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240), + 'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"), 'date': fields.datetime('Last Connection', readonly=True), } @@ -346,7 +326,6 @@ class users(osv.osv): 'company_id': _get_company, 'company_ids': _get_companies, 'groups_id': _get_group, - 'address_id': False, 'menu_tips':True } @@ -414,7 +393,7 @@ class users(osv.osv): copy_pattern = _("%s (copy)") copydef = dict(login=(copy_pattern % user2copy['login']), name=(copy_pattern % user2copy['name']), - address_id=False, # avoid sharing the address of the copied user! + # avoid sharing the address of the copied user! ) copydef.update(default) return super(users, self).copy(cr, uid, id, copydef, context) From 212826dbf2c556b0f9cb41763354e2dbd310848b Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Tue, 26 Jul 2011 11:51:33 +0530 Subject: [PATCH 022/169] [IMP] remerge add_relate_button bzr revid: aar@tinyerp.com-20110726062133-a1fbqo0ywivh0cra --- addons/mrp/mrp_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 3c374932f68..93703cb6ee6 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -146,7 +146,6 @@ - @@ -737,7 +736,6 @@ - @@ -1025,7 +1023,6 @@ - From de8fa767097fb8ea1393ac2ed6657e60897187dd Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Tue, 26 Jul 2011 12:21:24 +0530 Subject: [PATCH 023/169] [IMP] remerege onchange_partner_set_invoice_task_work bzr revid: aar@tinyerp.com-20110726065124-a069g9op9gw6u0jl --- addons/project/project.py | 8 ++------ addons/project_timesheet/project_timesheet.py | 7 +++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index 782767d78f8..830d40a4634 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -78,12 +78,8 @@ class project(osv.osv): addr = partner_obj.address_get(cr, uid, [part], ['contact']) pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context) pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False - if not res: - return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}} - else: - return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id, 'to_invoice': res}} - - + return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}} + def _progress_rate(self, cr, uid, ids, names, arg, context=None): res = {}.fromkeys(ids, 0.0) if not ids: diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 36768b07793..0d6843497c8 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -30,8 +30,11 @@ class project_project(osv.osv): _inherit = 'project.project' def onchange_partner_id(self, cr, uid, ids, part=False, context=None): obj = self.pool.get('hr_timesheet_invoice.factor') - factor_ids = obj.search(cr, uid, [('customer_name','=','100%')]) - return super(project_project, self).onchange_partner_id(cr, uid, ids, part, factor_ids, context=context) + res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context) + if res and ('value' in res): + factor_ids = obj.search(cr, uid, [('customer_name','=','100%')]) + res['value'].update({'to_invoice': factor_ids}) + return res project_project() class project_work(osv.osv): From 8aea108678acc65c11f673e671673af64606c720 Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Tue, 26 Jul 2011 12:35:20 +0530 Subject: [PATCH 024/169] [IMP] remerge onchange_partner_set_invoice_task_work bzr revid: aar@tinyerp.com-20110726070520-k20bvj8anrq9z6ot --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 830d40a4634..1aa200144cb 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -71,7 +71,7 @@ class project(osv.osv): res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name return res - def onchange_partner_id(self, cr, uid, ids, part=False, res=False, context=None): + def onchange_partner_id(self, cr, uid, ids, part=False, context=None): partner_obj = self.pool.get('res.partner') if not part: return {'value':{'contact_id': False, 'pricelist_id': False}} From 5a1021b830f385eb3244ef2b05bb1f4a9e1c5b9c Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Tue, 26 Jul 2011 12:50:53 +0530 Subject: [PATCH 025/169] [IMP] remerge add_relate_button bzr revid: aar@tinyerp.com-20110726072053-oznk99qpj41e5bq2 --- addons/mrp/mrp_view.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 93703cb6ee6..e481ee6382d 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -145,7 +145,7 @@ - + @@ -269,7 +269,7 @@ tree - + @@ -735,7 +735,7 @@ - + @@ -972,6 +972,7 @@ + + Date: Tue, 26 Jul 2011 14:22:18 +0530 Subject: [PATCH 026/169] filter management bzr revid: rmu@tinyerp.com-20110726085218-w3om75wrt0eusxw1 --- openerp/addons/base/ir/ir.xml | 18 ++++++++++++------ openerp/addons/base/ir/ir_filters.py | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 1280ad5f5e7..a4ab078e589 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -393,14 +393,20 @@ - + + + - - - - - + + + + + + + diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index 0146b8dd85b..c0a4977f5a0 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -29,10 +29,11 @@ class ir_filters(osv.osv): _name = 'ir.filters' _description = 'Filters' - def _list_all_models(self, cr, uid, context=None): - cr.execute("SELECT model, name from ir_model") - return cr.fetchall() - + def copy(self, cr, uid, id, default={}, context={}): + name = self.read(cr, uid, [id], ['name'])[0]['name'] + default.update({'name': name+ _(' (copy)'), 'events':[]}) + return super(ir_filters, self).copy(cr, uid, id, default, context) + def get_filters(self, cr, uid, model): act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)]) my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context']) @@ -56,11 +57,15 @@ class ir_filters(osv.osv): cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)') _columns = { - 'name': fields.char('Action Name', size=64, translate=True, required=True), - 'user_id':fields.many2one('res.users', 'User', help='False means for every user'), + 'name': fields.char('Filter Name', size=64, translate=True, required=True), + 'user_id':fields.many2one('res.users', 'User', help='Keep empty if you want this filter to be applied to every user.If you assign a user in this field, only this user will have this filter available.'), 'domain': fields.text('Domain Value', required=True), 'context': fields.text('Context Value', required=True), - 'model_id': fields.selection(_list_all_models, 'Object', size=64, required=True), + 'model_id': fields.many2one('ir.model', 'Object', size=64, required=True), + } + _defaults = { + 'domain': '"[]"', + 'context':'"{}"', } ir_filters() From 3c2ca3d71c0c972beefd808fd5ad1d7dd4194fec Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 14:54:46 +0530 Subject: [PATCH 027/169] [IMP]base:Remove a configure interface Wizard bzr revid: mma@tinyerp.com-20110726092446-0yrf3cjeqqv7uem2 --- openerp/addons/base/base_update.xml | 54 ----------------------------- 1 file changed, 54 deletions(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index 1820c8df9f3..dc39e14f1cf 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -257,59 +257,5 @@ - - Configure Your Interface - res.config.view - form - - - -
- Configure Your Interface -
- - If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences. - - - Configure Your Interface - - - - 12 - - - - - - - - - - - - - Configure Your Interface - ir.actions.act_window - res.config.view - form - - form - new - - - - Administration - 1 - - - - - - special - 1 - skip - - From 93b4c48098ef00495e0cc072b84130955f82b35b Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 26 Jul 2011 15:07:22 +0530 Subject: [PATCH 028/169] [usability] issues analysis, applyed filter on both field user_id and assigned_to bzr revid: tta@openerp.com-20110726093722-cyv0rdpy09c5t4lv --- addons/project_issue/report/project_issue_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 7bf5cc687f1..207e174e480 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -89,7 +89,7 @@ - + From e0f401bae4f5b2dadfcc279575ca0f2f6d4a60e1 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 26 Jul 2011 12:31:00 +0200 Subject: [PATCH 029/169] [IMP] merged the python classes defining res.groups bzr revid: rco@openerp.com-20110726103100-6ibtqsfnim3unpg3 --- openerp/addons/base/res/res_user.py | 40 ++++++++++++----------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index f3c0f635d14..58793bc638d 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -36,6 +36,7 @@ class groups(osv.osv): _description = "Access Groups" _columns = { 'name': fields.char('Group Name', size=64, required=True), + 'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'), 'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'), 'rule_groups': fields.many2many('ir.rule', 'rule_group_rel', 'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]), @@ -76,6 +77,21 @@ class groups(osv.osv): aid.write({'groups_id': [(4, gid)]}) return gid + def unlink(self, cr, uid, ids, context=None): + group_users = [] + for record in self.read(cr, uid, ids, ['users'], context=context): + if record['users']: + group_users.extend(record['users']) + if group_users: + user_names = [user.name for user in self.pool.get('res.users').browse(cr, uid, group_users, context=context)] + user_names = list(set(user_names)) + if len(user_names) >= 5: + user_names = user_names[:5] + ['...'] + raise osv.except_osv(_('Warning !'), + _('Group(s) cannot be deleted, because some user(s) still belong to them: %s !') % \ + ', '.join(user_names)) + return super(groups, self).unlink(cr, uid, ids, context=context) + def get_extended_interface_group(self, cr, uid, context=None): data_obj = self.pool.get('ir.model.data') extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended') @@ -510,30 +526,6 @@ class users(osv.osv): users() -class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ? - _inherit = 'res.groups' - _columns = { - 'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'), - } - - def unlink(self, cr, uid, ids, context=None): - group_users = [] - for record in self.read(cr, uid, ids, ['users'], context=context): - if record['users']: - group_users.extend(record['users']) - - if group_users: - user_names = [user.name for user in self.pool.get('res.users').browse(cr, uid, group_users, context=context)] - user_names = list(set(user_names)) - if len(user_names) >= 5: - user_names = user_names[:5] + ['...'] - raise osv.except_osv(_('Warning !'), - _('Group(s) cannot be deleted, because some user(s) still belong to them: %s !') % \ - ', '.join(user_names)) - return super(groups2, self).unlink(cr, uid, ids, context=context) - -groups2() - class res_config_view(osv.osv_memory): _name = 'res.config.view' _inherit = 'res.config' From 117eb83d911ca45dc3858447414d2124c0dc3e25 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Tue, 26 Jul 2011 16:16:13 +0530 Subject: [PATCH 030/169] [FIX]:Remove the menu and object Admisnitration > Customization > Reporting > Publish a Note and everything related to this: object, views, etc. bzr revid: apa@tinyerp.com-20110726104613-z8jr2odn54c875vo --- addons/account/board_account_view.xml | 5 -- addons/auction/board_auction_manager_view.xml | 5 -- addons/auction/board_auction_view.xml | 4 -- addons/board/board.py | 45 ------------- addons/board/board_view.xml | 65 +------------------ addons/board/security/ir.model.access.csv | 2 - addons/crm/board_crm_view.xml | 4 -- addons/document/board_document_view.xml | 4 -- addons/event/board_association_view.xml | 4 -- addons/mrp/board_manufacturing_view.xml | 4 -- addons/project/board_project_demo.xml | 11 ---- addons/project/board_project_manager_view.xml | 4 -- addons/project/board_project_view.xml | 11 ---- addons/sale/board_sale_view.xml | 4 -- addons/stock/board_warehouse_view.xml | 5 -- 15 files changed, 2 insertions(+), 175 deletions(-) diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index dd424e17ceb..e5b262c07f9 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -1,11 +1,6 @@ - - - Accountants - - Receivable Accounts report.account.receivable diff --git a/addons/auction/board_auction_manager_view.xml b/addons/auction/board_auction_manager_view.xml index edc799588e3..67ad8334967 100644 --- a/addons/auction/board_auction_manager_view.xml +++ b/addons/auction/board_auction_manager_view.xml @@ -1,11 +1,6 @@ - - Auction manager - - - board.auction.manager.form board.board diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml index ed979184a07..cc784c93be2 100644 --- a/addons/auction/board_auction_view.xml +++ b/addons/auction/board_auction_view.xml @@ -1,10 +1,6 @@ - - Auction DashBoard - - Latest objects auction.lots diff --git a/addons/board/board.py b/addons/board/board.py index 85f2cce7ef7..d215981953a 100644 --- a/addons/board/board.py +++ b/addons/board/board.py @@ -195,51 +195,6 @@ class board_line(osv.osv): board_line() - -class board_note_type(osv.osv): - """ - Board note Type - """ - _name = 'board.note.type' - _description = "Note Type" - - _columns = { - 'name': fields.char('Note Type', size=64, required=True), - } - -board_note_type() - -def _type_get(self, cr, uid, context=None): - """ - Get by default Note type. - """ - obj = self.pool.get('board.note.type') - ids = obj.search(cr, uid, []) - res = obj.read(cr, uid, ids, ['name'], context=context) - res = [(r['name'], r['name']) for r in res] - return res - - -class board_note(osv.osv): - """ - Board Note - """ - _name = 'board.note' - _description = "Note" - _columns = { - 'name': fields.char('Subject', size=128, required=True), - 'note': fields.text('Note'), - 'user_id': fields.many2one('res.users', 'Author', size=64), - 'date': fields.date('Date', size=64, required=True), - 'type': fields.selection(_type_get, 'Note type', size=64), - } - _defaults = { - 'user_id': lambda object, cr, uid, context: uid, - 'date': lambda object, cr, uid, context: time.strftime('%Y-%m-%d'), - } - -board_note() - class res_log_report(osv.osv): """ Log Report """ _name = "res.log.report" diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index d48ddd6a025..76b5aa3f650 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -1,67 +1,6 @@ - - - board.note.search - board.note - search - - - - - - - - - - - - - - - - - - - board.note.tree - board.note - tree - - - - - - - - - - - - board.note.form - board.note - form - -
- - - - - - - - -
- - - - - Publish a note - board.note - form - form,tree - - @@ -137,10 +76,10 @@ action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/> - + sequence="3" groups="base.group_system" /--> - - CRM Configuration - - crm.opportunity.user.graph1 crm.lead.report diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index 8f102f5936d..8d80b4a1497 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -1,10 +1,6 @@ - - Document - - board.document.manager.form board.board diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index d62e4336202..8b6a4dcd0d4 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -34,10 +34,6 @@ tree,form - - associations - - board.associations.manager.form board.board diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml index 9c7a66d3057..03d6947d215 100644 --- a/addons/mrp/board_manufacturing_view.xml +++ b/addons/mrp/board_manufacturing_view.xml @@ -1,10 +1,6 @@ - - Production - - board.mrp.manager.form board.board diff --git a/addons/project/board_project_demo.xml b/addons/project/board_project_demo.xml index 85bf3140d26..39f923a895b 100644 --- a/addons/project/board_project_demo.xml +++ b/addons/project/board_project_demo.xml @@ -2,16 +2,5 @@ - - - - Don't forget the new development policies. - - Project - - diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml index c34b367a900..b9ff6331db0 100644 --- a/addons/project/board_project_manager_view.xml +++ b/addons/project/board_project_manager_view.xml @@ -2,10 +2,6 @@ - - Project managers - - diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index 822781ccb38..6470dd3e49d 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -2,10 +2,6 @@ - - Project - - project.task.tree @@ -79,13 +75,6 @@ - - Public Notes - board.note - form - tree,form - [('type','=','Project')] - board.project.form board.board diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 533aa56cefe..66b3c8805e4 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -1,10 +1,6 @@ - - Sales - - board.sales.manager.form board.board diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index df2ea7ce438..91245381e2f 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -1,11 +1,6 @@ - - Warehouse - - - Incoming Product stock.move From 2a97be835cc7666fa733b13aff14f432179510d9 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 16:23:30 +0530 Subject: [PATCH 031/169] [IMP]base:Remove a config view in py bzr revid: mma@tinyerp.com-20110726105330-qm2ao4s2x4n5l66z --- openerp/addons/base/res/res_user.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index f3c0f635d14..ae301efa4d9 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -534,24 +534,4 @@ class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ? groups2() -class res_config_view(osv.osv_memory): - _name = 'res.config.view' - _inherit = 'res.config' - _columns = { - 'name':fields.char('Name', size=64), - 'view': fields.selection([('simple','Simplified'), - ('extended','Extended')], - 'Interface', required=True ), - } - _defaults={ - 'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple', - } - - def execute(self, cr, uid, ids, context=None): - res = self.read(cr, uid, ids)[0] - self.pool.get('res.users').write(cr, uid, [uid], - {'view':res['view']}, context=context) - -res_config_view() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 7e9965eec16c52e84a7770d15e55102ba7eda64a Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Tue, 26 Jul 2011 16:24:50 +0530 Subject: [PATCH 032/169] improved bzr revid: apa@tinyerp.com-20110726105450-tlf553tm93fuswm5 --- addons/board/board_view.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 76b5aa3f650..9cc8787cbb5 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -76,11 +76,6 @@ action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/> - - From bca6ad53a3518416e6e10f78296cc8bab71b449a Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 26 Jul 2011 16:29:01 +0530 Subject: [PATCH 033/169] [IMP]: point of sale modify domain bzr revid: han@tinyerp.com-20110726105901-n0ht0v53n1uxmome --- addons/point_of_sale/point_of_sale_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 2d0b0167b69..b0434718a8c 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -105,7 +105,7 @@ pos.order form - [['date_order','>=',time.strftime('%Y-%m-%d')]] + [] Sales @@ -269,7 +269,7 @@ form tree - [] + [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))] From 8b5eab09814d16944a579a8f0317cc58515ec9c6 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 16:48:24 +0530 Subject: [PATCH 034/169] [IMP]base:add a demo data in some partner bzr revid: mma@tinyerp.com-20110726111824-icen9nmgln92ep21 --- .../addons/base/res/partner/partner_demo.xml | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml index c98ae837088..22db92e0c43 100644 --- a/openerp/addons/base/res/partner/partner_demo.xml +++ b/openerp/addons/base/res/partner/partner_demo.xml @@ -104,6 +104,7 @@ Camptocamp 1 + http://www.syleam.fr @@ -166,6 +167,7 @@ 1 + http://mediapole.net @@ -430,17 +432,29 @@ default + Paris + 75016 + + 1 rue Rockfeller Centrale d'achats 1 default Shop 1 + Liege + 6985 + + 2 Impasse de la Soif default Shop 2 + Shanghai + 4785552 + + 52 Chop Suey street @@ -455,6 +469,48 @@ Université de Liège + + Liege + Karine Lesbrouffe + 6985 + +33 (0) 2 33 31 22 10 + + 2 Impasse de la Soif + default + + + + Shanghai + seagate + 4785552 + +33 (0) 2 33 31 22 10 + + 52 Chop Suey street + default + + + + Alencon + Sebastien Thymbra + 61000 + contact@syleam.fr + 1 place de l'Église + +33 (0) 2 33 31 22 10 + + default + + + + Liege + Karine Lesbrouffe + 6985 + contact@tiny.bl + +33 (0) 2 33 31 22 10 + + 2 Impasse de la Soif + default + + - - - product.product.tree - product.product - tree - - - - - - - - - - - - - Configure Your Services - ir.actions.act_window - product.product - form - tree,form - [('type','=','service')] - - - - - - - - 3 - normal - skip - - - - \ No newline at end of file From b91c8272bfcdffb922eba8641f6500670029d83a Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 26 Jul 2011 19:03:30 +0530 Subject: [PATCH 041/169] [Usability] Removed the extended filter from the claims analysis view bzr revid: tta@openerp.com-20110726133330-d03av5sb1bsi2bil --- .../crm_claim/report/crm_claim_report_view.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index ff99d81a804..03914378da9 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -101,24 +101,6 @@ - - - - - - - - - - - - - - From 21051f94d0c7d008b70c5fbc04a8ff34cc4e1dc8 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 11:06:35 +0530 Subject: [PATCH 042/169] [IMP]base:added a record Line as per suggestion bzr revid: mma@tinyerp.com-20110727053635-hwdqjdl0sy41ddkq --- openerp/addons/base/base_update.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index dc39e14f1cf..e2264950d85 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -256,6 +256,10 @@ - + + + Administration + 1 + From 6e8eddb72860b4380f80d4c848565fca660a9ab0 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 11:14:01 +0530 Subject: [PATCH 043/169] [Usability] Removed the extended filter from the purchase analysis view bzr revid: tta@openerp.com-20110727054401-innr8ziymah0eik3 --- addons/purchase/report/purchase_report_view.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 463f415cc1b..a0779f09a6f 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -81,19 +81,6 @@ - - - - - - - - - - - - - From 2fc547ba37b84df66b7cab969ff31d62dc87763a Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 11:17:23 +0530 Subject: [PATCH 044/169] [Usability] Removed the extended filter from the stock move [view_move_search] search view bzr revid: tta@openerp.com-20110727054723-9uwx3c7ebrpkj2sd --- addons/stock/stock_view.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index f65fdc4056a..c750a642644 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1501,12 +1501,6 @@ - - - - - - From 2d28fb862b94def06b04eff780aec938ce9c0a8b Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 11:20:35 +0530 Subject: [PATCH 045/169] [IMP]all:rename features done bzr revid: mma@tinyerp.com-20110727055035-a8t2sxyuqcpjtsci --- addons/crm/crm_installer.py | 10 +++++----- addons/hr/installer.py | 2 +- addons/sale/sale_installer.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 1ca212d0525..e8d3a22f2b0 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -30,11 +30,11 @@ class crm_installer(osv.osv_memory): 'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."), 'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."), 'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."), - 'crm_caldav': fields.boolean('Synchronization: Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."), - 'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."), - 'fetchmail': fields.boolean('Synchronization: Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."), - 'thunderbird': fields.boolean('Plug-In: Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), - 'outlook': fields.boolean('Plug-In: MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), + 'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."), + 'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity ."), + 'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."), + 'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), + 'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), 'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."), 'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."), } diff --git a/addons/hr/installer.py b/addons/hr/installer.py index 93f920f3cb8..3916acaeb1e 100644 --- a/addons/hr/installer.py +++ b/addons/hr/installer.py @@ -24,7 +24,7 @@ class hr_installer(osv.osv_memory): _inherit = 'base.setup.installer' _columns = { # Human Resources Management - 'hr_holidays': fields.boolean('Holidays / Leaves Management', + 'hr_holidays': fields.boolean('Leaves Management', help="Tracks employee leaves, allocation requests and planning."), 'hr_expense': fields.boolean('Expenses', help="Tracks and manages employee expenses, and can " diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py index fa7dffc9d6d..dcac79270b2 100644 --- a/addons/sale/sale_installer.py +++ b/addons/sale/sale_installer.py @@ -29,12 +29,12 @@ class sale_installer(osv.osv_memory): help="Allows you to compute delivery costs on your quotations."), 'sale_journal': fields.boolean('Invoicing journals', help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."), - 'sale_layout': fields.boolean('Sales Order Layout Improvement', + 'sale_layout': fields.boolean('Sales Orders Print Layout', help="Provides some features to improve the layout of the Sales Order reports."), 'sale_margin': fields.boolean('Margins in Sales Orders', help="Gives the margin of profitability by calculating " "the difference between Unit Price and Cost Price."), - 'sale_order_dates': fields.boolean('Sales Order Dates', + 'sale_order_dates': fields.boolean('Full Dates on Sales Orders', help="Adds commitment, requested and effective dates on Sales Orders."), } From f807bcb9bf479837d316a04cc482c6fb8644ad91 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 11:39:40 +0530 Subject: [PATCH 046/169] [Usability] Removed the extended filter from the stock move [view_move_search_reception_incoming_picking] search view bzr revid: tta@openerp.com-20110727060940-a6mcp7ukuf2dpe2p --- addons/stock/stock_view.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index c750a642644..dfcc5289643 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1687,10 +1687,6 @@ - - - - From 1b6f5702672ccc75b223ecfd68c2a72822afe0bd Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 11:40:46 +0530 Subject: [PATCH 047/169] [Usability] Removed the extended filter from the stock move [view_move_search_reception_outcoming_picking] search view bzr revid: tta@openerp.com-20110727061046-0gqbfwr3wcphz38m --- addons/stock/stock_view.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index dfcc5289643..7da9c260720 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1720,10 +1720,6 @@ - - - - From 98c42b7cbd6b3c44dd810320bed41414b5a6e2db Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 11:53:26 +0530 Subject: [PATCH 048/169] [Usability] Removed the extended filter from the [Inventory Analysis] search view bzr revid: tta@openerp.com-20110727062326-3eqpxjboq0wd5wx0 --- addons/stock/report/report_stock_move_view.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 2b440f900aa..af1e297f8eb 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -211,14 +211,6 @@ - - - - - - - - From 054081e2a8c4afaa98b648373c37eed5482541a8 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 11:54:31 +0530 Subject: [PATCH 049/169] [Usability] Removed the extended filter from the [Project Issues] search view bzr revid: tta@openerp.com-20110727062431-zo3r5jzw1pe03d0s --- addons/project_issue/project_issue_view.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 77acf01e9cb..fcea96d6770 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -225,10 +225,6 @@ - - - - From d45d82cf2761b8fe8e3dafd6391385d8e7801af3 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 12:07:11 +0530 Subject: [PATCH 050/169] [Usability] Removed the extended filter from the [Expenses Analysis] search view bzr revid: tta@openerp.com-20110727063711-o4azypikgi9c6hh9 --- addons/hr_expense/report/hr_expense_report_view.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 623d8a638ec..d388aab8314 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -77,16 +77,6 @@ - - - - - - - - - - From d5bab125f2469355641b6bec64069f65105bd567 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 12:08:13 +0530 Subject: [PATCH 051/169] [Usability] Removed the extended filter from the [Time Sheet Analysis] search view bzr revid: tta@openerp.com-20110727063813-xdzpj9r19kckybvi --- .../hr_timesheet_sheet/report/timesheet_report_view.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index fbe54465bd6..77d0fb53b35 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -78,15 +78,6 @@ - - - - - - - - - From 9b6cc10ff04e5dfdfc943d71f78487fcc2d5883a Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Jul 2011 12:21:36 +0530 Subject: [PATCH 052/169] [Usability] Removed the extended filter from the POS [view_report_pos_order_search] search view bzr revid: tta@openerp.com-20110727065136-79ep7op33eyb1v35 --- addons/point_of_sale/report/pos_order_report_view.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index 759513fd4a1..690f3ed50d9 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -74,10 +74,6 @@ - - - - From dd02c9fdb5a13a455ad862674588b7c0bf10f418 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 12:30:32 +0530 Subject: [PATCH 053/169] [IMP]crm:remove sapce as per suggestion bzr revid: mma@tinyerp.com-20110727070032-08ovpw83tm09txo9 --- addons/crm/crm_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index e8d3a22f2b0..595cfbc2382 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -31,7 +31,7 @@ class crm_installer(osv.osv_memory): 'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."), 'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."), 'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."), - 'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity ."), + 'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."), 'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."), 'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), 'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), From 05b688421af02f0f4415fdde1780f162eb2aa569 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 12:53:28 +0530 Subject: [PATCH 054/169] [IMP]base:added a real data in partners bzr revid: mma@tinyerp.com-20110727072328-lh2756pgi88lt5vi --- .../addons/base/res/partner/partner_demo.xml | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml index 22db92e0c43..0155eb052ad 100644 --- a/openerp/addons/base/res/partner/partner_demo.xml +++ b/openerp/addons/base/res/partner/partner_demo.xml @@ -316,12 +316,12 @@ Louvain-la-Neuve - Thomas Passot + Mediapole sprl 1348 info@mediapole.net (+32).10.45.17.73 - Rue de l'Angelique, 1 + Rue Croisette, 9 @@ -432,29 +432,29 @@ default - Paris + Hong Kong 75016 - - 1 rue Rockfeller - Centrale d'achats 1 + + 8 Finance Street + Centrale d'achats default - Shop 1 - Liege - 6985 - - 2 Impasse de la Soif + Magazin BML + Beijing + 100140 + + 7 Financial Street, Xicheng District default - Shop 2 - Shanghai - 4785552 - - 52 Chop Suey street + Leclerc + La Hulpe + 1310 + + Avenue Reine Astrid 92 @@ -470,44 +470,44 @@ - Liege - Karine Lesbrouffe - 6985 - +33 (0) 2 33 31 22 10 - - 2 Impasse de la Soif + Lausanne + Camptocamp SA + 1015 + +32 81813700 + + Luc Maurer PSE-A, EPFL default - Shanghai - seagate - 4785552 - +33 (0) 2 33 31 22 10 - - 52 Chop Suey street + Cupertino + Seagate Technology + 95014 + + 10200 S. De Anza Blvd default - Alencon - Sebastien Thymbra - 61000 + Bonpland + Thymbra + 1659 contact@syleam.fr - 1 place de l'Église - +33 (0) 2 33 31 22 10 - + Palermo, Capital Federal + C1414CMS Capital Federal + (5411) 4773-9666 + default - Liege - Karine Lesbrouffe - 6985 - contact@tiny.bl + Boston + Tiny Work + 5501 + info@tinyatwork.com +33 (0) 2 33 31 22 10 - - 2 Impasse de la Soif + + One Lincoln Street default From a79f1c67bd0f0a6941018b9be209c111cdf95cdb Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 14:38:02 +0530 Subject: [PATCH 055/169] [IMP]hr_expense:Improvement is done as per suggestion bzr revid: mma@tinyerp.com-20110727090802-eskarem75xfwyf1k --- addons/hr_expense/hr_expense_installer_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml index ec466f37dd2..f93493e94fe 100644 --- a/addons/hr_expense/hr_expense_installer_view.xml +++ b/addons/hr_expense/hr_expense_installer_view.xml @@ -7,7 +7,7 @@ tree - + @@ -23,6 +23,7 @@ form tree,form + [('hr_expense_ok','=',True)] From 348f4693c359b222e2c9b11ff2b7c55713606d6d Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Wed, 27 Jul 2011 14:52:26 +0530 Subject: [PATCH 056/169] filter_management bzr revid: rmu@tinyerp.com-20110727092226-z6vltblzo0hh3i29 --- openerp/addons/base/ir/ir_filters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py index c0a4977f5a0..3cffad737d8 100644 --- a/openerp/addons/base/ir/ir_filters.py +++ b/openerp/addons/base/ir/ir_filters.py @@ -29,9 +29,9 @@ class ir_filters(osv.osv): _name = 'ir.filters' _description = 'Filters' - def copy(self, cr, uid, id, default={}, context={}): + def copy(self, cr, uid, id, default=None, context=None): name = self.read(cr, uid, [id], ['name'])[0]['name'] - default.update({'name': name+ _(' (copy)'), 'events':[]}) + default.update({'name': name+ _(' (copy)')}) return super(ir_filters, self).copy(cr, uid, id, default, context) def get_filters(self, cr, uid, model): @@ -64,8 +64,8 @@ class ir_filters(osv.osv): 'model_id': fields.many2one('ir.model', 'Object', size=64, required=True), } _defaults = { - 'domain': '"[]"', - 'context':'"{}"', + 'domain': '[]', + 'context':'{}', } ir_filters() From fd361f326e1762662130ef86c651bcd48596e269 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Wed, 27 Jul 2011 15:19:53 +0530 Subject: [PATCH 057/169] [IMP]: hr_expense: Minor Improvement in demo bzr revid: rpa@tinyerp.com-20110727094953-l0zx1c3o231xqn1r --- addons/hr_expense/hr_expense_demo.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml index 49afbd8523c..ea19a396b3e 100644 --- a/addons/hr_expense/hr_expense_demo.xml +++ b/addons/hr_expense/hr_expense_demo.xml @@ -27,13 +27,13 @@ - 0.30 - 0.30 + 0.32 + 0.32 consu - Car Travel - CAR + Travel Expenses + TRA From f2d03121ab3cc6b7df09f582505820d4cb511652 Mon Sep 17 00:00:00 2001 From: "Atik Agewan (OpenERP)" Date: Wed, 27 Jul 2011 15:33:12 +0530 Subject: [PATCH 058/169] [IMP] Assosiation: When Assosiation install -project_gtd and hr_expense fields are shown only one time bzr revid: aag@tinyerp.com-20110727100312-ls17y3s9oyxm5lgl --- addons/association/profile_association.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 8a528177a30..605601da739 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -18,7 +18,7 @@ # along with this program. If not, see . # ############################################################################## - +from lxml import etree from osv import fields, osv class profile_association_config_install_modules_wizard(osv.osv_memory): @@ -35,5 +35,24 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): "to keep track of business knowledge and share it with " "and between your employees."), } + + def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + doc = etree.XML(res['arch']) + nodes_gtd = doc.xpath("//field[@name='project_gtd']") + nodes_exp = doc.xpath("//field[@name='hr_expense']") + count_gtd = 0.0 + count_exp = 0.0 + for node in nodes_gtd: + count_gtd = count_gtd + 1 + if count_gtd > 1 : + node.set('invisible', '1') + for node in nodes_exp: + count_exp = count_exp + 1 + if count_exp > 1 : + node.set('invisible', '1') + res['arch'] = etree.tostring(doc) + return res + profile_association_config_install_modules_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2cfaf9dccaabea3d4ead550c55e17c328ffe9b41 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 15:59:07 +0530 Subject: [PATCH 059/169] [IMP]base:Improvement is done bzr revid: mma@tinyerp.com-20110727102907-hgj851tqrc1rub6y --- openerp/addons/base/res/partner/partner_demo.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml index 0155eb052ad..da13ce45015 100644 --- a/openerp/addons/base/res/partner/partner_demo.xml +++ b/openerp/addons/base/res/partner/partner_demo.xml @@ -322,6 +322,7 @@ info@mediapole.net (+32).10.45.17.73 Rue Croisette, 9 + default @@ -474,7 +475,7 @@ Camptocamp SA 1015 +32 81813700 - + Luc Maurer PSE-A, EPFL default @@ -489,10 +490,10 @@ - Bonpland + Buenos Aires Thymbra 1659 - contact@syleam.fr + contact@thymbra.ar Palermo, Capital Federal C1414CMS Capital Federal (5411) 4773-9666 From 0a1054f6c072c1d8b313aa4b24d7b2190a4c49e4 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 17:06:34 +0530 Subject: [PATCH 060/169] [IMP]product:Improvement is done bzr revid: mma@tinyerp.com-20110727113634-awvvlblz2xbbfw1d --- addons/product/product.py | 2 +- addons/product/wizard/product_installer.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index 9deaf3398b1..8e6e132296d 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -266,7 +266,7 @@ class product_template(osv.osv): 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), - 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."), + 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), 'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."), 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."), diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml index aefab59dde8..c35b96caf17 100644 --- a/addons/product/wizard/product_installer.xml +++ b/addons/product/wizard/product_installer.xml @@ -7,8 +7,8 @@ ir.actions.act_window product.product form - form - + tree,form + Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased. From 7a2c4c59a7ac481618b411f9e5c65ca82483c0b3 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 27 Jul 2011 17:48:34 +0530 Subject: [PATCH 061/169] [IMP]base_setup: Label Name Improved in terminology bzr revid: mma@tinyerp.com-20110727121834-o57c5bs8v7a4yhn9 --- addons/base_setup/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 381164e69d0..16bf6cf5555 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -262,7 +262,7 @@ class specify_partner_terminology(osv.osv_memory): ('Guest','Guest'), ('Tenant','Tenant') ], - 'Choose how to call a customer', required=True ), + 'Customer / Partner / Patient ?', required=True ), } _defaults={ 'partner' :'Partner', From e9181a40d5fb562cb3bd5aee234fc3f2c22409ef Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Wed, 27 Jul 2011 17:49:21 +0530 Subject: [PATCH 062/169] [FIX]:fixed ir.rule bzr revid: apa@tinyerp.com-20110727121921-rxkekubawe870adh --- openerp/addons/base/ir/ir.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 68db92a324b..287a8d9f4dc 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -1724,13 +1724,9 @@ - + - - - - From 98a118149f354ff40a02f32fec935a7bb12ff831 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Wed, 27 Jul 2011 17:51:11 +0530 Subject: [PATCH 063/169] [IMP]: improved res_partner_bank view bzr revid: han@tinyerp.com-20110727122111-zw3vp1lu5zsjmj83 --- addons/account/partner_view.xml | 2 +- addons/base_iban/base_iban_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index 461d1fcd45a..b9f825e2a62 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -97,7 +97,7 @@
- + diff --git a/addons/base_iban/base_iban_view.xml b/addons/base_iban/base_iban_view.xml index 00203665c50..0a758e7df1d 100644 --- a/addons/base_iban/base_iban_view.xml +++ b/addons/base_iban/base_iban_view.xml @@ -37,7 +37,7 @@ - + From 1877d5ff583d6ad0174cc3a7b1314571afef8ee5 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Wed, 27 Jul 2011 18:04:44 +0530 Subject: [PATCH 064/169] [FIX]:base:From the modules list, they are too much icons on the right, just keep the icon to install a module (the first one), remove all the others from the list. bzr revid: apa@tinyerp.com-20110727123444-vc7gfynspsc5l0vs --- openerp/addons/base/module/module_view.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index fe5212a561f..8d52ade3a0a 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -157,11 +157,6 @@