From fb08d41118e59835ccec326e7991bc11ba27535c Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Mon, 27 Aug 2012 11:00:40 +0530 Subject: [PATCH 01/95] [IMP]project issue5 bzr revid: pna@tinyerp.com-20120827053040-xq743y0ivvtrfwzc --- .../analytic_contract_project_view.xml | 2 +- addons/project/i18n/project.pot | 2 +- addons/project/project.py | 3 +- addons/project/project_view.xml | 37 +++++++++---------- addons/project/res_config.py | 14 ++++++- addons/project/res_config_view.xml | 4 +- addons/project/security/project_security.xml | 5 +++ addons/project_issue/project_issue_view.xml | 11 +++--- .../project_long_term_view.xml | 4 +- addons/project_mrp/project_procurement.py | 1 + 10 files changed, 51 insertions(+), 32 deletions(-) diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml index 84f01e19643..eb8638a9de7 100644 --- a/addons/analytic_contract_project/analytic_contract_project_view.xml +++ b/addons/analytic_contract_project/analytic_contract_project_view.xml @@ -106,7 +106,7 @@ -
+

You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.
+

From 649cf2e677736471ce45abbd20e1f9234051a9ca Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Thu, 20 Sep 2012 16:55:19 +0200 Subject: [PATCH 92/95] [FIX] fixed message format (wrong number of arguments) bzr revid: olt@tinyerp.com-20120920145519-j842fb8woer25p8i --- openerp/osv/orm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 3eafd247f59..f324ed67522 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -3045,11 +3045,11 @@ class BaseModel(object): cr.commit() if f._type == 'text': # FIXME: for fields.text columns we should try creating GIN indexes instead (seems most suitable for an ERP context) - msg = "Table '%s': Adding (b-tree) index for text column '%s'."\ + msg = "Table '%s': Adding (b-tree) index for %s column '%s'."\ "This is probably useless (does not work for fulltext search) and prevents INSERTs of long texts"\ " because there is a length limit for indexable btree values!\n"\ "Use a search view instead if you simply want to make the field searchable." - _schema.warning(msg, self._table, k, f._type) + _schema.warning(msg, self._table, f._type, k) if res2 and not f.select: cr.execute('DROP INDEX "%s_%s_index"' % (self._table, k)) cr.commit() From db6c61f66687cb64a3b50b62a43dd2f87a3755c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 17:46:45 +0200 Subject: [PATCH 93/95] [FIX] made things more to my taste in hr and chatter's css bzr revid: fva@openerp.com-20120920154645-lctwfo0tbaxsobwg --- addons/hr/static/src/css/hr.css | 2 +- addons/mail/static/src/css/mail.css | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css index eb0728c6f1c..00ef92c0fd8 100644 --- a/addons/hr/static/src/css/hr.css +++ b/addons/hr/static/src/css/hr.css @@ -1,5 +1,5 @@ .oe_employee_vignette { - padding: 8px 0; + padding: 8px 8px; min-height: 100px; } diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 48a178732b0..90e776b5547 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -132,8 +132,6 @@ display: none; white-space: normal; padding: 8px; - background: #eee; - border-top: 1px solid #ccc; } .openerp div.oe_mail_thread_action:after { @@ -201,7 +199,7 @@ .openerp .oe_mail_msg_email { padding: 8px; background: white; - border-top: 1px solid #ccc; + border-top: 1px solid #ebebeb; } .openerp div.oe_mail_thread_subthread .oe_mail_msg_comment { From cf6d39b95dad952e8e8921b87024c0853ce6d12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 17:49:26 +0200 Subject: [PATCH 94/95] [IMP] fixed header overflow, made form lighter bzr revid: fva@openerp.com-20120920154926-47viarlirvbnelky --- addons/web/static/src/css/base.css | 12 ++++++------ addons/web/static/src/css/base.sass | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e80b8c49863..5c43be5b75f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1969,7 +1969,7 @@ padding: 0; } .openerp .oe_form_sheetbg { - padding: 8px 0; + padding: 16px 0; } .openerp .oe_form_sheet_width { min-width: 650px; @@ -1986,10 +1986,10 @@ border-bottom: 1px solid #dddddd; } .openerp .oe_application .oe_form_sheet { - border: 1px solid #afafb6; - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + border: 1px solid #c8c8d3; + -moz-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); + -webkit-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); + box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15); } .openerp .oe_application .oe_form_sheet .ui-tabs { margin: 0 -16px; @@ -2343,7 +2343,7 @@ .openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li { display: inline-block; list-style-type: none; - margin: 0 -20px 0 0; + margin: 0 -18px 0 0; padding: 0; background-color: #fcfcfc; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dd0af89abd2..ffcb8c83cc7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -113,6 +113,7 @@ $sheet-max-width: 860px @keyframes #{$name} @content + // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @mixin text-to-icon($icon-name, $color: #404040) @@ -1560,7 +1561,7 @@ $sheet-max-width: 860px margin: -16px -16px 0 -16px padding: 0 .oe_form_sheetbg - padding: 8px 0 + padding: 16px 0 .oe_form_sheet_width min-width: 650px max-width: $sheet-max-width @@ -1575,8 +1576,8 @@ $sheet-max-width: 860px background: url(/web/static/src/img/form_sheetbg.png) border-bottom: 1px solid #ddd .oe_form_sheet - border: 1px solid $tag-border - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + border: 1px solid #c8c8d3 //$tag-border + @include box-shadow(0 4px 20px rgba(0,0,0,0.15)) .ui-tabs margin: 0 -16px .oe_notebook_page @@ -1868,7 +1869,8 @@ $sheet-max-width: 860px li display: inline-block list-style-type: none - margin: 0 -20px 0 0 + // It is probably a bad idea to modify this margin + margin: 0 -18px 0 0 padding: 0 @include vertical-gradient(#fcfcfc, #dedede) &:first-child .label From 549c99e6eaf7829f8cd2308978f5dfbc71b1fd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 18:22:05 +0200 Subject: [PATCH 95/95] [FIX] basic css of embeded html bzr revid: fva@openerp.com-20120920162205-9w05atal8hu10smu --- addons/web/static/src/css/base.css | 8 ++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5c43be5b75f..1ec0d534607 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2259,6 +2259,14 @@ position: relative; overflow: hidden; } +.openerp .oe_form .oe_form_field_html { + position: relative; + width: 600px; + margin-left: 130px; + margin-top: 32px; + margin-bottom: 32px; + text-align: justify; +} .openerp .oe_form_editable .oe_form .oe_form_field_integer { width: 6em !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ffcb8c83cc7..fc65f260db9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1789,6 +1789,14 @@ $sheet-max-width: 860px > div position: relative overflow: hidden + .oe_form_field_html + position: relative + width: 600px + margin-left: 130px + margin-top: 32px + margin-bottom: 32px + text-align: justify + .oe_form_editable .oe_form .oe_form_field_integer