From defc239d9537cef4099dcf0a6af0474a3d5358e8 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 26 Jun 2012 16:58:01 +0530 Subject: [PATCH 01/24] [IMP] remove the title "Change my Preferences" And rearrenge fields in preferences bzr revid: fka@tinyerp.com-20120626112801-zw3n8auufwky5a3x --- openerp/addons/base/res/res_users_view.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 82093dadd4b..44e7e77c476 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -202,15 +202,15 @@

() -

+ + + + - Change My Preferences ir.actions.act_window res.users form From a4995d990278432308668325cf6d250257bc1167 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 27 Jun 2012 17:23:20 +0530 Subject: [PATCH 02/24] [IMP] Add name in window bzr revid: kjo@tinyerp.com-20120627115320-ip48sm1g564g6vir --- openerp/addons/base/res/res_users_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 44e7e77c476..edc680a1f22 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -222,6 +222,7 @@ + Change My Preferences ir.actions.act_window res.users form From a7df6d69e06bd9af556529b4d506197ecf14a860 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 27 Jun 2012 17:45:39 +0530 Subject: [PATCH 03/24] [IMP] remove the header tag in company field bzr revid: kjo@tinyerp.com-20120627121539-h46t0kev48tg4fql --- openerp/addons/base/res/res_users_view.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index edc680a1f22..fcb7a5b1a56 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -206,11 +206,8 @@ - From 482b1ce9c6915a860e98d245a00f595c8bf3d340 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 27 Jun 2012 18:46:27 +0530 Subject: [PATCH 04/24] [IMP] set class oe_inline to name bzr revid: kjo@tinyerp.com-20120627131627-1qki2cpf7unxu2ht --- openerp/addons/base/res/res_users_view.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index fcb7a5b1a56..38d7526d6aa 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -198,12 +198,10 @@
-
-

- - () -

-
+

+ + () +

Date: Wed, 4 Jul 2012 14:48:06 +0530 Subject: [PATCH 05/24] [IMP]res_user: remove group string bzr revid: kjo@tinyerp.com-20120704091806-0ie4yp41hvkcn23b --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 38d7526d6aa..7997e476b02 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -202,7 +202,7 @@ () - + From 7bc0699330ba6f477c14b5f5c366ea564ac17c6d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 17 Jul 2012 16:47:33 +0200 Subject: [PATCH 06/24] various improvements bzr revid: mit@openerp.com-20120717144733-jxlf113kuwga98ug --- addons/web/static/src/css/base.css | 26 +++++++++----------- addons/web/static/src/css/base.sass | 19 ++++++-------- addons/web/static/src/xml/base.xml | 4 +-- addons/web_kanban/static/src/css/kanban.css | 6 +++-- addons/web_kanban/static/src/css/kanban.sass | 17 +++++++------ 5 files changed, 33 insertions(+), 39 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c48ab0e3012..0a3d24d41f4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -34,7 +34,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp a { text-decoration: none; @@ -234,14 +234,13 @@ .openerp.ui-dialog .ui-dialog-buttonpane { border-top: 1px solid #e0e0e0; background: #f5f7f9; - padding: 8px; margin: 0; -moz-border-radius: 0 0 2px 2px; -webkit-border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px; } .openerp.ui-dialog .ui-dialog-buttonpane button { - margin-left: 8px; + margin: 0; } .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: left; @@ -1855,9 +1854,12 @@ font-weight: bold; font-size: 18px; } +.openerp .oe_form .oe_subtotal_footer label:after { + content: ":"; +} .openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { font-weight: bold !important; - padding: 2px 8px 2px 0px !important; + padding: 2px 11px 2px 0px !important; } .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; @@ -2061,15 +2063,6 @@ .openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button { display: none; } -.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input { - border-right: none; - -webkit-border-top-right-radius: 0px; - -webkit-border-bottom-right-radius: 0px; - -moz-border-radius-topright: 0px; - -moz-border-radius-bottomright: 0px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; -} .openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button { float: right; -moz-border-radius: 0; @@ -2148,9 +2141,12 @@ } .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { position: absolute; - top: 1px; + top: 2px; right: 0px; } +.openerp .oe_form_field_many2one .oe_m2o_cm_button { + line-height: 14px; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8a2c510ec42..fb67945a02d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -232,11 +232,10 @@ $sheet-max-width: 860px .ui-dialog-buttonpane border-top: 1px solid #e0e0e0 background: #f5f7f9 - padding: 8px margin: 0 @include radius(0 0 2px 2px) button - margin-left: 8px + margin: 0 .ui-dialog-buttonset float: left .ui-dialog-titlebar-close @@ -1444,9 +1443,11 @@ $sheet-max-width: 860px border-top: 1px solid #cacaca font-weight: bold font-size: 18px + label:after + content: ":" label.oe_subtotal_footer_separator font-weight: bold !important - padding: 2px 8px 2px 0px !important + padding: 2px 11px 2px 0px !important label.oe_form_label_help font-weight: normal // no sheet in popups @@ -1610,14 +1611,6 @@ $sheet-max-width: 860px .oe_form_field_with_button.oe_no_button > .oe_button display: none .oe_form_field_with_button:not(.oe_no_button) - input - border-right: none - -webkit-border-top-right-radius: 0px - -webkit-border-bottom-right-radius: 0px - -moz-border-radius-topright: 0px - -moz-border-radius-bottomright: 0px - border-top-right-radius: 0px - border-bottom-right-radius: 0px > .oe_button float: right @include radius(0) @@ -1691,8 +1684,10 @@ $sheet-max-width: 860px position: relative span.oe_m2o_drop_down_button position: absolute - top: 1px + top: 2px right: 0px + .oe_m2o_cm_button + line-height: 14px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2d9caa43bbd..0ade5dd4d89 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -945,9 +945,7 @@ - + /
Date: Tue, 17 Jul 2012 19:30:02 +0200 Subject: [PATCH 07/24] improved task kanban view bzr revid: mit@openerp.com-20120717173002-0m3f3uicefpmcu2l --- addons/project/project_view.xml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 9e4f3c44a27..a70bc504299 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -517,22 +517,16 @@
- i + í
+
- -
- -
+
-
-
- - - - -
+ +
+ + + + 7 + 7 +
From 005f7a3180f03ee03075cb7e5bb46910a8994644 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 17 Jul 2012 19:30:27 +0200 Subject: [PATCH 08/24] improved task kanban view bzr revid: mit@openerp.com-20120717173027-tnpri7yd1jclnufs --- addons/web_kanban/static/src/css/kanban.css | 11 +++++++---- addons/web_kanban/static/src/css/kanban.sass | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 868fa9783fd..36dbab57559 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -402,16 +402,19 @@ top: 2px; } .openerp .oe_kanban_view .oe_kanban_status { + position: relative; + top: 4px; display: inline-block; height: 12px; width: 12px; - margin: 4px auto; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); - -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); + background-position: center center; + background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); } .openerp .oe_kanban_view .oe_kanban_status_green { background: green; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index fb5bdc9dcbb..f4c13cc7bd2 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -338,12 +338,13 @@ top: 2px .oe_kanban_status + position: relative + top: 4px display: inline-block height: 12px width: 12px - margin: 4px auto @include radius(6px) - @include box-shadow(0 1px 3px rgba(0,0,0,0.6)) + @include radial-gradient((#eee 0%, #ccc 40%, #bbb 100%)) .oe_kanban_status_green background: green @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%)) From aad9ce6416a96c8368def382c4ec96aec77a53aa Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 18 Jul 2012 12:17:29 +0200 Subject: [PATCH 09/24] [IMP] added possibility to only highlight the first line in read only m2o bzr revid: nicolas.vanhoren@openerp.com-20120718101729-k1rxexdzozy5cx5i --- addons/web/static/src/js/view_form.js | 15 +++++++++++++-- addons/web/static/src/xml/base.xml | 5 ++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3f389d3d41f..2e404a6bfdd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2739,10 +2739,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc this.$input.val(str.split("\n")[0]); this.current_display = this.$input.val(); } else { - str = _.escape(str).split("\n").join("
"); + var lines = _.escape(str).split("\n"); + var link = ""; + var follow = ""; + if (! this.get_definition_options().highlight_first_line) { + link = lines.join("
"); + } else { + link = lines[0]; + follow = _.rest(lines).join("
"); + if (follow) + link += "
"; + } this.$element.find('a') .unbind('click') - .html(str) + .html(link) .click(function () { self.do_action({ type: 'ir.actions.act_window', @@ -2754,6 +2764,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc }); return false; }); + $(".oe_form_m2o_follow").html(follow); } }, set_value: function(value_) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 70b0cd85cc5..3389e016486 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -943,7 +943,10 @@ - + + + +
@@ -531,19 +540,6 @@
- - - - - ! -
@@ -554,6 +550,12 @@ 7
+
+ + N + + +
From a824028878037b2e1bac655390ea77808feb7c11 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 18 Jul 2012 16:06:13 +0200 Subject: [PATCH 19/24] [IMP] initial mail message sale bzr revid: fp@tinyerp.com-20120718140613-3urmqhtng63lc23f --- addons/sale/sale_data.xml | 26 +++++++++++++++++++++++++ addons/sale/wizard/sale_make_invoice.py | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml index 4622577ac3d..b0fd5ed6d10 100644 --- a/addons/sale/sale_data.xml +++ b/addons/sale/sale_data.xml @@ -26,5 +26,31 @@ + + + Module sale installed! + comment + html + Welcome to OpenERP + Second Line + + +

OpenERP Sale module just installed!

+

+ You can click on the top menu Sales to manage your + customers, your quotations and sales orders. +

+

+ If you need to manage your sales pipeline (leads, + opportunities, phonecalls), you can install the CRM module + from the Settings top menu. +

+ + + + + + + diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 5265afb9bff..b4b3772a91a 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -68,4 +68,4 @@ class sale_make_invoice(osv.osv_memory): sale_make_invoice() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 5510ee74b2f97959d129aa4e45933bd65bd42981 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 18 Jul 2012 16:11:12 +0200 Subject: [PATCH 20/24] [IMP] sale: in customer form, move action 'Quotations and Sales' from contextual menu to button bzr revid: rco@openerp.com-20120718141112-tdw4vb1c2am6rwl3 --- addons/sale/res_partner_view.xml | 34 +++++++++++++++++++++++++++++++- addons/sale/sale_view.xml | 8 -------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index bb5695eac39..9c557620e75 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -1,7 +1,24 @@ - + + Quotations and Sales + sale.order + form + tree,form,graph + {'search_default_partner_id': active_id} + + + This customer has no quotation or sale order. + Click here to create a new quotation. + <p> + The "Quotation" is the first step of the Sales flow. Manage your sales from quotation to invoice. + <p> + You will be able to sell products (manage deliveries) as well as services (create projects). + + + + res.partner.kanban.saleorder.inherit res.partner @@ -18,6 +35,21 @@ + + + res.partner.view.buttons + res.partner + form + + + +