- 06 Oct, 2017 4 commits
-
-
Eteri authored
-
Xueyun Qian authored
-
Xueyun Qian authored
-
Gabriel Monnerat authored
This merge request contains the feature to login in ERP5 with Google Account. Also, this branch is based on the work done in nexedi/erp5!185 We have a lot of discussion about this changes in nexedi/erp5!179, but with a lot of merge conflicts, a new MR is better to review. This branch will wake up the discuss of "Moving API Keys from preference to a better place", I can work on it but I am not sure if we have a good design yet. Any comment is welcome /cc @tb @romain @rafael @kazuhiko @vincent @jerome /reviewed-on nexedi/erp5!219
-
- 05 Oct, 2017 7 commits
-
-
Tomáš Peterka authored
/reviewed-on nexedi/erp5!441
-
Vincent Bechu authored
-
Tomáš Peterka authored
/reviewed-on !444
-
Vincent Bechu authored
-
Vincent Bechu authored
-
Cédric Le Ninivin authored
erp5_trade: Fix Order and Packing List print to use Proxyfields not in Meta forms Hide whitespace change This prevent to have printout failing when erp5_mrp_item is installed as it extends Base_viewTradeFieldLibrary but do not contain the fields for these printouts.
-
Cédric Le Ninivin authored
-
- 04 Oct, 2017 5 commits
-
-
Ayush Tiwari authored
Also, do some trivial cleanup
-
Boxiang Sun authored
/reviewed-on !435
-
Vincent Bechu authored
/reviewed-on !434
-
Tomáš Peterka authored
/reviewed-on nexedi/erp5!432
-
Vincent Pelletier authored
-
- 03 Oct, 2017 18 commits
-
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
Jérome Perrin authored
Rework Balance Sheet and Profit and Loss so that they are more consistent with other reports: - Ability to choose output format and produce in deferred mode - Allow specifying the date range explicitly, for current period and previous period as well. When dates are not specified, the previous behavior of guessing start date and previous date range from accounting periods is kept - Style fixes - Set a filename for *Save as ...* Introduce a new feature on Profit and Loss to allow to have instead of the two column layout (used in France mostly): | INCOME | EXPENSE | |---------|---------| | **1. Revenue** | **1. Operating Expenses** | | - ...... | - ...... | | | - *Cost of Sales* | | | - *Selling, General and Administrative Expenses* | | | - *Other* | | **2. Non Operating Income** | **2. Non Operating Expense** | | - ...... | - ...... | | **3. Interest Income** | **3. Interest Expense** | | - ...... | - ...... | Have a one column layout with intermediate profit/loss calculated for each level ( what I call "british layout" here): | Profit and Loss | |---------| | **1. Operating** | | * *Sales* | | * *Operating Expenses* | | - ...... | | - Cost of Sales | | - Selling, General and Administrative Expenses | | - Other | | **2. Non Operating** | | * *Non Operating Income* | | - ...... | | * *Non Operating Expense* | | - ...... | | 3. **Financial** | | * *Interest Income* | | - ...... | | * *Interest Expense* | | - ...... | This is achieved by putting all that hierarchy in `portal_categories/financial_section/income` and not splitting it in `income` and `expense`. This report will not display `expense` category if it is empty. Still TODO: * [x] updating https://www.erp5.com/erp5-HowTo.Select.Accounting.Financial.Section /reviewed-on nexedi/erp5!284
-
Vincent Bechu authored
-
Vincent Bechu authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
Making "modified_object_list" consistent by always containing tuples and not sometimes lists and sometimes tuples.
-
Ayush Tiwari authored
-
Ayush Tiwari authored
Also, update the files where they have been used
-
Ayush Tiwari authored
Using _getOb is always less costly than getattr, as it reduces the need to look in acquisition.
-
Ayush Tiwari authored
And simplify manage_exportProperties function accordingly
-
Ayush Tiwari authored
Also, we don't need to look for `transactionless` connection-id here, as we don't use them in catalog methods. And, update the files where we can use the new function.
-
Georgios Dagkakis authored
Methods used in PaymentTransactionGroup_view Always returned Accounting Transaction Lines (there is no Payment Transaction Line portal type) that were sub-objects of Payment Transactions. But now they can be also sub-objects of Accounting Transactions. So used '...AccountingTransactionLine...' instead of '...PaymentTransactionLine...'
-
Georgios Dagkakis authored
-
Vincent Pelletier authored
-
Georgios Dagkakis authored
Previously, this could only be node_uid. In future we should find a more generic approach to make this configurable. Also, add two tests to testInventoryAPI to check queries with selection_domain for getInventoryList and getMovementHistoryList.
-
- 02 Oct, 2017 2 commits
-
-
Gabriel Monnerat authored
With this, we can use different glossary terms
-
Gabriel Monnerat authored
-
- 01 Oct, 2017 2 commits
-
-
Gabriel Monnerat authored
-
Gabriel Monnerat authored
erp5_oauth_google_login: Activate google extraction plugin and add assert to check extractCredentials
-
- 29 Sep, 2017 2 commits
-
-
Tomáš Peterka authored
/reviewed-on nexedi/erp5!426
-
Nicolas Wavrant authored
-