From 07a7e7c81c6d01e2d9788a80a61ca0a295202db2 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 29 Nov 2012 13:38:31 +0100 Subject: [PATCH 01/15] [FIX] Hide 'Invoice' button on sale.order.line form view. bzr revid: vta@openerp.com-20121129123831-64axxpxficmkyvp7 --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index dd9cfad066a..620f568e968 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -207,7 +207,7 @@
-
+
From b1c8c4439340ee99b5c6b60403d5b9a4489a2ea3 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 29 Nov 2012 13:51:47 +0100 Subject: [PATCH 02/15] [FIX] Show the public_info field in the employees kanban view. bzr revid: vta@openerp.com-20121129125147-4f5rw80kdd1yt7dh --- addons/portal_hr_employees/hr_employee_view.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index 4ffca098c55..c99d6249f2c 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -15,6 +15,8 @@ + + Employees hr.employee @@ -32,10 +34,22 @@ + + HR - Employess Kanban + hr.employee + + + + + Hello + + + + Meet the team hr.employee - + kanban form [('visibility','!=','private')] From 191536962d30f6b62d87457e6113ff3d300e6258 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 29 Nov 2012 13:54:18 +0100 Subject: [PATCH 03/15] [FIX] Hide 'Portal Settings' tab for non group_user. bzr revid: vta@openerp.com-20121129125418-s9jswrsj1sxxgy09 --- addons/portal_event/event_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml index 675bddbc42e..3dec56fa526 100644 --- a/addons/portal_event/event_view.xml +++ b/addons/portal_event/event_view.xml @@ -9,7 +9,7 @@ - + From 63ab1dd18c42de39d9b7959f0354fdcd03a28816 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 29 Nov 2012 14:07:00 +0100 Subject: [PATCH 04/15] [FIX] Fixed context of menu action. bzr revid: vta@openerp.com-20121129130700-r9jy618jmdkwmkuh --- addons/portal_claim/portal_claim_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml index cd0e4941286..83c38b43b4e 100644 --- a/addons/portal_claim/portal_claim_view.xml +++ b/addons/portal_claim/portal_claim_view.xml @@ -8,7 +8,7 @@ form tree,form,calendar - {"search_default_user_id":'', "stage_type":'claim', "portal":'True'} + {"stage_type":'claim', "portal":'True'} current From 99064105fd06b7a85252a71ea4e631290351dcf7 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 29 Nov 2012 14:17:01 +0100 Subject: [PATCH 05/15] [FIX] Now when sending a SO also add as followers all recipients, not only the customer. bzr revid: vta@openerp.com-20121129131701-t8o121dzujs8r2pd --- addons/portal_sale/sale.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/portal_sale/sale.py b/addons/portal_sale/sale.py index aa8b6e57689..79fcbdef6fd 100644 --- a/addons/portal_sale/sale.py +++ b/addons/portal_sale/sale.py @@ -51,8 +51,13 @@ class mail_mail(osv.osv): if mail.model == 'sale.order': so_obj = self.pool.get('sale.order') partner = so_obj.browse(cr, uid, mail.res_id, context=context)['partner_id'] + # Add the customer in the SO as follower if partner.id not in so_obj.browse(cr, uid, mail.res_id, context=context)['message_follower_ids']: so_obj.message_subscribe(cr, uid, [mail.res_id], [partner.id], context=context) + # Add all recipients of the email as followers + for p in mail.partner_ids: + if p.id not in so_obj.browse(cr, uid, mail.res_id, context=context)['message_follower_ids']: + so_obj.message_subscribe(cr, uid, [mail.res_id], [p.id], context=context) return super(mail_mail, self)._postprocess_sent_message(cr, uid, mail=mail, context=context) mail_mail() \ No newline at end of file From f5dffcfd11300f6041cd73bee3b5f8d84b561918 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 29 Nov 2012 15:21:46 +0100 Subject: [PATCH 06/15] [FIX] Fixed type of invoices in online payment. bzr revid: vta@openerp.com-20121129142146-1c8z7zqrsm9icbym --- addons/account/edi/invoice_action_data.xml | 2 +- addons/portal_sale/portal_sale.py | 2 +- addons/portal_sale/portal_sale_data.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml index 7cc4f4978f7..0501c86635b 100644 --- a/addons/account/edi/invoice_action_data.xml +++ b/addons/account/edi/invoice_action_data.xml @@ -49,7 +49,7 @@ % endif

- % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'): + % if object.company_id.paypal_account and object.type in ('out_invoice'): <% comp_name = quote(object.company_id.name) inv_number = quote(object.number) diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py index 818da5e8784..7cda77ed9ea 100644 --- a/addons/portal_sale/portal_sale.py +++ b/addons/portal_sale/portal_sale.py @@ -67,7 +67,7 @@ class account_invoice(osv.Model): result = dict.fromkeys(ids, False) payment_acquirer = self.pool.get('portal.payment.acquirer') for this in self.browse(cr, uid, ids, context=context): - if this.state not in ('draft','done') and not this.reconciled: + if this.type == 'out_invoice' and this.state not in ('draft','done') and not this.reconciled: result[this.id] = payment_acquirer.render_payment_block(cr, uid, this, this.number, this.currency_id, this.residual, context=context) return result diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml index 8239f1cbcca..43d0bba27a3 100644 --- a/addons/portal_sale/portal_sale_data.xml +++ b/addons/portal_sale/portal_sale_data.xml @@ -150,7 +150,7 @@ href="${signup_url}">View Invoice % endif - % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'): + % if object.company_id.paypal_account and object.type in ('out_invoice'): <% comp_name = quote(object.company_id.name) inv_number = quote(object.number) From 5f5f3d99427aa3ff0a6e3e796e987b7b3b20bf12 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 30 Nov 2012 10:45:01 +0100 Subject: [PATCH 07/15] [FIX] Online payment ribbon display conditions. bzr revid: vta@openerp.com-20121130094501-lz430j8fgin9cacj --- addons/portal/acquirer.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/addons/portal/acquirer.py b/addons/portal/acquirer.py index 083a8c93d4f..9c18b597a1b 100644 --- a/addons/portal/acquirer.py +++ b/addons/portal/acquirer.py @@ -71,10 +71,18 @@ class acquirer(osv.Model): return def _wrap_payment_block(self, cr, uid, html_block, amount, currency, context=None): - payment_header = _('Pay safely online') - amount_str = float_repr(amount, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) - currency_str = currency.symbol or currency.name - amount = u"%s %s" % ((currency_str, amount_str) if currency.position == 'before' else (amount_str, currency_str)) + if not html_block: + link = '#action=account.action_account_config' + payment_header = _('You can finish the configuration in the Bank&Cash settings') % link + amount = _('No online payment acquirers configured') + group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id + if any(group.is_portal for group in group_ids): + return '' + else: + payment_header = _('Pay safely online') + amount_str = float_repr(amount, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) + currency_str = currency.symbol or currency.name + amount = u"%s %s" % ((currency_str, amount_str) if currency.position == 'before' else (amount_str, currency_str)) result = """
%s
@@ -93,6 +101,8 @@ class acquirer(osv.Model): return html_forms = [] for this in self.browse(cr, uid, acquirer_ids): - html_forms.append(this.render(object, reference, currency, amount, context=context, **kwargs)) + content = this.render(object, reference, currency, amount, context=context, **kwargs) + if content: + html_forms.append(content) html_block = '\n'.join(filter(None,html_forms)) return self._wrap_payment_block(cr, uid, html_block, amount, currency, context=context) From 34ccbd8d6d9a4fce32e15d2528013ab3e045ebcb Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 30 Nov 2012 12:35:22 +0100 Subject: [PATCH 08/15] [REM] Remove stupid code -_-U. bzr revid: vta@openerp.com-20121130113522-4bpshiltidprwr5c --- addons/portal_hr_employees/hr_employee_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index c99d6249f2c..96b904cbc93 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -40,8 +40,7 @@ - - Hello + From f5bd40cc6c30ff6b23972ee5e7ef7b72d5d3848d Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 30 Nov 2012 13:38:26 +0100 Subject: [PATCH 09/15] [FIX] Fixed issue accessing SO when warehouse module installed. bzr revid: vta@openerp.com-20121130123826-mrrxrvpufdk97mu9 --- addons/portal_sale/security/ir.model.access.csv | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv index c73be67e8c9..5f9ed99ecd9 100644 --- a/addons/portal_sale/security/ir.model.access.csv +++ b/addons/portal_sale/security/ir.model.access.csv @@ -19,3 +19,7 @@ access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,po access_res_partner_category,res.partner.category,base.model_res_partner_category,portal.group_portal,1,0,0,0 access_account_period,account.period,account.model_account_period,portal.group_portal,1,0,0,0 access_account_account,account.account,account.model_account_account,portal.group_portal,1,0,0,0 +access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal,1,0,0,0 +access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal,1,0,0,0 +access_stock_move,stock.move,stock.model_stock_move,portal.group_portal,1,0,0,0 +access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal,1,0,0,0 From c0b2adfb5fb60470c8d67ceed8510c55f38c37da Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 30 Nov 2012 13:42:52 +0100 Subject: [PATCH 10/15] [FIX] Hide 'View Delivery Order' button to portal users. bzr revid: vta@openerp.com-20121130124252-1hge2mo5sz33atlw --- addons/sale_stock/sale_stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml index 4c38e198b60..bebb95f0088 100644 --- a/addons/sale_stock/sale_stock_view.xml +++ b/addons/sale_stock/sale_stock_view.xml @@ -40,7 +40,7 @@