Skip to content

Commit

Permalink
Billing import can now import totals by creating one product line. #368
Browse files Browse the repository at this point in the history
  • Loading branch information
genglert committed Apr 27, 2023
1 parent 5508072 commit 7b0c1f0
Show file tree
Hide file tree
Showing 14 changed files with 1,379 additions and 36 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Users side :
------------
# The version of Django has been upgraded to "4.1".
# The version of Django has been upgraded to "4.2".
# A visitor mode has been added; from any list-view, you can visit all the related detail-views the one after the other.
(button "Enter the exploration mode" in list-views).
# The link in the list-views selectors are now opened in other tabs automatically.
Expand All @@ -24,8 +24,9 @@
* Activities :
- A color field has been added to Status.
* Billing :
- The Product/Service lines can be reordered by drag'n drop.
- The mass-import can now import entities with their totals (a Product line is created).
- A color field has been added to Statuses.
- Billing lines can be reordered if the document have the right permissions.
* Opportunities :
- A color field has been added to SalesPhase.
* Tickets :
Expand Down
12 changes: 6 additions & 6 deletions creme/activities/forms/mass_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
ImportForm4CremeEntity,
)
from creme.creme_core.models import Relation, RelationType
from creme.creme_core.utils import as_int
# from creme.creme_core.utils.dates import make_aware_dt
from creme.persons.models import Civility

Expand All @@ -56,12 +57,11 @@
MAX_RELATIONSHIPS = 5


# TODO: in creme_core ?
def as_int(value, default=0):
try:
return int(value)
except (ValueError, TypeError):
return default
# def as_int(value, default=0):
# try:
# return int(value)
# except (ValueError, TypeError):
# return default


class RelatedExtractor:
Expand Down
Loading

0 comments on commit 7b0c1f0

Please sign in to comment.