Skip to content

Commit ec8ae88

Browse files
committed
Merge PR #80 into 18.0
Signed-off-by pedrobaeza
2 parents b55e6ff + 5dcc8d0 commit ec8ae88

16 files changed

+22
-431
lines changed

spreadsheet_dashboard_oca/data/spreadsheet_spreadsheet_import_mode.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
<field name="sequence" eval="20" />
1010
<field name="group_ids" eval="[(4, ref('base.group_system'))]" />
1111
</record>
12-
<record
13-
id="spreadsheet_import_mode_dashboard_sheet"
14-
model="spreadsheet.spreadsheet.import.mode"
15-
>
16-
<field name="code">dashboard_sheet</field>
17-
<field name="name">To dashboard new sheet</field>
18-
<field name="sequence" eval="21" />
19-
<field name="group_ids" eval="[(4, ref('base.group_system'))]" />
20-
</record>
2112
<record
2213
id="spreadsheet_import_mode_dashboard_new_spreadsheet"
2314
model="spreadsheet.spreadsheet.import.mode"

spreadsheet_dashboard_oca/wizards/spreadsheet_spreadsheet_import.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ def _insert_pivot_dashboard_spreadsheet(self):
2525
import_data["new"] = 1
2626
if self.dynamic:
2727
import_data["dyn_number_of_rows"] = self.number_of_rows
28-
if self.dynamic_cols:
29-
import_data["dyn_number_of_cols"] = self.number_of_cols
3028
return {
3129
"type": "ir.actions.client",
3230
"tag": "action_spreadsheet_oca",
@@ -37,14 +35,11 @@ def _insert_pivot_dashboard_spreadsheet(self):
3735
},
3836
}
3937

40-
def _insert_pivot_dashboard(self, new_sheet=False):
38+
def _insert_pivot_dashboard(self):
4139
import_data = self.import_data
4240
import_data["name"] = self.datasource_name
43-
import_data["new_sheet"] = new_sheet
4441
if self.dynamic:
4542
import_data["dyn_number_of_rows"] = self.number_of_rows
46-
if self.dynamic_cols:
47-
import_data["dyn_number_of_cols"] = self.number_of_cols
4843
return {
4944
"type": "ir.actions.client",
5045
"tag": "action_spreadsheet_oca",
@@ -54,6 +49,3 @@ def _insert_pivot_dashboard(self, new_sheet=False):
5449
"import_data": import_data,
5550
},
5651
}
57-
58-
def _insert_pivot_dashboard_sheet(self):
59-
return self._insert_pivot_dashboard(True)

spreadsheet_oca/README.rst

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.. image:: https://odoo-community.org/readme-banner-image
2-
:target: https://odoo-community.org/get-involved?utm_source=readme
3-
:alt: Odoo Community Association
4-
51
===============
62
Spreadsheet Oca
73
===============
@@ -17,7 +13,7 @@ Spreadsheet Oca
1713
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1814
:target: https://odoo-community.org/page/development-status
1915
:alt: Beta
20-
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
16+
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
2117
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
2218
:alt: License: AGPL-3
2319
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fspreadsheet-lightgray.png?logo=github
@@ -88,44 +84,6 @@ Usage
8884
of ``account.account`` model. (``income``, ``asset_receivable``,
8985
etc.)
9086

91-
**Create a new dynamic spreadsheet from pivot**
92-
-----------------------------------------------
93-
94-
- Go to any pivot
95-
- Press on insert button
96-
- Select the dynamic rows or dynamic columns option and set a number of
97-
rows/columns
98-
99-
A new table that will be updated with the actual or filtered values will
100-
be added.
101-
102-
- Note: When a pivot has multiple levels of aggrupations in the rows or
103-
the columns, the number of rows/columns selected will be transfered to
104-
each level.
105-
106-
Example: number of groups -> 2 number of rows -> 3
107-
108-
- val1
109-
110-
- subval1.1
111-
- subval1.2
112-
- subval1.3
113-
114-
- val2
115-
116-
- subval2.1
117-
- subval2.2
118-
- subval2.3
119-
120-
- val3
121-
122-
- subval3.1
123-
- subval3.2
124-
- subval3.3
125-
126-
https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/Hhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ehttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/rhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ehttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ihttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/shttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ahttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/vhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ihttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/shttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/uhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ahttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/lhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ehttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/xhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ahttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/phttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/lhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ehttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ohttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/fhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/uhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/shttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ehttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/:https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/.https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/.https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/fhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ihttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ghttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/uhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/rhttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/ehttps://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/:https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/:https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/
127-
https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/../static/description/spreadsheetdynamic_table.gif
128-
12987
.. |image1| image:: https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/static/description/spreadsheet_create.png
13088
.. |image2| image:: https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/static/description/spreadsheet_edit.png
13189
.. |image3| image:: https://raw.githubusercontent.com/OCA/spreadsheet/18.0/spreadsheet_oca/static/description/o-spreadsheet.png
@@ -137,17 +95,6 @@ If you want to develop custom business functions, you can add others,
13795
based on the file
13896
https://github.com/odoo/odoo/blob/16.0/addons/spreadsheet_account/static/src/accounting_functions.js
13997

140-
Known issues / Roadmap
141-
======================
142-
143-
Adding new lines on pivot tables
144-
--------------------------------
145-
146-
When we add a pivot table, the number of rows is predefined according to
147-
the current data.
148-
149-
In order to add new rows, we need to reinsert the pivot table.
150-
15198
Bug Tracker
15299
===========
153100

spreadsheet_oca/__manifest__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
"spreadsheet_oca/static/src/spreadsheet/bundle/odoo_panels.esm.js",
4747
"spreadsheet_oca/static/src/spreadsheet/bundle/chart_panels.esm.js",
4848
"spreadsheet_oca/static/src/spreadsheet/bundle/chart_panel.esm.js",
49-
"spreadsheet_oca/static/src/spreadsheet/utils/dynamic_generators.esm.js",
50-
"spreadsheet_oca/static/src/pivot/pivot_table.esm.js",
5149
],
5250
},
5351
}

spreadsheet_oca/data/spreadsheet_spreadsheet_import_mode.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,4 @@
1818
<field name="sequence" eval="15" />
1919
<field name="group_ids" eval="[(4, ref('spreadsheet_oca.group_user'))]" />
2020
</record>
21-
<record
22-
id="spreadsheet_import_mode_add_sheet"
23-
model="spreadsheet.spreadsheet.import.mode"
24-
>
25-
<field name="code">add_sheet</field>
26-
<field name="name">Add sheet to spreadsheet</field>
27-
<field name="sequence" eval="16" />
28-
<field name="group_ids" eval="[(4, ref('spreadsheet_oca.group_user'))]" />
29-
</record>
3021
</odoo>

spreadsheet_oca/readme/ROADMAP.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

spreadsheet_oca/readme/USAGE.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,3 @@
3737
> - `ODOO.ACCOUNT.GROUP(type)`: Returns the account ids of a given
3838
> group where type should be a value of the `account_type` field of
3939
> `account.account` model. (`income`, `asset_receivable`, etc.)
40-
41-
## **Create a new dynamic spreadsheet from pivot**
42-
43-
- Go to any pivot
44-
- Press on insert button
45-
- Select the dynamic rows or dynamic columns option and set a number of
46-
rows/columns
47-
48-
A new table that will be updated with the actual or filtered values will
49-
be added.
50-
51-
- Note: When a pivot has multiple levels of aggrupations in the rows or
52-
the columns, the number of rows/columns selected will be transfered to
53-
each level.
54-
55-
Example: number of groups -\> 2 number of rows -\> 3
56-
57-
- val1
58-
- subval1.1
59-
- subval1.2
60-
- subval1.3
61-
- val2
62-
- subval2.1
63-
- subval2.2
64-
- subval2.3
65-
- val3
66-
- subval3.1
67-
- subval3.2
68-
- subval3.3
69-
70-
Here is a visual exaple of use: .. figure::
71-
../static/description/spreadsheetdynamic_table.gif

0 commit comments

Comments
 (0)