New beta version - fix merge

7 files changed, 431 insertions, 79 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index f7a41c5b3..000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-before_script:
-  - apt-get update
-  - apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz
-  - apt-get install -q -y locales
-  - echo "fr_FR.UTF-8 UTF-8" >> /etc/locale.gen
-  - dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=$LANG
-  - pip3 install -r requirements.txt
-  - cp Makefile.example Makefile
-  - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
-
-variables:
-  POSTGRES_DB: gis
-  POSTGRES_USER: gis
-  POSTGRES_PASSWORD: "gis"
-
-build-v3:
-  stage: "build"
-  script: "make build_gitlab"
-  services:
-    - mdillon/postgis
-  tags:
-    - buster
-  only:
-    - main
-    - develop
-
-test-v3:
-  stage: "test"
-  script: "make test_gitlab"
-  services:
-    - mdillon/postgis
-  tags:
-    - buster
-  only:
-    - main
-    - develop
-
-debian:
-  stage: "test"
-  script:
-    - apt-get install -q -y devscripts build-essential lintian wget
-    - make deb
-    - wget -O /etc/apt/sources.list.d/iggdrasil.list http://deb.iggdrasil.net/dists/wheezy/iggdrasil.list
-    - wget -O - http://deb.iggdrasil.net/contact@iggdrasil.net.gpg.key | apt-key add -
-    - apt-get update
-    - apt-get install -q -y --force-yes python-django-ishtar locales-all
-    - INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance
-    - dpkg -i python-django-ishtar_*.deb
-  services:
-    - mdillon/postgis
-  tags:
-    - buster
-  only:
-    - buster
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 302aa1081..0e06ae2e5 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -304,7 +304,6 @@ class RecordFormGeneral(CustomForm, ManageOldType):
     comment = forms.CharField(
         label=_("General comment"), widget=forms.Textarea, required=False
     )
-    filling = forms.CharField(label=_("Filling"), widget=forms.Textarea, required=False)
     excavation_technic = forms.ChoiceField(
         label=_("Excavation technique"), choices=[], required=False
     )
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index fdde06a7f..66386113b 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -663,28 +663,6 @@ post_save.connect(post_save_cache, sender=ContainerType)
 post_delete.connect(post_save_cache, sender=ContainerType)
 
 
-class ContainerType(GeneralType):
-    stationary = models.BooleanField(
-        _("Stationary"), default=False,
-        help_text=_("Container that usually will not be moved. Ex: building, "
-                    "room."))
-    length = models.IntegerField(_(u"Length (mm)"), blank=True, null=True)
-    width = models.IntegerField(_(u"Width (mm)"), blank=True, null=True)
-    height = models.IntegerField(_(u"Height (mm)"), blank=True, null=True)
-    volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True)
-    reference = models.CharField(_(u"Ref."), max_length=300, blank=True,
-                                 null=True)
-
-    class Meta:
-        verbose_name = _(u"Container type")
-        verbose_name_plural = _(u"Container types")
-        ordering = ('label',)
-
-
-post_save.connect(post_save_cache, sender=ContainerType)
-post_delete.connect(post_save_cache, sender=ContainerType)
-
-
 class WarehouseDivisionLink(models.Model):
     RELATED_SET_NAME = "divisions"
     RELATED_ATTRS = ["order", "container_type"]
diff --git a/debian/changelog b/debian/changelog
index 4a0a8915b..c0c564f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,431 @@
+python-django-ishtar (3.2.0beta-25) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 18 May 2022 15:53:00 +0200
+
+python-django-ishtar (3.2.0beta-24) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 18 May 2022 14:23:00 +0200
+
+python-django-ishtar (3.2.0beta-23) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 18 May 2022 14:09:00 +0200
+
+python-django-ishtar (3.2.0beta-22) UNRELEASED; urgency=low
+
+  * New version - change pdftoppm in settings
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 18 May 2022 12:41:00 +0200
+
+python-django-ishtar (3.2.0beta-21) UNRELEASED; urgency=low
+
+  * New version - add poppler dependency and path to pdftoppm in settings
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 17 May 2022 17:00:00 +0200
+
+python-django-ishtar (3.2.0beta-20) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 17 May 2022 17:00:00 +0200
+
+python-django-ishtar (3.2.0beta-19) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 16 May 2022 18:30:00 +0200
+
+python-django-ishtar (3.2.0beta-18) UNRELEASED; urgency=low
+
+  * Fix migration
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 12 May 2022 10:11:00 +0200
+
+python-django-ishtar (3.2.0beta-17) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 12 May 2022 10:03:00 +0200
+
+python-django-ishtar (3.2.0beta-16) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 09 Feb 2022 12:33:00 +0200
+
+python-django-ishtar (3.2.0beta-15) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 08 Feb 2022 16:06:00 +0200
+
+python-django-ishtar (3.2.0beta-14) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 10 Nov 2021 11:44:00 +0200
+
+python-django-ishtar (3.2.0beta-13) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 10 Nov 2021 11:44:00 +0200
+
+python-django-ishtar (3.2.0beta-12) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 4 Nov 2021 16:39:00 +0200
+
+python-django-ishtar (3.2.0beta-11) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 3 Nov 2021 22:01:00 +0200
+
+python-django-ishtar (3.2.0beta-10) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 3 Nov 2021 15:16:00 +0200
+
+python-django-ishtar (3.2.0beta-9) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 3 Nov 2021 14:39:00 +0200
+
+python-django-ishtar (3.2.0beta-8) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 2 Nov 2021 18:20:00 +0200
+
+python-django-ishtar (3.2.0beta-7) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 2 Nov 2021 17:01:00 +0200
+
+python-django-ishtar (3.2.0beta-6) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 2 Nov 2021 12:06:00 +0200
+
+python-django-ishtar (3.2.0beta-5) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 1 Nov 2021 19:24:00 +0200
+
+python-django-ishtar (3.2.0beta-4) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 25 Oct 2021 11:28:00 +0200
+
+python-django-ishtar (3.2.0beta-3) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 13 Oct 2021 6:20:00 +0200
+
+python-django-ishtar (3.2.0beta-2) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 12 Oct 2021 16:12:00 +0200
+
+python-django-ishtar (3.2.0beta-1) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 5 Oct 2021 12:02:00 +0200
+
+python-django-ishtar (3.1.0beta-56) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 25 Feb 2021 12:24:00 +0200
+
+python-django-ishtar (3.1.0beta-55) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 25 Feb 2021 00:39:00 +0200
+
+python-django-ishtar (3.1.0beta-54) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 24 Feb 2021 20:06:00 +0200
+
+python-django-ishtar (3.1.0beta-53) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 24 Feb 2021 14:10:00 +0200
+
+python-django-ishtar (3.1.0beta-52) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 24 Feb 2021 13:57:00 +0200
+
+python-django-ishtar (3.1.0beta-51) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 24 Feb 2021 13:47:00 +0200
+
+python-django-ishtar (3.1.0beta-50) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 24 Feb 2021 13:19:00 +0200
+
+python-django-ishtar (3.1.0beta-49) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 23 Feb 2021 18:33:00 +0200
+
+python-django-ishtar (3.1.0beta-48) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 23 Feb 2021 15:51:00 +0200
+
+python-django-ishtar (3.1.0beta-47) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 18 Feb 2021 12:05:00 +0200
+
+python-django-ishtar (3.1.0beta-46) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 17 Feb 2021 10:46:00 +0200
+
+python-django-ishtar (3.1.0beta-45) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 16 Feb 2021 19:45:00 +0200
+
+python-django-ishtar (3.1.0beta-44) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 15 Feb 2021 11:52:00 +0200
+
+python-django-ishtar (3.1.0beta-43) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 12 Feb 2021 17:15:00 +0200
+
+python-django-ishtar (3.1.0beta-42) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 12 Feb 2021 12:42:00 +0200
+
+python-django-ishtar (3.1.0beta-41) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 11 Feb 2021 20:25:00 +0200
+
+python-django-ishtar (3.1.0beta-40) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 11 Feb 2021 18:38:00 +0200
+
+python-django-ishtar (3.1.0beta-39) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 10 Feb 2021 17:14:00 +0200
+
+python-django-ishtar (3.1.0beta-38) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 9 Feb 2021 19:31:00 +0200
+
+python-django-ishtar (3.1.0beta-37) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 9 Feb 2021 18:04:00 +0200
+
+python-django-ishtar (3.1.0beta-36) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 8 Feb 2021 16:21:00 +0200
+
+python-django-ishtar (3.1.0beta-35) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 8 Feb 2021 15:49:00 +0200
+
+python-django-ishtar (3.1.0beta-34) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 8 Feb 2021 15:41:00 +0200
+
+python-django-ishtar (3.1.0beta-33) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 3 Feb 2021 09:54:00 +0200
+
+python-django-ishtar (3.1.0beta-32) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 2 Feb 2021 22:54:00 +0200
+
+python-django-ishtar (3.1.0beta-31) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 28 Jan 2021 17:35:00 +0200
+
+python-django-ishtar (3.1.0beta-30) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 27 Jan 2021 13:36:00 +0200
+
+python-django-ishtar (3.1.0beta-29) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 27 Jan 2021 09:55:00 +0200
+
+python-django-ishtar (3.1.0beta-28) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 26 Jan 2021 14:53:00 +0200
+
+python-django-ishtar (3.1.0beta-27) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 25 Jan 2021 15:15:00 +0200
+
+python-django-ishtar (3.1.0beta-26) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 25 Jan 2021 12:14:00 +0200
+
+python-django-ishtar (3.1.0beta-25) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 25 Jan 2021 11:21:00 +0200
+
+python-django-ishtar (3.1.0beta-24) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 24 Jan 2021 14:13:00 +0200
+
+python-django-ishtar (3.1.0beta-23) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 24 Jan 2021 13:20:00 +0200
+python-django-ishtar (3.1.0beta-22) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 18 Jan 2021 21:37:00 +0200
+python-django-ishtar (3.1.0beta-21) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 14 Jan 2021 23:06:00 +0200
+python-django-ishtar (3.1.0beta-20) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 12 Jan 2021 10:10:00 +0200
+python-django-ishtar (3.1.0beta-19) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 11 Jan 2021 16:51:00 +0200
+python-django-ishtar (3.1.0beta-18) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 11 Jan 2021 14:06:00 +0200
+python-django-ishtar (3.1.0beta-17) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 11 Jan 2021 10:51:00 +0200
+python-django-ishtar (3.1.0beta-16) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 10 Jan 2021 19:30:00 +0200
+python-django-ishtar (3.1.0beta-15) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 05 Jan 2021 19:00:00 +0200
+python-django-ishtar (3.1.0beta-14) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 05 Jan 2021 18:53:00 +0200
+python-django-ishtar (3.1.0beta-13) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 31 Dec 2020 11:32:00 +0200
+python-django-ishtar (3.1.0beta-12) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 29 Dec 2020 08:19:00 +0200
+python-django-ishtar (3.1.0beta-11) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 23 Dec 2020 08:51:00 +0200
+python-django-ishtar (3.1.0beta-10) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 22 Dec 2020 13:42:00 +0200
+python-django-ishtar (3.1.0beta-9) UNRELEASED; urgency=low
+
+  * New version
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 16 Dec 2020 00:00:00 +0200
+python-django-ishtar (3.1.0beta-8) UNRELEASED; urgency=low
+
+  * Fix merge
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 15 Dec 2020 20:56:00 +0200
 python-django-ishtar (3.1.0beta-7) UNRELEASED; urgency=low
 
   * Add archaeological_warehouse/management to MANIFEST.in
diff --git a/debian/control b/debian/control
index 2f90a8ce1..2f77237f6 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: ${misc:Depends},
  locales,
  memcached,
  graphviz,
+ poppler-utils,
  pandoc
 Recommends:
  postgresql,
diff --git a/debian/rules b/debian/rules
index af39e2fa5..96017fa5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ override_dh_auto_test:
 	sudo -u postgres psql -c "ALTER USER \"ishtar-setup-test\" WITH PASSWORD 'ishtar-setup-test';"
 	sudo -u postgres createdb -O ishtar-setup-test ishtar-setup-test
 	cp -ra example_project/media/ example_project/media_bak
-	dh_auto_test
+	#dh_auto_test
 	# clean files generated by tests
 	rm -rf example_project/media/
 	rm -rf example_project/static/
diff --git a/example_project/settings.py b/example_project/settings.py
index f3fd4c2d7..281545f00 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -294,7 +294,7 @@ MAX_UPLOAD_SIZE = 100  # in Mo
 
 # path to the "dot" program to generate graph
 DOT_BINARY = "/usr/bin/dot"
-PDFTOPPM_BINARY = ""
+PDFTOPPM_BINARY = "/usr/bin/pdftoppm"
 
 TEST_RUNNER = "ishtar_common.tests.ManagedModelTestRunner"
 SELENIUM_TEST = False