- 06 Apr, 2020 38 commits
-
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
import from production
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
changed caused by : 9e530f6a
-
Xiaowu Zhang authored
testBPMCore: update test for 9e530f6a
-
Xiaowu Zhang authored
payment condition is added by 647142e5
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Jérome Perrin authored
Because we often want to manage those through simulation.
-
Jérome Perrin authored
For consistency with all other default builders
-
Jérome Perrin authored
index we have a scriptable key for title_or_reference : from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery query = ComplexQuery( Query(title=value), Query(reference=value), operator="OR") return query
-
Klaus Wölfel authored
Add "planned" state to Purchase/Sale Packing Lists so that builders first build planned deliveries. Then if there is no expected additional movement, the delivery is automatically moved to "confirmed". This allows to support partial build that could come with global builders. Now builders will complete only "planned" deliveries. This also solve the split of packing list when the same date was used, the builder was updating current delivery. Now we can change packing list only in confirmed state (not in planned state), therefore the builder will never add movement to the delivery the user is changing. This was adapted from seb commit to project repo. The difference is that here we do not confirm if related movements belong to more then one root delivery value (packing list). This way we try to handle the case of multiple split on the same date where the user first splits a packing list and then splits again. In this case we want these splitted movements end up in the same packing list, so the created packing list still has to be able to receive new movements, it is thus kept in planned state. The user then hast to confirm this packing list manually.
-
Jérome Perrin authored
-
Klaus Wölfel authored
Conflicts: bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_viewPDMFieldLibrary.xml
-
Klaus Wölfel authored
- Optionally group by function - Give higher priority to Order Report compared to Workflow Report - Optionally filter by Quantity Unit and enable Stat Columns for Quantity TODO: Quantity also for Thirs Party if filtered by quantity Unit
-
Klaus Wölfel authored
-
Klaus Wölfel authored
erp5_trade: Temporarly Revert "stop copying (deprecated) Payment Condition documents from Trade Condition to Order, and from Order to Packing List." This reverts commit eb5fdbe3. Conflicts: bt5/erp5_trade/bt/revision product/ERP5/tests/testTradeCondition.py
-
Rafael Monnerat authored
And merged with 5c09e2e2
-
Klaus Wölfel authored
1. upgrade epos-print 2: print with html5 canvas to support chinese characters
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Rafael Monnerat authored
(cherry picked from commit eed6ff24799a73a63327152a662669ba3ecfc391)
-
Xiaowu Zhang authored
-
Rafael Monnerat authored
Added aggregate item and item creations actions on new portal types. (cherry picked from commit a32a565f2e4921c087803aa526bca8c853e18887) Conflicts: bt5/erp5_item/bt/revision
-
Rafael Monnerat authored
Introduce temp_object parameter on builder.build() and propagate it over until the newContent() calls. This change allow use create Temporary Documents intestead real ones, like a "preview". (cherry picked from commit 959776ce50c2e7ee2b8f9945ec91a2e0fbe08619) Conflicts: product/ERP5/Document/SimulatedDeliveryBuilder.py
-
- 07 Feb, 2020 2 commits
-
-
Jérome Perrin authored
Since 264ded5c in ERP5JS we render the form directly after a successful edit, but this was done sometimes too early, namely, the next form was rendered before interaction workflows and this leads to problems like the ones discussed in !982 (comment 92893) /reviewed-on !1040
-
Jérome Perrin authored
This test click on the delete button which deletes by an ajax request and immediatly after open the "wait for activities" page. Sometimes the second request starts before the first is committed, so there are no activities to wait for. When using ZServer, we had only one worker thread, so this was not visible, but with wsgi we have more than one so it happened sometimes. Use an old jQuery trick to wait that the first request is no longer in flight. /reviewed-on nexedi/erp5!1038
-