- 02 May, 2017 39 commits
-
-
Jérome Perrin authored
ERP5ExternalOauth2ExtractionPlugin: document a bit how this plugin and ERP5LoginUserManager interact
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
erp5_oauth_google_login: Zope user should not see this action because to create a Google login is required that a person in ERP5 exists
-
Gabriel Monnerat authored
We are expecting user_id instead of username
-
Gabriel Monnerat authored
erp5_oauth_google_login: s/erp5_username/user_id/g to be with consistent with Base_getUserValueByUserId
-
Gabriel Monnerat authored
ERP5ExternalOauth2ExtractionPlugin: Fix query to find logins properly. It should be squashed in 4089f516
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
login_form: Use ERP5Site_getAvailableOAuthLoginList to know if google login is supported or not. With this, we can extend to other oauth easily
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
erp5_credential: Add link to login in ERP5 with Google Account and use zocial.min.css to display it nicely
-
Gabriel Monnerat authored
erp5_xhtml_style: Add link to login in ERP5 with Google Account and use zocial.min.css to display it nicely Add margin-top to display zocial buttons not too close from other buttons or links
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
Google Login follow the same implementation of ERP5 Login(subobject of Person) and with an action in preferences, the user can add Google Login to his person.
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
-
Jérome Perrin authored
instead of implementing this logic in ZSQL's DTML
-
Jérome Perrin authored
cf 2c54e0f5
-
Jérome Perrin authored
Revert "erp5_calendar: Update stop_date, otherwise it can stay in the past and generate wrong duration (stop_date - start_date)" This reverts commit 6af8eca1f4d7fbdd29cd001b1c5a7d4d03b51990.
-
Jérome Perrin authored
-
Jérome Perrin authored
SimulationTool_zGetInterpolationMethod is called in restricted context of Resource_zGetMovementHistoryList so it needs to be usable by anonymous. ZSQL Method does not read parameters from REQUEST, so it looks safe.
-
Gabriel Monnerat authored
erp5_calendar: Update stop_date, otherwise it can stay in the past and generate wrong duration (stop_date - start_date)
-
Gabriel Monnerat authored
With this, we accept users with permission to Modify portal content or Associate role
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
With this, change we accept users with permission to Modify portal content or Associate role
-
Jérome Perrin authored
jerome/erp5!6 rebased and in a big commit so that we can start using that SimulationTool: implement "linear" flow API Conflicts: product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml testInventoryAPI: silent pyflakes warnings more interpolation implementation inventory_list interpolation flow: support at_date & to_date more and more interpolation API interpolation interpolation group_by_time_sequence_list testInventoryAPI: move inventory valuation methods in a dedicated test class This should not be in test inventory list. test: move Tracking API to a dedicated test module inventory api: dirty way of disabling cache if keys such as node_category are used. interpolation: security on SimulationTool_zGetInterpolationMethod
-
Jérome Perrin authored
We should be able to configure a group calendar saying that the pattern is "from 9:00 to 12:00, repeat every monday morning" with a group calendar assignment saying "use this pattern from 01/01/2016 until 31/12/2016" and then create another group calendar assignment for 2017 without having to change the periodicity stop date on all presence periods of the group calendar. I think it should repeat from group calendar assignment's start date until min(group calendar assignment's stop date, presence period's periodicity stop date). (cherry picked from commit b42a9c112d59454a42c0b5a0fd62d71a7fcd4202)
-
Jérome Perrin authored
- update PresencePeriod.getNextPeriodicalDate with fixes from 6155f7ff - do not use addToDate, but simply DateTime arithmetics that unlike addToDate, works correctly (cherry picked from commit 30e2c1f6cb55ae3dfc4d8c83911b53f38a6cc36d)
-
Jérome Perrin authored
-
Jérome Perrin authored
because Domain.getRelativeUrl (and Category.getRelativeUrl) cannot be restrictedTraverse'd
-
Jérome Perrin authored
Workaround for bug #20160120-1805D22
-
Jérome Perrin authored
The real motivation was to make sure that search match is displayed when searching with Ctrl+F / Ctrl+G Conflicts: bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml
-
Jérome Perrin authored
codemirror: display an animation in window title so that the window flash when component has been saved. Use case: save component on one tab, go to "run live test" tab and wait for component to be saved to make sure code runs with latest version Conflicts: bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml
-
Jérome Perrin authored
-
Jérome Perrin authored
This is probably incorrect. I believe ERP5ShortMessage's message_type handling has to be refactored. I guess this should not be part of the send API but be a property set on the gateway instance in portal_sms
-
Jérome Perrin authored
-
Jérome Perrin authored
Only mobyt support this parameter, so this break the compatibility with essendex
-
Jérome Perrin authored
-
Nicolas Wavrant authored
Payroll related document classes (AnnotationLine, PaySheetLine, PaySheetTransactionLine, PaySheetCell) are not different from Invoice-related classes. This work aims to remove these document classes and base the portal types on the generic invoice classes. This work started after finding out that Pay Sheet Lines were appearing in the "Account Statement" report, on side of Pay Sheet Transaction Lines. This happened as PaySheetLines is overiding the "isAccountable" method to return True. This merge request, besides removing duplicate code, fixes the accountable property of Pay Sheet Lines, and updates the call to the inventory API to generate correct accounting/payroll reports. /reviewed-on !223
-
- 01 May, 2017 1 commit
-
-
Jérome Perrin authored
93e30e5e introduce a new `user` table that is listed as a *search table*, so until this table is created all catalog queries are failing, and alarm tool, which relies on catalog fail with such a traceback: ``` ERROR TimerService Process timer error Traceback (most recent call last): File "parts/erp5/product/TimerService/TimerService.py", line 102, in process_timer DateTime(prev_tick), DateTime(next_tick)) File "parts/erp5/product/ERP5/Tool/AlarmTool.py", line 175, in process_timer self.tic() File "parts/erp5/product/ERP5/Tool/AlarmTool.py", line 135, in tic for alarm in self.getAlarmList(to_active=1): File "parts/erp5/product/ERP5/Tool/AlarmTool.py", line 111, in getAlarmList alarm_date={'query':now,'range':'ngt'} File "parts/erp5/product/ERP5Catalog/CatalogTool.py", line 702, in unrestrictedSearchResults return ZCatalog.searchResults(self, **kw) File "parts/erp5/product/ZSQLCatalog/ZSQLCatalog.py", line 1091, in searchResults return catalog.searchResults(REQUEST, **kw) File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2585, in searchResults **kw File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2554, in queryResults **kw File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2418, in buildSQLQuery ignore_unknown_columns=ignore_unknown_columns, File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2394, in buildEntireQuery query=self.buildQuery(kw, ignore_empty_string=ignore_empty_string, ignore_unknown_columns=ignore_unknown_columns), File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2295, in buildQuery result = self.buildSingleQuery(key, value) File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2087, in buildSingleQuery search_key, related_key_definition = self.getColumnSearchKey(key, search_key_name) File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 2049, in getColumnSearchKey related_key_definition = self.getRelatedKeyDefinition(key) File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 1999, in getRelatedKeyDefinition for entire_definition in self.getSQLCatalogRelatedKeyList([key]): File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 1935, in getSQLCatalogRelatedKeyList column_map = self._getSQLCatalogRelatedKeySet() File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 130, in wrapper result = transactional_cache[cache_id] = method(wrapped_self) File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 1908, in _getSQLCatalogRelatedKeySet column_map = self.getColumnMap() File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 130, in wrapper result = transactional_cache[cache_id] = method(wrapped_self) File "parts/erp5/product/ZSQLCatalog/SQLCatalog.py", line 1146, in getColumnMap for field in table_dict[table]: KeyError: 'user' ``` This means that even if upgrader's post upgrade constraint are supposed to fix this by calling `portal_catalog.upgradeSchema`, because this constraint rely on alarm tool, it's already too late. The suggested way to fix this is to also call [`portal_catalog.upgradeSchema`](https://lab.nexedi.com/nexedi/erp5/blob/c99fb9163503c5afdef59ecb124b3060b05330a4/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/TemplateTool_checkTableConsistency.py#L7) in the same transaction that the transaction upgrading business templates. I have not completely removed `TemplateToolTableConsistencyConstraint`, because maybe there will be cases where just call post upgrade alarm to execute data migration steps after installing a business template manually. But you guys think it's better to completely merge `TemplateToolTableConsistencyConstraint` with `TemplateToolBusinessTemplateInstallationConstraint` I would be OK with that too. Of course, we cannot just make `TemplateToolTableConsistencyConstraint` an `upgrade` constraint, because there would be no guarantee that it's called after `TemplateToolBusinessTemplateInstallationConstraint`. Also, I have not considered making [`getColumnMap` and friends](https://lab.nexedi.com/nexedi/erp5/blob/master/product/ZSQLCatalog/SQLCatalog.py#L1142) resilient to the case where a table listed in search tables does not exist, because it's would just have been failing later anyway and it's better to fail early in such case. cc: @vpelletier @jm @seb @tiwariayush @gabriel /reviewed-on nexedi/erp5!247
-