Skip to content

erp5
erp5
Commit 65f93d4c authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Merge remote-tracking branch 'origin/master' into rafael

parents f935cb90 c48bf1a6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 574 additions and 462 deletions
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_flat_0_aaaaaa_40x100.png.xml
View file @ 65f93d4c
......@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts88758159.8</string> </value>
<value> <string>ts31202676.8</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -24,10 +24,8 @@
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAACgAAABkCAYAAAD0ZHJ6AAAAe0lEQVRoge3OMQHAIBAAMcC/kjdZ
JHTI0A4XBdkz86wfO18H3hRUBVVBVVAVVAVVQVVQFVQFVUFVUBVUBVVBVVAVVAVVQVVQFVQFVUFV
UBVUBVVBVVAVVAVVQVVQFVQFVUFVUBVUBVVBVVAVVAVVQVVQFVQFVUFVUBVUF8O8A8WdY6opAAAA
AElFTkSuQmCC</string> </value>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAACgAAABkAQMAAADOquA5AAAAA1BMVEWqqqoRfvv5AAAAD0lEQVQY
GWNgGAWjgPoAAAJYAAHlK0hvAAAAAElFTkSuQmCC</string> </value>
</item>
<item>
<key> <string>height</string> </key>
......@@ -39,7 +37,7 @@ AElFTkSuQmCC</string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <long>180</long> </value>
<value> <int>87</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_flat_75_e3eafa_40x100.png.xml
View file @ 65f93d4c
......@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts26729974.89</string> </value>
<value> <string>ts31202666.15</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -24,10 +24,8 @@
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAACgAAABkCAYAAAGDY0LsAAAAnElEQVRoge3XMQqDQBQA0Zj739LO
I9gkdcRCmJ9CfFMu33F2BcVl3fbP68D7uPCgxcWB/HJ6IJevNninQc/aoMEHD15+AYzfmZCQkJCQ
kPDvQh96QkJCQkJCQkJCQkJCQsI7Csf/6KcZ3/E0AisCKwIrAisCKwIrAisCKwIrAisCKwIrAisC
KwIrAisCKwIrAisCKwIrAisCKwIrX1OvG9y6+zfEAAAAAElFTkSuQmCC</string> </value>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAACgAAABkAQMAAADOquA5AAAAA1BMVEXj6vr1J1NHAAAAD0lEQVQY
GWNgGAWjgPoAAAJYAAHlK0hvAAAAAElFTkSuQmCC</string> </value>
</item>
<item>
<key> <string>height</string> </key>
......@@ -39,7 +37,7 @@ KwIrAisCKwIrAisCKwIrAisCKwIrX1OvG9y6+zfEAAAAAElFTkSuQmCC</string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>213</int> </value>
<value> <int>87</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_glass_55_fbf9ee_1x400.png.xml
View file @ 65f93d4c
......@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts88758160.09</string> </value>
<value> <string>ts31202712.72</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -38,7 +38,7 @@ TkSuQmCC</string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <long>120</long> </value>
<value> <int>120</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_glass_65_e3eafa_1x400.png.xml
View file @ 65f93d4c
......@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts26730001.25</string> </value>
<value> <string>ts31202729.64</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -24,9 +24,9 @@
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAAEYXzpNAAAAYElEQVQ4je3UMQ6AMAxD0W+3wP2v
ycJcRVAWuAFqhrI8ZUucSGE/ohsggxYdr1V4qRrcnNTkcXa8LcLWXMlTaXHhWoxrAReP3n0WE998
XlpcWHqfjA22eCpJWOlD/nzJDWKaHoVAKvSFAAAAAElFTkSuQmCC</string> </value>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAP0lEQVQ4je3PIQoAIBBE0T97/5Na
zGJYgyIYzIJMeewPE5ZSewaAMeZbWk8CcqUkQoIQ+5rJkeJYPP/DGHNlALzkCvpHuC1xAAAAAElF
TkSuQmCC</string> </value>
</item>
<item>
<key> <string>height</string> </key>
......@@ -38,7 +38,7 @@ XlpcWHqfjA22eCpJWOlD/nzJDWKaHoVAKvSFAAAAAElFTkSuQmCC</string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>153</int> </value>
<value> <int>120</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/jquery-ui.css.xml
View file @ 65f93d4c
......@@ -31,7 +31,7 @@
<value> <string encoding="cdata"><![CDATA[
/*\n
* jQuery UI CSS Framework 1.8.17\n
* jQuery UI CSS Framework 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -71,7 +71,7 @@
\n
\n
/*\n
* jQuery UI CSS Framework 1.8.17\n
* jQuery UI CSS Framework 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -79,7 +79,7 @@
*\n
* http://docs.jquery.com/UI/Theming/API\n
*\n
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ctl=themeroller&ctl=themeroller&ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=DAE6F6&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=3D6474&fcHeader=222222&iconColorHeader=222222&bgColorContent=E3EAFA&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=3D6474&fcContent=222222&iconColorContent=222222&bgColorDefault=DAE6F6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=3D6474&fcDefault=555555&iconColorDefault=888888&bgColorHover=d0e0f6&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=4589a5&fcHover=212121&iconColorHover=454545&bgColorActive=E3EAFA&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=3D6474&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px\n
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=DAE6F6&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=3D6474&fcHeader=222222&iconColorHeader=222222&bgColorContent=E3EAFA&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=3D6474&fcContent=222222&iconColorContent=222222&bgColorDefault=DAE6F6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=3D6474&fcDefault=555555&iconColorDefault=888888&bgColorHover=d0e0f6&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=4589a5&fcHover=212121&iconColorHover=454545&bgColorActive=E3EAFA&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=3D6474&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px\n
*/\n
\n
\n
......@@ -317,7 +317,7 @@
/* Overlays */\n
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }\n
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*\n
* jQuery UI Resizable 1.8.17\n
* jQuery UI Resizable 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -336,7 +336,7 @@
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }\n
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }\n
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*\n
* jQuery UI Selectable 1.8.17\n
* jQuery UI Selectable 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -346,7 +346,7 @@
*/\n
.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }\n
/*\n
* jQuery UI Accordion 1.8.17\n
* jQuery UI Accordion 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -365,7 +365,7 @@
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }\n
.ui-accordion .ui-accordion-content-active { display: block; }\n
/*\n
* jQuery UI Autocomplete 1.8.17\n
* jQuery UI Autocomplete 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -379,7 +379,7 @@
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */\n
\n
/*\n
* jQuery UI Menu 1.8.17\n
* jQuery UI Menu 1.8.18\n
*\n
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -418,7 +418,7 @@
\tmargin: -1px;\n
}\n
/*\n
* jQuery UI Button 1.8.17\n
* jQuery UI Button 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -426,7 +426,7 @@
*\n
* http://docs.jquery.com/UI/Button#theming\n
*/\n
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */\n
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */\n
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */\n
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */\n
.ui-button-icons-only { width: 3.4em; } \n
......@@ -456,7 +456,7 @@ input.ui-button { padding: .4em 1em; }\n
/* workarounds */\n
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */\n
/*\n
* jQuery UI Dialog 1.8.17\n
* jQuery UI Dialog 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -477,7 +477,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }\n
.ui-draggable .ui-dialog-titlebar { cursor: move; }\n
/*\n
* jQuery UI Slider 1.8.17\n
* jQuery UI Slider 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -500,7 +500,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }\n
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }\n
.ui-slider-vertical .ui-slider-range-max { top: 0; }/*\n
* jQuery UI Tabs 1.8.17\n
* jQuery UI Tabs 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -518,7 +518,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }\n
.ui-tabs .ui-tabs-hide { display: none !important; }\n
/*\n
* jQuery UI Datepicker 1.8.17\n
* jQuery UI Datepicker 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......@@ -585,7 +585,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
width: 200px; /*must have*/\n
height: 200px; /*must have*/\n
}/*\n
* jQuery UI Progressbar 1.8.17\n
* jQuery UI Progressbar 1.8.18\n
*\n
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)\n
* Dual licensed under the MIT or GPL Version 2 licenses.\n
......
bt5/erp5_jquery_ui/bt/change_log
View file @ 65f93d4c
2012-01-16 Kazuhiko
2012-03-08 Kazuhiko
* jquery-ui 1.8.18.
2012-01-16 Kazuhiko
* jquery-ui 1.8.17.
2011-09-07 Kazuhiko
2011-09-07 Kazuhiko
* jquery-ui 1.8.16.
2011-06-23 Kazuhiko
......
bt5/erp5_jquery_ui/bt/description
View file @ 65f93d4c
This Business Template contains only static files of jQuery UI.
Current version is jquery-ui-1.8.17.
This Business Template contains only static files of jQuery UI.
Current version is jquery-ui-1.8.18.
bt5/erp5_jquery_ui/bt/revision
View file @ 65f93d4c
17
\ No newline at end of file
18
\ No newline at end of file
product/ERP5/tests/testSimulationPerformance.py 0 → 100644
View file @ 65f93d4c
# -*- coding: utf-8 -*-
##############################################################################
# Copyright (c) 2012 Nexedi SA and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
import subprocess
import transaction
import unittest
from test import pystone
from time import time
pystone.clock = time
from Products.ERP5Type.tests.runUnitTest import ERP5TypeTestLoader
from Products.ERP5.tests.testTradeModelLine import TestTradeModelLineSale
ERP5TypeTestLoader._testMethodPrefix = 'perf'
class TestSimulationPerformance(TestTradeModelLineSale):
def getTitle(self):
return "Simulation Performance"
def afterSetUp(self):
super(TestSimulationPerformance, self).afterSetUp()
subprocess.call('sync')
def runAlarms(self):
for alarm in self.portal.portal_alarms.objectValues():
if alarm.isEnabled():
endswith = alarm.getId().endswith
if endswith('_builder_alarm'):
alarm.activeSense()
transaction.commit()
self.tic()
def perf_00_setupAndFillCache(self):
self.test_01_OrderWithSimpleTaxedAndDiscountedLines()
self.__class__._order = self['order'].getRelativeUrl()
self.runAlarms()
print "\n%s pystones/second" % pystone.pystones()[1]
def perf_01_invoiceSimpleOrder(self, order_count=1):
start = time()
order = self.portal.unrestrictedTraverse(self._order)
order_list = [self.clone(order) for _ in xrange(order_count)]
for order in order_list:
for line in list(order.getMovementList()):
self.clone(line)
transaction.commit()
self.tic()
for order in order_list:
order.order()
transaction.commit()
self.tic()
for order in order_list:
order.confirm()
transaction.commit()
self.tic()
self.runAlarms()
packing_list_list = sum((order.getCausalityRelatedValueList(
portal_type=self.packing_list_portal_type)
for order in order_list), [])
for packing_list in packing_list_list:
self.packPackingList(packing_list)
transaction.commit()
self.tic()
for packing_list in packing_list_list:
packing_list.start()
transaction.commit()
self.tic()
for packing_list in packing_list_list:
packing_list.stop()
transaction.commit()
self.tic()
self.runAlarms()
invoice_list = sum((packing_list.getCausalityRelatedValueList(
portal_type=self.invoice_portal_type)
for packing_list in packing_list_list), [])
for packing_list in packing_list_list:
packing_list.deliver()
transaction.commit()
self.tic()
for invoice in invoice_list:
invoice.start()
transaction.commit()
self.tic()
for invoice in invoice_list:
invoice.stop()
transaction.commit()
self.tic()
for invoice in invoice_list:
invoice.deliver()
transaction.commit()
self.tic()
self.runAlarms()
end = time()
print "\n%s took %.4gs (%s order(s))" % (self._testMethodName,
end - start, order_count)
def perf_02_invoiceManySimpleOrders(self):
self.perf_01_invoiceSimpleOrder(10)
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestSimulationPerformance))
return suite
product/ERP5OOo/OOoTemplate.py
View file @ 65f93d4c
......@@ -421,11 +421,6 @@ class OOoTemplate(ZopePageTemplate):
doc_type=picture_type,
)
if not (self.content_type.endswith('draw') or
self.content_type.endswith('presentation') or
self.content_type.endswith('writer') or
self.content_type.endswith('text')):
replacement = '<text:p text:style-name="Standard">'+replacement+'</text:p>'
return replacement
xml_doc = etree.XML(text)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7