- 12 Oct, 2015 26 commits
-
-
Jérome Perrin authored
This reverts commit d1b2028e. The report improvements will have to be updated now that this report has been reimplemented
-
Jérome Perrin 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 Conflicts: bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderStatList.xml
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
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
-
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
directly use portal_catalog on select methods instead, see commit 5a0b9189
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Klaus Wölfel authored
-
Rafael Monnerat authored
(cherry picked from commit eed6ff24799a73a63327152a662669ba3ecfc391)
-
Rafael Monnerat authored
(cherry picked from commit d9283f7b85720cbc4f5321dd6bff6e99d078ca2c) Conflicts: bt5/erp5_trade/bt/revision
-
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
Implemented Returned Orders like any other Order. (cherry picked from commit 4a6bc31363a86976d6d8eac8991568cf6f3cd0c9) Conflicts: bt5/erp5_trade/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
-
- 09 Oct, 2015 14 commits
-
-
Cédric Le Ninivin authored
- Dates Are now using ISOString providing efficient sorting as string - modification_date property is not saved on object - Modified conflict_handling parameter to overwrite the remote document with local content (no loss of data) - the three different storage use different local databases
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
Romain Courteaud authored
This caching policy should be the default for any offline webapp, to prevent any mistake done with the html5 cache manifest.
-
Kazuhiko Shiozaki authored
This reapplies commit 648d7020
-
Tristan Cavelier authored
-
Tristan Cavelier authored
-
Jérome Perrin authored
Also enable pretty printing of kw and activity_kw
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
* Use editable fields with `pre` style for listbox columns * Display h:m along with start date
-