Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

11_bnn_import_article_update #55

Open
philipp wants to merge 3 commits from 11_bnn_import_article_update into demo
pull from: 11_bnn_import_article_update
merge into: Foodsoft:demo
Conversation 1 Commits 3 Files changed 19 +475 -103
philipp commented 2023-02-20 13:00:00 +01:00
Owner
Copy link
  • 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
flip commented 2023-02-20 14:57:24 +01:00
Owner
Copy link

[ ] 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
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 11_bnn_import_article_update:11_bnn_import_article_update
git checkout 11_bnn_import_article_update

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout demo
git merge --no-ff 11_bnn_import_article_update
git checkout 11_bnn_import_article_update
git rebase demo
git checkout demo
git merge --ff-only 11_bnn_import_article_update
git checkout 11_bnn_import_article_update
git rebase demo
git checkout demo
git merge --no-ff 11_bnn_import_article_update
git checkout demo
git merge --squash 11_bnn_import_article_update
git checkout demo
git merge --ff-only 11_bnn_import_article_update
git checkout demo
git merge 11_bnn_import_article_update
git push origin demo
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
needs specification

   
nice to have

   
question

More information is needed

  
ready to go

   
refactoring

   
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
needs specification
nice to have
question
ready to go
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Foodsoft/foodsoft#55
No description provided.
Delete branch "11_bnn_import_article_update"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?