Merge #3530 #3537

3530: Update snyk to the latest version 🚀 r=jniles a=greenkeeper[bot]


## The dependency [snyk](https://github.com/snyk/snyk) was updated from `1.120.1` to `1.121.0`.
This version is **not covered** by your **current version range**.

If you don’t accept this pull request, your project will work just like it did before. However, you might be missing out on a bunch of new features, fixes and/or performance improvements from the dependency update.

---

<details>
<summary>Release Notes for v1.121.0</summary>

<h1><a href="https://urls.greenkeeper.io/snyk/snyk/compare/v1.120.1...v1.121.0">1.121.0</a> (2019-01-08)</h1>
<h3>Features</h3>
<ul>
<li>Split dockerfile / base image vulns (<a href="https://urls.greenkeeper.io/snyk/snyk/commit/b2f530d">b2f530d</a>)</li>
</ul>
</details>

<details>
<summary>Commits</summary>
<p>The new version differs by 4 commits.</p>
<ul>
<li><a href="https://urls.greenkeeper.io/snyk/snyk/commit/ecac358cc1da7cee3715e709cfa368838c598af6"><code>ecac358</code></a> <code>Merge pull request #313 from snyk/feat/docker-split-user-base-vulns</code></li>
<li><a href="https://urls.greenkeeper.io/snyk/snyk/commit/b2f530db922c85eed0de6139512e6eb83cb174fa"><code>b2f530d</code></a> <code>feat: Split dockerfile / base image vulns</code></li>
<li><a href="https://urls.greenkeeper.io/snyk/snyk/commit/5f6083bb2f4dd80ecd7a3f4f7c8a16aa00f7eb58"><code>5f6083b</code></a> <code>Merge pull request #321 from snyk/chore/disable-lockfile-creation</code></li>
<li><a href="https://urls.greenkeeper.io/snyk/snyk/commit/95be92c862655fdda539056893336c4eb05582e3"><code>95be92c</code></a> <code>chore: Disable lockfile creation</code></li>
</ul>
<p>See the <a href="https://urls.greenkeeper.io/snyk/snyk/compare/5938f576c782762d1cbaa9cd4d10afa7dde3b91b...ecac358cc1da7cee3715e709cfa368838c598af6">full diff</a></p>
</details>

<details>
  <summary>FAQ and help</summary>

  There is a collection of [frequently asked questions](https://greenkeeper.io/faq.html). If those don’t help, you can always [ask the humans behind Greenkeeper](https://github.com/greenkeeperio/greenkeeper/issues/new).
</details>

---


Your [Greenkeeper](https://greenkeeper.io) bot 🌴



3537: fix(journal): preserve trans_id_reference_number r=jniles a=jniles

We now remember the trans_id_reference_number when we create new lines in a transaction.  This means we no longer error when trying to add new lines to a transaction.

Note that we still need to add a test.

Partially addresses #3536.

Co-authored-by: greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>

client/src/modules/journal/modals/editTransaction.modal.js

@@ -399,6 +399,7 @@ function JournalEditTransactionController(
     const columns = [
       'hrRecord', 'record_uuid', 'project_name', 'trans_id', 'transaction_type_id', 'display_name', 'trans_date',
       'project_id', 'fiscal_year_id', 'currency_id', 'user_id', 'posted', 'period_id', 'description',
+      'trans_id_reference_number',
     ];
 
     // for some reason no data has been passed in, no shared attributes are possible

package.json

@@ -115,7 +115,7 @@
     "mz": "^2.7.0",
     "ngstorage": "gsklee/ngStorage#0.3.11",
     "q": "~1.5.0",
-    "snyk": "1.120.1",
+    "snyk": "1.121.0",
     "stream-to-promise": "^2.2.0",
     "tempy": "^0.2.1",
     "ui-select": "angular-ui/ui-select#0.17.1",

server/controllers/finance/journal/index.js

@@ -129,7 +129,7 @@ function buildTransactionQuery(options, posted) {
       BUID(p.reference_uuid) AS reference_uuid, dm2.text AS hrReference,
       p.comment, p.transaction_type_id, p.user_id, p.cc_id, p.pc_id, pro.abbr,
       pro.name AS project_name, tp.text AS transaction_type_text,
-     a.number AS account_number, a.label AS account_label,
+      a.number AS account_number, a.label AS account_label, p.trans_id_reference_number,
       u.display_name ${includeExchangeRate}
     FROM ${table} p
       JOIN project pro ON pro.id = p.project_id

yarn.lock

@@ -7997,10 +7997,10 @@ snyk-config@2.2.0:
     lodash "^4.17.5"
     nconf "^0.10.0"
 
-snyk-docker-plugin@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.14.0.tgz#4f79a102908450bf32ff6db8391a72897d3eb8f1"
-  integrity sha512-bmhKHGwm0CIVOJD98uIuqGACbsuqjlwnj/Ybek+nlZowLqHyjhOUYQISPzjIwWbF1wpYf4Av6MzbCx9HsNPFIg==
+snyk-docker-plugin@1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.17.0.tgz#19f3d0dd4e05740d77662e2879603fdf3cf31f58"
+  integrity sha512-bRY8v9nieRWke4i3/KCFnAE0OCUcvN+v4cyZxecdULBwug+KmF1eOzofgatIJT4O58fqIoa+GCAzXxO+d0H0/A==
   dependencies:
     debug "^3"
     dockerfile-ast "0.0.12"
@@ -8140,10 +8140,10 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1:
     lru-cache "^4.0.0"
     then-fs "^2.0.0"
 
-snyk@1.120.1:
-  version "1.120.1"
-  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.120.1.tgz#17d371332b8e90f7183d29f4904000ee343ab86b"
-  integrity sha512-77O0QEm4GHRkWiN65uMU1bS8SZ7nsBMeNqrwODNLwTJypJlZPSVXp6drtjgrTTrS7vZAaylif5xsvwMODKkg+w==
+snyk@1.121.0:
+  version "1.121.0"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.121.0.tgz#ce34be37ba3d9c4de42136be322cafcce682bbca"
+  integrity sha512-2VhONL6A0SuJt6F6sYj9iwnxuRhed/bCBHYRMlHzUz0YPBWzlRABaLQ2bRoufH++5y5yLmwyZM0adBAomWiLuQ==
   dependencies:
     "@snyk/dep-graph" "1.1.2"
     "@snyk/gemfile" "1.1.0"
@@ -8163,7 +8163,7 @@ snyk@1.120.1:
     recursive-readdir "^2.2.2"
     semver "^5.5.0"
     snyk-config "2.2.0"
-    snyk-docker-plugin "1.14.0"
+    snyk-docker-plugin "1.17.0"
     snyk-go-plugin "1.6.1"
     snyk-gradle-plugin "2.1.2"
     snyk-module "1.9.1"