11_bnn_import_article_update #55

Open
philipp wants to merge 3 commits from 11_bnn_import_article_update into demo
  • mirror import article gem repo to github
  • fix rubocop stuff
  • cleanup readme gem
* [ ] mirror import article gem repo to github * [ ] fix rubocop stuff * [ ] cleanup readme gem
philipp added 6 commits 2023-02-20 13:00:01 +01:00
flip added 1 commit 2023-02-20 14:36:49 +01:00

[ ] TODO: Test behaviour for article category update previous

state;art. nummer;name;note;producer;origin;unit;net price;vat (%);deposit;unit quantity;(reserved);(reserved);category
;1;Tomatoes;organic;Tommy farm;Somewhere, UK;500 g;1.2;6;0;20;;;Vegetables

[ ] TODO: Test behaviour for article category update previous state;art. nummer;name;note;producer;origin;unit;net price;vat (%);deposit;unit quantity;(reserved);(reserved);category ;1;Tomatoes;organic;Tommy farm;Somewhere, UK;500 g;1.2;6;0;20;;;Vegetables
philipp added 1 commit 2023-02-22 14:42:38 +01:00
philipp force-pushed 11_bnn_import_article_update from a7fb5c6aae to 1279437ed5 2023-02-22 14:45:28 +01:00 Compare
philipp force-pushed 11_bnn_import_article_update from 1279437ed5 to 4dd45b7b2f 2023-02-22 14:46:23 +01:00 Compare
philipp changed target branch from demo to develop 2023-02-22 14:47:05 +01:00
philipp changed target branch from develop to demo 2023-02-22 14:49:00 +01:00
philipp force-pushed 11_bnn_import_article_update from 4dd45b7b2f to 21a9121c7f 2023-02-22 14:50:42 +01:00 Compare
philipp force-pushed 11_bnn_import_article_update from 21a9121c7f to f5589d69eb 2023-02-22 14:53:22 +01:00 Compare
philipp force-pushed 11_bnn_import_article_update from f5589d69eb to 5b75e655e9 2023-02-22 16:59:29 +01:00 Compare
This pull request has changes conflicting with the target branch.
  • app/controllers/articles_controller.rb
  • app/models/supplier.rb
  • spec/integration/articles_spec.rb
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b 11_bnn_import_article_update demo
git pull origin 11_bnn_import_article_update

Step 2:

Merge the changes and update on Forgejo.
git checkout demo
git merge --no-ff 11_bnn_import_article_update
git push origin demo
Sign in to join this conversation.
There is no content yet.