Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translations for article units #10

Closed
7 tasks done
lentschi opened this issue Nov 19, 2022 · 10 comments
Closed
7 tasks done

Translations for article units #10

lentschi opened this issue Nov 19, 2022 · 10 comments
Assignees

Comments

@lentschi
Copy link
Contributor

lentschi commented Nov 19, 2022

Translation of article units will be provided as manually compiled files (one for each existing languange currently in foodsoft) with UNECE units as keys and the following fields as value:

  • short name: to be displayed in dropdowns/fields throughout the application as well as on the units page
  • long name: to be displayed on the units page
  • description: to be displayed on the units page

Additionally translations for unit aliases as they exist in current foodsoft instances need to be provided (see last point in #25)


EDIT 07-05-2023:

This issue has quite a long ongoing discussion. I'll try to summarize this in concise TODOs:

  • Basic translation architecture
  • unit translations
    • English
    • German
    • Spanish
    • French
    • Dutch
    • Turkish
@lentschi
Copy link
Contributor Author

lentschi commented Feb 17, 2023

As soon as this has been clarified, define how this should be implemented for #18 as well.

@lentschi lentschi changed the title Übersetzungen für Artikeleinheiten Translations for article units Mar 5, 2023
@lentschi lentschi assigned lentschi and paroga and unassigned lentschi Mar 10, 2023
@lentschi lentschi assigned twothreenine and unassigned paroga Oct 29, 2023
@twothreenine
Copy link
Contributor

I started working on this which also includes selecting which units are relevant.
In our recent call, we favored three levels:

  1. selection of units relevant for food coops in Europe (metric system) which will be enabled by default
  2. selection of "recommended" units which could be relevant in the broadest sense (e.g. lb, cm, m², h, kWh etc.) for which we will provide a translation
  3. all other UN/ECE units (selection of annexes?)

When looking for existing translations for package units, I found the GS1 package type code list which seems to be related to the UN/ECE code list. I found a German translation from GS1 Austria of a part of the units provided in UN/ECE Annexes V+VI:
https://www.gs1.at/sites/default/files/2022-04/GS1-Sync-Profiles-Overview-Mai-2022-V24032022.xlsx
(see sheet PackageTypeGDSN)
There are also some additional units with triliteral codes like BBG: Bag in box. I skipped these for now, but I think they could be useful. @lentschi, you mentioned determining if a unit is a piece unit by checking whether the code starts with an X -- this would not work here. I'd suggest you change that to checking whether the unit has a conversation factor unit so that we could include units like BBG (immediately or in the future).
I also wonder if we should just use two-letter codes like BO instead of XBO since they seem to be more popular.

When suggesting English and German locales, I made the following design choices:

  • Unit names should be best human-readable (beer crate instead of crate, beer)
  • Unit names should be compact
    • I omitted terms like "not otherwise specified", "non-protected", and "cylindrical" so that we have units like bottle/Flasche (BO) or jerrican/Kanister (JY)
    • For similar units with different specification (protected, bulbous etc.) I left the info but usually wouldn't select them for level 1
    • I also omitted the term "in bundle/bunch/truss" when referring to a unit in plural like "bars" since the plural already indicates a bundle
  • For some package units there are multiple German translations and I wasn't sure which one would be the most precise one
  • in some cases I chose translations which otherwise wouldn't appear in the German list; for example, "bin" and "bucket" both translate to "Eimer", so I chose "Kübel" for "bin" just to have the variant "Kübel" in the list. I hope this won't cause any confusion in a possible future interoperability use case.

I also found cases for providing symbol locales:

  • This way, we can provide symbols for package units like pc or Stk for piece
  • There are some level 2 units that have different symbols in German: in vs. for inch, tbsp. vs. EL for tablespoon etc.
  • If Foodsoft should ever include locales for e.g. Chinese, they would be needed even for units like kg

I also think that unit locales should have an array field alternative symbols for cases like dag/dkg, dt/dtn, m²/qm or cm³/cc/ccm. When an article list is imported, units like these could be recognized by checking alternative symbols of different locales. What do you think about that @lentschi ?

I have a bit left to work on this, then I'll send you my proposal for levels and locales.

@lentschi
Copy link
Contributor Author

lentschi commented Nov 3, 2023

When looking for existing translations for package units, I found the GS1 package type code list which seems to be related to the UN/ECE code list. I found a German translation from GS1 Austria of a part of the units provided in UN/ECE Annexes V+VI [...] (see sheet PackageTypeGDSN)

I'm not sure, what kind of standard this GSDN is and how widespread it is...? Great if it provides translations for the units we need though! 👍

here are also some additional units with triliteral codes like BBG: Bag in box. I skipped these for now, but I think they could be useful. @lentschi, you mentioned determining if a unit is a piece unit by checking whether the code starts with an X -- this would not work here.

I would prefer not to complicate things further and stick with the standards UNECE recommendations 20 and 21. (Adding other standards would mean running into the risk of duplication/ambiguity).
Even if we would add them: As a conversion-less unit, BBG would just be prefixed with an X in any case and become XBBG. (see next point)

I'd suggest you change that to checking whether the unit has a conversation factor unit so that we could include units like BBG (immediately or in the future)

Two things in response to that:

  1. Checking whether a unit has a conversion factor already is what's usually happening when checking if a unit is "a piece unit". (Only in the migration I had resorted to the less expensive method of checking the first character. But this will be changed in Assisted conversion of old article units instead of conversion by migration #25 anyway)
  2. The X in XBO is actually not part of the unit code in Rec21. However Rec20 defines (in its "Intro" sheet, Point 2) that an X should be prepended to Rec21 units to avoid duplication.

I also wonder if we should just use two-letter codes like BO instead of XBO since they seem to be more popular.

Not quite sure, why you think them to be more popular...?
In any case, when communicating through an external interface we can always strip the X if required. (Though I doubt it would be.)

Unit names should be compact [...]
👍

For some package units there are multiple German translations [...] I hope this won't cause any confusion in a possible future interoperability use case.

What do you mean by 'interoperability use case'? When communicating through an external interface with a remote applications, we will hopefully be able to communicate using the UNECE codes. If the remote app doesn't understand UNECE codes, we will have to use some kind of mapping algorithm like we did before.

I also think that unit locales should have an array field alternative symbols for cases like dag/dkg, dt/dtn, m²/qm or cm³/cc/ccm. When an article list is imported, units like these could be recognized by checking alternative symbols of different locales. What do you think about that @lentschi ?

While I do understand there might be some use cases for that, I'd vote for not providing such alternative fields for now for three reasons:

  1. We'd have to enter them manually or use yet another data source (-> effort!)
  2. Article list imports through CSV is a bad idea to start with. That being said, after this fork, lists will be exported with the current locale's representation of the unit name (e.g. "kilogram" instead of "kg"). Importing will only work for those unit names (They must be unique in all translations). Old CSV file formats will not be supported for import (AFAIK there has never been backwards-compatibility for those imports. That's something you cannot properly do in CSV. We'd have to shift to JSON/YAML exports including schema version info to be able to have that.)
  3. I don't see any other use case in which we really need the abbreviated units apart from display in the dropdowns.

I have a bit left to work on this, then I'll send you my proposal for levels and locales.

Great, thank you so much for your work! :)

@twothreenine
Copy link
Contributor

The X in XBO is actually not part of the unit code in Rec21. However Rec20 defines (in its "Intro" sheet, Point 2) that an X should be prepended to Rec21 units to avoid duplication.

I see. For example, in Annex I there's AE for ampere per metre, while in Annex V/VI there's (X)AE for aerosol. So we need the X for it to be unambiguous.

What do you mean by 'interoperability use case'? When communicating through an external interface with a remote applications, we will hopefully be able to communicate using the UNECE codes. If the remote app doesn't understand UNECE codes, we will have to use some kind of mapping algorithm like we did before.

I meant if you create articles in Foodsoft in German and select certain units because the German locale fits best (for example Kübel since that term is more common in Austria) and then export that data and show it in English, bin might be less fitting that bucket. But that problem would also occur if we translated both bin and bucket to Eimer -- you wouldn't know which Eimer you'd select. To be more precise, we'd have to display the English unit name as well in the dropdown but that would take up too much space.

I'd vote for not providing such alternative fields for now for three reasons: 1. We'd have to enter them manually or use yet another data source (-> effort!)

I have already done that for a number of units in English and German.

after this fork, lists will be exported with the current locale's representation of the unit name (e.g. "kilogram" instead of "kg"). Importing will only work for those unit names (They must be unique in all translations)

I think that's a bad idea for multiple reasons:

  1. The unit name is longer than the unit symbol or common code and makes the CSV less readable as a spreadsheet
  2. Article lists could not be exported and imported if a different locale is used. If it depends on the user's locale, that would even lead to problems if you send the CSV to a user who uses Foodsoft in a different language (and many people in Austrian food coops use Foodsoft in English since it is the default locale when an account is created and many don't bother to change it). If it depends on the instance's locale, this would still mean that you cannot import it in an instance which uses a different locale.
  3. It would take additional effort to make sure all unit name locales are unique in a certain language. In some cases it would also be difficult to find different words for units which translate to the same word in a certain language. For example, I have translated the units bundle and truss both to Bündel. I'd have to name them Bündel 1 and Bündel 2 or come up with different terms although Bündel might be the best translation for all three.

Instead, I'd propose to use the common code for exports since it is the only term that is always the same across different languages. You could also make a popup before the export where you can select whether you want common codes or symbols (or even names) if you want to implement that.

For imports, I'd vote for checking for each unit:

  1. if there's a matching common code (case-sensitive, upper case)
  2. if not, if there's a matching symbol in the instance's unit locale (case-insensitive)
  3. if not, if there's a matching alternative symbol in the instance's locale (case-insensitive)
  4. if not, if there's a matching symbol (or alternative symbol) in another locale (case-insensitive)
  5. if not, if there's a matching alternative symbol in the another locale (case-insensitive)
  6. if not, if there's a matching unit name in the instance's locale (case-insensitive)
  7. if not, if there's a matching unit name in another locale (case-insensitive)
    and take the first match.
    If there's still no match, take the entered unit as a custom unit.

When transforming a price list from a supplier to a CSV for import, it would be very handy if you could just take the unit symbols from the price list and expect it to work in most cases.

Old CSV file formats will not be supported for import (AFAIK there has never been backwards-compatibility for those imports. That's something you cannot properly do in CSV. We'd have to shift to JSON/YAML exports including schema version info to be able to have that.)

Well, we could offer a checkbox or dropdown where the user can select that they're about to upload a CSV in the old format and apply the old logic. I don't think that's too important, though. There also seems to be some backwards compatibility since columns L and M are reserved.

I don't see any other use case in which we really need the abbreviated units apart from display in the dropdowns.

I'd propose to use the symbols in most menus (balancing page, order PDF etc.) instead of the longer names. I think the names should only appear in the article edit menu and the conversion popup.

@lentschi
Copy link
Contributor Author

lentschi commented Nov 10, 2023

I'd vote for not providing such alternative fields for now for three reasons: 1. We'd have to enter them manually or use yet another data source (-> effort!)

I have already done that for a number of units in English and German.

I'm not talking about the effort of finding these alternate unit codes, but about the effort implementing them in foodsoft.
So far we have two data sources: The UNECE files and translations for fields in those files. Adding alternate fields for each unit code would add another layer of complexity, which might have its benefits, but which I would move to a later stage of the implementation.
Also I haven't yet heard of a use case that would ever justify this effort. (Just being able to enter dag as well as dkg is not really worth it IMO.)

Instead, I'd propose to use the common code for exports since it is the only term that is always the same across different languages.

Technically that would actually be the easiest way to implement it. I'd still rather not do it though:
You seem to use CSV export primarily as an export/import feature. But keep in mind, some users may be using it as a human readable export format (So users can view their articles in Excel without much effort.). UNECE unit codes however are not human readable.

For imports, I'd vote for checking for each unit: [... points 1-7 ...]

All this might make sense and seems well thought through, but I won't implement it that way - at least not in this fork (too much effort!).
I want to stick with a simple one-dimensional mapping approach. (e.g. the one I proposed - or if you prefer exporting the unit symbols instead).

I'd propose to use the symbols in most menus (balancing page, order PDF etc.) instead of the longer names. I think the names should only appear in the article edit menu and the conversion popup.

Sure, I could change that. I originally chose displaying "gram" over displaying just "g" in most places as the single letter seemed a bit lost. The only advantage I see in displaying the symbol only is that we gain some horizontal space, which is admittedly a bit scarce in the group order form.

Another reason I didn't use symbols in the first place: UNECE 21 doesn't have any. (We'll have to add extra logic wherever we display units: "If there's no symbol, display the name after all.")

Then, there is the problem, that UNECE is funny about the categorization of units sometimes:
E.g. PTN (a portion of food) would in my opinion rather belong to UNECE 21, but they put it in 20. So it actually does have a unit symbol, but one that's not human readable: PTN. (I'm not sure if that's just an error - it's the first case I find.)

@twothreenine
Copy link
Contributor

I originally chose displaying "gram" over displaying just "g" in most places as the single letter seemed a bit lost. The only advantage I see in displaying the symbol only is that we gain some horizontal space, which is admittedly a bit scarce in the group order form.

I think "2 kg" is much more common and better readable than "2 Kilogramm", so I'm all for symbols.

We'll have to add extra logic wherever we display units: "If there's no symbol, display the name after all."

I guess that logic should be in the unit model and referenced wherever units are displayed.

Then, there is the problem, that UNECE is funny about the categorization of units sometimes:
E.g. PTN (a portion of food) would in my opinion rather belong to UNECE 21, but they put it in 20. So it actually does have a unit symbol, but one that's not human readable: PTN. (I'm not sure if that's just an error - it's the first case I find.)

PTN isn't a packaging unit, though. I haven't included any units from UNECE 20 Annex II & III anyway.
Here are my lists so far (selection and translations):
Scalar units EN + DE.xlsx
Piece units EN + DE.xlsx
Let me know if you'd like to change anything.

@lentschi
Copy link
Contributor Author

lentschi commented Nov 17, 2023

I guess that logic should be in the unit model and referenced wherever units are displayed.

It's not a technical question (It wouldn't be too hard to design), but one of effort, testing, maintenance etc.
But I'll see what I can do.

I haven't included any units from UNECE 20 Annex II & III anyway.

Okay, but I wouldn't ban them as such, would you? (See samples for PTN/STC below).
So, if we're to actually display the symbols from UNECE, I'll have to implement a logic that ignores symbols that are all caps and also use the unit name in such cases.

Here are my lists so far (selection and translations)

Thank you for the translations! 👍 🥳

Let me know if you'd like to change anything.

My original selection included a few that are missing from yours - here they are (with German samples from our foodcoop's DB):

  • XCB - Crate, beer (Bierkiste)
  • XPU - Tray (z.B.: Schale mit Pilzen ohne exakte Gewichtsangabe)
  • XPT - Pot (z.B.: Topf, bepflanzt mit Kräutern-/Blumen)
  • PTN - Portion (z.B.: Eine Portion Apfelstrudel, kein ganzes Stück, sondern eben nur eine Nachspeisenportion 😄 )
  • STC - Stick (z.B.: Eine Stange Salami ohne exakte Gewichtsangabe)

But I can add translations for those five myself, no worries :)

Another thing we'll need is the categorization into metric (e.g. 'kg'), imperial (e.g. 'pound') and units of neither category (e.g. 'year', 'piece'), so we can pre-set available units as we agreed.
But I'll try to do that on my own too and let you review my results as soon as I'm done.

@twothreenine
Copy link
Contributor

twothreenine commented Nov 17, 2023

So, if we're to actually display the symbols from UNECE, I'll have to implement a logic that ignores symbols that are all caps and also use the unit name in such cases.

That wouldn't work for units like register ton (RT) or megawatt (MW). I think it would be better to provide alternative symbol locales in such cases.

XCB - Crate, beer (Bierkiste)

I've omitted all packaging units that refer to the content. IMO we don't need those since the content will already be specified in the article name. (beer in a crate is enough information, we don't need beer in a beer crate)
Otherwise, the list would be longer (milk crate, fruit crate etc.)

XPU - Tray (z.B.: Schale mit Pilzen ohne exakte Gewichtsangabe)

I translated basin with Schale and tray with Tablett and included basin in the selection. But perhaps tray is more commonly used for food packaging. If you translate tray with Schale and include it in the selection, then we could translate basin with Schüssel (not selected).

XPT - Pot (z.B.: Topf, bepflanzt mit Kräutern-/Blumen)
PTN - Portion (z.B.: Eine Portion Apfelstrudel, kein ganzes Stück, sondern eben nur eine Nachspeisenportion 😄 )
STC - Stick (z.B.: Eine Stange Salami ohne exakte Gewichtsangabe)

Good catches 👍

Another thing we'll need is the categorization into metric (e.g. 'kg'), imperial (e.g. 'pound') and units of neither category (e.g. 'year', 'piece'), so we can pre-set available units as we agreed.

I thought we'd pre-set only the really common units. For the metric system I'd suggest kg, dag, g, l, ml, dl, and cl (perhaps also hg, mg, dt) and I think these could be activated in all foodsofts. even if some use predominantly imperial units.
Perhaps you could implement (in the migration) checking if there's any other unit symbol (from the translated scalar units) that's used and activating it in that case?
Then we wouldn't need any categorization.

@lentschi
Copy link
Contributor Author

So, if we're to actually display the symbols from UNECE, I'll have to implement a logic that ignores symbols that are all caps and also use the unit name in such cases.

That wouldn't work for units like register ton (RT) or megawatt (MW).

True, but I doubt anyone would miss those two and I don't see a problem with the more commonly used units. Also I could adept the logic to only disregard the symbol, if it's the same as the UNECE CommonCode.

I thought we'd pre-set only the really common units. For the metric system I'd suggest kg, dag, g, l, ml, dl, and cl (perhaps also hg, mg, dt) [...] Then we wouldn't need any categorization.

Yeah, I didn't necessarily mean that we have to categorize them all. But we need those initial groups. But I'll come up with something, and you can review as soon as I deploy it to the demo server 😄 - I think it's easier that way.

lentschi added a commit that referenced this issue Nov 19, 2023
@lentschi lentschi added this to the Ready for MR milestone Dec 15, 2023
lentschi added a commit that referenced this issue Jan 3, 2024
lentschi added a commit that referenced this issue Jan 4, 2024
lentschi added a commit that referenced this issue Mar 15, 2024
Squashed commit of the following:

commit 9457ec09b254937c98f0e213dd95283b75291f46
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 10:28:12 2024 +0100

    rubocop -a with upstream rubocop

commit a23f34f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 17:17:27 2024 +0100

    Fixes #51

commit 3aa7f50
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 13:37:20 2024 +0100

    Fixes #52

commit 8a288b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 12:11:17 2024 +0100

    Fixes #48 (another fix)

commit 6cb809e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 11:37:48 2024 +0100

    Closes #24 again

commit d0f321c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:54:25 2024 +0100

    Fixes #43

commit 943f178
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:41:08 2024 +0100

    On #47: Escape commas in ratio unit names

commit 614cfdc
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 14:29:46 2024 +0100

    Some more fixes for #44

commit f351dee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 16 16:16:32 2024 +0100

    Some more fixes for #44

commit 34b6a51
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 16:48:25 2024 +0100

    Fixes #40

commit 5c12485
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 14:13:31 2024 +0100

    On #47: Removed unused columns from import/export

commit 3341d9d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 9 14:56:34 2024 +0100

    Closes #31

commit 9b66b28
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Feb 5 08:04:38 2024 +0100

    Fixes #45

commit da4e186
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 17:47:38 2024 +0100

    Fixes parts of #44:

    - accounting menu: group order amounts (see posting above)
    - group order result (of a closed or settled order)
    - manage order menu: sorted in articles / sorted in groups

commit 4644497
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 13:56:14 2024 +0100

    Fixes #41

    see incorrect bugfix for #7 in 34c198f

commit 97f635a
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 15:14:38 2024 +0100

    Fixes #38

commit 9642e9b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 12:16:19 2024 +0100

    Fixes #48

commit 683d2af
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jan 14 18:09:45 2024 +0100

    First draft of #31

commit 88b7528
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 15:07:51 2024 +0100

    Revert "Fixes with upstream rubocop 1.50.2"

    This reverts commit a5ce332.

commit a5ce332
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 14:45:36 2024 +0100

    Fixes with upstream rubocop 1.50.2

commit 4561797
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:58:45 2024 +0100

    Closes #34

commit 5a06392
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:27:03 2024 +0100

    Fixes #33

commit aac0546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:17:26 2024 +0100

    Fixes #36

commit dd35ba6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 5 09:39:31 2024 +0100

    Fixes article import (load extra units)

commit ac81c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 17:27:49 2024 +0100

    Fixed bug in import (related to #10)

commit 38de812
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 15:41:04 2024 +0100

    Adapted seeds

commit d069d39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 11:24:15 2024 +0100

    Fixes nasty bug with article unit migrations

commit 43897db
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 20:38:37 2024 +0100

    Closes #30

commit 545b368
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 18:35:01 2024 +0100

    Fixes issue in units migration

commit 56bfb79
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:34:28 2024 +0100

    Fixes bug in order articles controller

commit 9a0f813
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:20:41 2024 +0100

    On #23: Added some translations

commit 21740ad
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:29:07 2024 +0100

    Fixes unit conversion tests

commit a5205c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:04:10 2024 +0100

    Closes #26

commit 275306f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 09:10:57 2024 +0100

    Changes for #10 and #25

commit 00b81f5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jan 2 18:16:38 2024 +0100

    Closes #26

commit 0478db2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 16:51:23 2023 +0100

    Fixes incorrect article units migration

commit 68de953
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 11:05:28 2023 +0100

    Fixes bug in stock takings

commit 262e475
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 18:49:29 2023 +0100

    Fixed exports

commit 948c480
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 17:10:32 2023 +0100

    Some more bugfixing

commit 380f279
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Dec 27 20:15:07 2023 +0100

    Bugfixing

commit 6b8c112
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Dec 26 16:34:54 2023 +0100

    Another fix for #28

commit 34c198f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 19:19:00 2023 +0100

    Another fix for #7

commit 240f2d2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 10:15:09 2023 +0100

    Some formatting issues

commit 1942755
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 19:39:26 2023 +0100

    On #25: Persist and display migration state (button no longer available if migration has been performed once)

commit 85cb33c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 14:45:22 2023 +0100

    Closes #28

commit 3cb2c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:49:19 2023 +0100

    Enhanced units display in dropdowns and order view

commit be321b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:11:18 2023 +0100

    On #25: Moved auto conversion unit tests

commit c56cf44
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 19 16:47:44 2023 +0100

    Started with #25

commit 56acdcb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 4 16:38:25 2023 +0100

    First implementations of #24 and #10

commit 700f9a5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Oct 29 18:00:19 2023 +0100

    Added more available units

commit 241e836
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 14:15:04 2023 +0200

    Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script

commit 4aad223
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 11:18:30 2023 +0200

    Swapped XPA for XPK

commit 948ef32
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 27 15:36:02 2023 +0200

    Article form usability and bug fixes

commit 0002749
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 21 13:25:27 2023 +0200

    Implemented edit all form

commit 3353cc7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 20 12:45:10 2023 +0200

    shared articles list design enhancements

commit b3218ed
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 14 10:30:27 2023 +0200

    Fix for #19

commit 67c0e38
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Oct 12 11:32:04 2023 +0200

    Fixes conversion error with stock articles

commit a4316a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 23 15:24:36 2023 +0200

    enable article sync via https

commit b8574ee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 28 16:27:49 2023 +0200

    Single article import form for #19

commit a196514
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Apr 23 19:15:25 2023 +0200

    Continued with link generation for #19

commit c5a63c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 22 18:01:10 2023 +0200

    Added link generation for #19

commit 5e2c91b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 8 18:31:57 2023 +0200

    Continued with #19

commit 9337d08
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 7 14:44:05 2023 +0200

    More additions to #19

commit 72c953f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 25 14:43:57 2023 +0100

    Continued with #19

commit 748f8b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 11 16:02:39 2023 +0100

    Started with #19

commit 4c9a831
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 20:14:53 2023 +0100

    Added temporary fake article JSON import generator

commit 64493b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 17:30:03 2023 +0100

    Partial fixes for #14 (will all be replaced by #20)

commit c3f5168
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 11 12:37:46 2023 +0100

    Closes #18

commit ef0660b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 10 10:33:02 2023 +0100

    Fixes #17

    see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120

commit 4b20a39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 11 11:33:44 2022 +0100

    Fixes issue with article versioning (wrong ID in update)

commit 4e1d3a9
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 20:07:25 2022 +0100

    Fixed Stock logic and started repairing specs

commit 3fa3526
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 15:24:25 2022 +0100

    TODOs

commit f2e6b76
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 26 18:47:28 2022 +0100

    Proposal for #13

commit 4a7d4aa
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 25 11:38:26 2022 +0100

    Closes #7

commit cd2caf0
Merge: 1907b02 aa307c3
Author: lentschi <office@florian-lentsch.at>
Date:   Sat Nov 26 17:09:52 2022 +0100

    Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2

    Article versioning refactoring

commit aa307c3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 12:10:49 2022 +0100

    Basic ordering workflow and exports are functioning

commit 117bca3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 10:37:23 2022 +0100

    Article model before_save versioning logic

commit edc199b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:35:57 2022 +0100

    Adapted model relations & adapted hackathon seeds

commit cfbe59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:31:51 2022 +0100

    Article versioning - Global replaces:

    Case-sensitive & regex:
    Case-sensitive & regex:
    \.price\.(?!to_) -> .article_version.
    oa\.article(?!_) -> oa.article_version
    order_article\.article(?!_) -> order_article.article_version
    \.article_version\.supplier(?!_) -> .article_version.article.supplier
    oa\.article_id -> oa.article_version.article_id
    (?<!_)article_price -> article_version
    ArticlePrice -> ArticleVersion

    Exclude: ./db/migrate/**/*.rb

    Renames:
    app/models/article_price.rb -> app/models/article_version.rb
    app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml

commit 8d04a02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Oct 26 14:23:51 2022 +0200

    Article versioning schema migration

commit 1907b02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 21 13:22:08 2022 +0200

    Adapted article price to use supplier_order_unit as base

commit 9a31c07
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:48:14 2022 +0200

    Reduced seeded price for potatoes

commit c72ef55
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:43:40 2022 +0200

    Fixes error in unit conversion

commit 9e6d6e4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 12:04:58 2022 +0200

    Fixes warnings in order accounting

commit 354a0b6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 10:33:59 2022 +0200

    Fixes missing units calculation with minimum order quantity

commit fda2bb4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 18 07:51:48 2022 +0200

    Some more price calculation fixes

commit 0314133
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:58:04 2022 +0200

    Revert "Fixes price calculation"

    This reverts commit d79ba4d.

commit d79ba4d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:49:03 2022 +0200

    Fixes price calculation

commit 9a7f59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:42:38 2022 +0200

    Fixes NaN error in receive form

commit def95de
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:38:01 2022 +0200

    Unit conversion fixes for receive form

commit 045e0d1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 15:02:14 2022 +0200

    Fixed group_order_article_quantities floating point values

commit 2405832
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 10:01:57 2022 +0200

    Fixes floating point error when posting group order

commit 1e328cd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 15:41:58 2022 +0200

    Fixed calculation errors

commit 32f478d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:33:29 2022 +0200

    Removed TODO

commit e9b8916
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:28:21 2022 +0200

    Fixed rubocop warning

commit be42e73
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:23:15 2022 +0200

    Made order_articles units float

commit 5760015
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jul 12 20:43:54 2022 +0200

    Added hackathon seeds and fixed some rounding issues

commit b33728b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 11 19:33:23 2022 +0200

    Fixes pack size calculation

commit ec31210
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:35:08 2022 +0200

    Made goa quantity and tolerance accept floats

commit 9a58885
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:34:43 2022 +0200

    Fixes bug in stepping

commit b6b6b31
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 11:13:39 2022 +0200

    group order form: round values

commit 0f0bc0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 10:53:45 2022 +0200

    group order granularity fixes

commit c776081
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 09:36:40 2022 +0200

    Don't show unit conversion field, if there's nothing to convert

commit 8f330a7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 3 10:09:23 2022 +0200

    Fixes conversion error, when there's no ratios

commit 1bb36a4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 1 14:42:34 2022 +0200

    Fixes article form issues

commit a2f085b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 20:25:45 2022 +0200

    Fixes error in accounting

commit 49e3db0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 17:04:33 2022 +0200

    Fixes another error in conversion field

commit 63f6710
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 09:40:12 2022 +0200

    Fixes error in conversion field

commit 66b2459
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 19 12:19:52 2022 +0200

    Fixes price in article form

commit 870f5b7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:41:55 2022 +0200

    Added unit convertes for billing article fields

commit 35f3c54
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:05:26 2022 +0200

    Fixed conversion error in article form

commit 0acb048
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 12:25:01 2022 +0200

    Done with billing in a first version

commit 12228da
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 12 11:34:40 2022 +0200

    Started with billing

commit 1b484f3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 22:09:16 2022 +0200

    Receive form edit article

commit c2579a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 10:19:05 2022 +0200

    Receive page adaptations

commit 7b8f1b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 20:26:34 2022 +0200

    Some more minimum order quantity fixes

commit cde1f1d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 15:22:22 2022 +0200

    Minimum order quantity fixes

commit ec53546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun May 15 13:02:53 2022 +0200

    Started with minimum order quantity

commit 65f3bdd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat May 14 12:36:33 2022 +0200

    Article form fix

commit 1708d23
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri May 13 13:38:17 2022 +0200

    Conversion fixes

commit b7f32d7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 29 14:53:22 2022 +0200

    Added unit to article_prices

commit 4ecf7d4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 23 20:23:02 2022 +0200

    Adapted order fax (though this is still a matter of debate)

commit 98f6bbf
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 22 14:35:23 2022 +0200

    Duplicate new properties in ArticlePrice

commit 07ed7a0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 15 15:35:31 2022 +0200

    Continued with group order form

commit d60b547
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 2 19:05:33 2022 +0200

    Started remodelling group order form

commit a1f4060
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Mar 27 14:51:52 2022 +0200

    Unit conversions work in a first version

commit f9ba668
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 25 11:38:12 2022 +0100

    Flat ratios

commit d86be97
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 18 12:10:17 2022 +0100

    Added units file convertor and result to enable easier transformations between units with the same base unit

commit 40fb822
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 4 09:54:38 2022 +0100

    Articles form - all fields implemented in a first version

commit f020ebb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Mar 2 18:36:09 2022 +0100

    Article edit form: Moved js to separate file

commit 5e8e093
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 10:44:38 2022 +0100

    Renamed fields

commit 65e26a3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 09:18:51 2022 +0100

    Fixes docker-compose foodsoft build

commit 038b00e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 19:36:18 2022 +0100

    Saving conversions works in a first version

commit 0153785
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:50:59 2022 +0100

    Added minimum_order_amount to articles

commit 57cb7c1
Merge: 979eebc f371f70
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:44:59 2022 +0100

    Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon

commit 979eebc
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:43:47 2022 +0100

    article data UI for new unit handling

commit f371f70
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:26:23 2022 +0100

    Added article unit conversions model and fixed migration

commit 41adb65
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:16:08 2022 +0100

    Added units of measure from https://datahub.io/core/unece-units-of-measure

commit e0a7073
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:01:22 2022 +0100

    rubocop fixes

commit 5194e96
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 19 23:07:18 2022 +0100

    First attempt at unit migration
lentschi added a commit that referenced this issue Mar 15, 2024
Squashed commit of the following:

commit 8df48b744fbee9a5557c75782b47dfc4eb6ee18e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 11:36:13 2024 +0100

    Another attempt at running rubocop

commit a94f05d3062b2c9875f529c7cdc47f8c095caf9b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 11:11:21 2024 +0100

    Revert "rubocop -a with upstream rubocop"

    This reverts commit 9457ec09b254937c98f0e213dd95283b75291f46.

commit 9457ec09b254937c98f0e213dd95283b75291f46
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 10:28:12 2024 +0100

    rubocop -a with upstream rubocop

commit a23f34f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 17:17:27 2024 +0100

    Fixes #51

commit 3aa7f50
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 13:37:20 2024 +0100

    Fixes #52

commit 8a288b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 12:11:17 2024 +0100

    Fixes #48 (another fix)

commit 6cb809e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 11:37:48 2024 +0100

    Closes #24 again

commit d0f321c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:54:25 2024 +0100

    Fixes #43

commit 943f178
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:41:08 2024 +0100

    On #47: Escape commas in ratio unit names

commit 614cfdc
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 14:29:46 2024 +0100

    Some more fixes for #44

commit f351dee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 16 16:16:32 2024 +0100

    Some more fixes for #44

commit 34b6a51
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 16:48:25 2024 +0100

    Fixes #40

commit 5c12485
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 14:13:31 2024 +0100

    On #47: Removed unused columns from import/export

commit 3341d9d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 9 14:56:34 2024 +0100

    Closes #31

commit 9b66b28
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Feb 5 08:04:38 2024 +0100

    Fixes #45

commit da4e186
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 17:47:38 2024 +0100

    Fixes parts of #44:

    - accounting menu: group order amounts (see posting above)
    - group order result (of a closed or settled order)
    - manage order menu: sorted in articles / sorted in groups

commit 4644497
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 13:56:14 2024 +0100

    Fixes #41

    see incorrect bugfix for #7 in 34c198f

commit 97f635a
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 15:14:38 2024 +0100

    Fixes #38

commit 9642e9b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 12:16:19 2024 +0100

    Fixes #48

commit 683d2af
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jan 14 18:09:45 2024 +0100

    First draft of #31

commit 88b7528
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 15:07:51 2024 +0100

    Revert "Fixes with upstream rubocop 1.50.2"

    This reverts commit a5ce332.

commit a5ce332
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 14:45:36 2024 +0100

    Fixes with upstream rubocop 1.50.2

commit 4561797
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:58:45 2024 +0100

    Closes #34

commit 5a06392
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:27:03 2024 +0100

    Fixes #33

commit aac0546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:17:26 2024 +0100

    Fixes #36

commit dd35ba6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 5 09:39:31 2024 +0100

    Fixes article import (load extra units)

commit ac81c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 17:27:49 2024 +0100

    Fixed bug in import (related to #10)

commit 38de812
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 15:41:04 2024 +0100

    Adapted seeds

commit d069d39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 11:24:15 2024 +0100

    Fixes nasty bug with article unit migrations

commit 43897db
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 20:38:37 2024 +0100

    Closes #30

commit 545b368
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 18:35:01 2024 +0100

    Fixes issue in units migration

commit 56bfb79
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:34:28 2024 +0100

    Fixes bug in order articles controller

commit 9a0f813
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:20:41 2024 +0100

    On #23: Added some translations

commit 21740ad
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:29:07 2024 +0100

    Fixes unit conversion tests

commit a5205c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:04:10 2024 +0100

    Closes #26

commit 275306f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 09:10:57 2024 +0100

    Changes for #10 and #25

commit 00b81f5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jan 2 18:16:38 2024 +0100

    Closes #26

commit 0478db2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 16:51:23 2023 +0100

    Fixes incorrect article units migration

commit 68de953
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 11:05:28 2023 +0100

    Fixes bug in stock takings

commit 262e475
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 18:49:29 2023 +0100

    Fixed exports

commit 948c480
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 17:10:32 2023 +0100

    Some more bugfixing

commit 380f279
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Dec 27 20:15:07 2023 +0100

    Bugfixing

commit 6b8c112
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Dec 26 16:34:54 2023 +0100

    Another fix for #28

commit 34c198f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 19:19:00 2023 +0100

    Another fix for #7

commit 240f2d2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 10:15:09 2023 +0100

    Some formatting issues

commit 1942755
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 19:39:26 2023 +0100

    On #25: Persist and display migration state (button no longer available if migration has been performed once)

commit 85cb33c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 14:45:22 2023 +0100

    Closes #28

commit 3cb2c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:49:19 2023 +0100

    Enhanced units display in dropdowns and order view

commit be321b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:11:18 2023 +0100

    On #25: Moved auto conversion unit tests

commit c56cf44
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 19 16:47:44 2023 +0100

    Started with #25

commit 56acdcb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 4 16:38:25 2023 +0100

    First implementations of #24 and #10

commit 700f9a5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Oct 29 18:00:19 2023 +0100

    Added more available units

commit 241e836
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 14:15:04 2023 +0200

    Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script

commit 4aad223
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 11:18:30 2023 +0200

    Swapped XPA for XPK

commit 948ef32
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 27 15:36:02 2023 +0200

    Article form usability and bug fixes

commit 0002749
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 21 13:25:27 2023 +0200

    Implemented edit all form

commit 3353cc7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 20 12:45:10 2023 +0200

    shared articles list design enhancements

commit b3218ed
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 14 10:30:27 2023 +0200

    Fix for #19

commit 67c0e38
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Oct 12 11:32:04 2023 +0200

    Fixes conversion error with stock articles

commit a4316a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 23 15:24:36 2023 +0200

    enable article sync via https

commit b8574ee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 28 16:27:49 2023 +0200

    Single article import form for #19

commit a196514
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Apr 23 19:15:25 2023 +0200

    Continued with link generation for #19

commit c5a63c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 22 18:01:10 2023 +0200

    Added link generation for #19

commit 5e2c91b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 8 18:31:57 2023 +0200

    Continued with #19

commit 9337d08
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 7 14:44:05 2023 +0200

    More additions to #19

commit 72c953f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 25 14:43:57 2023 +0100

    Continued with #19

commit 748f8b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 11 16:02:39 2023 +0100

    Started with #19

commit 4c9a831
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 20:14:53 2023 +0100

    Added temporary fake article JSON import generator

commit 64493b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 17:30:03 2023 +0100

    Partial fixes for #14 (will all be replaced by #20)

commit c3f5168
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 11 12:37:46 2023 +0100

    Closes #18

commit ef0660b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 10 10:33:02 2023 +0100

    Fixes #17

    see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120

commit 4b20a39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 11 11:33:44 2022 +0100

    Fixes issue with article versioning (wrong ID in update)

commit 4e1d3a9
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 20:07:25 2022 +0100

    Fixed Stock logic and started repairing specs

commit 3fa3526
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 15:24:25 2022 +0100

    TODOs

commit f2e6b76
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 26 18:47:28 2022 +0100

    Proposal for #13

commit 4a7d4aa
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 25 11:38:26 2022 +0100

    Closes #7

commit cd2caf0
Merge: 1907b02 aa307c3
Author: lentschi <office@florian-lentsch.at>
Date:   Sat Nov 26 17:09:52 2022 +0100

    Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2

    Article versioning refactoring

commit aa307c3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 12:10:49 2022 +0100

    Basic ordering workflow and exports are functioning

commit 117bca3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 10:37:23 2022 +0100

    Article model before_save versioning logic

commit edc199b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:35:57 2022 +0100

    Adapted model relations & adapted hackathon seeds

commit cfbe59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:31:51 2022 +0100

    Article versioning - Global replaces:

    Case-sensitive & regex:
    Case-sensitive & regex:
    \.price\.(?!to_) -> .article_version.
    oa\.article(?!_) -> oa.article_version
    order_article\.article(?!_) -> order_article.article_version
    \.article_version\.supplier(?!_) -> .article_version.article.supplier
    oa\.article_id -> oa.article_version.article_id
    (?<!_)article_price -> article_version
    ArticlePrice -> ArticleVersion

    Exclude: ./db/migrate/**/*.rb

    Renames:
    app/models/article_price.rb -> app/models/article_version.rb
    app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml

commit 8d04a02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Oct 26 14:23:51 2022 +0200

    Article versioning schema migration

commit 1907b02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 21 13:22:08 2022 +0200

    Adapted article price to use supplier_order_unit as base

commit 9a31c07
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:48:14 2022 +0200

    Reduced seeded price for potatoes

commit c72ef55
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:43:40 2022 +0200

    Fixes error in unit conversion

commit 9e6d6e4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 12:04:58 2022 +0200

    Fixes warnings in order accounting

commit 354a0b6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 10:33:59 2022 +0200

    Fixes missing units calculation with minimum order quantity

commit fda2bb4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 18 07:51:48 2022 +0200

    Some more price calculation fixes

commit 0314133
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:58:04 2022 +0200

    Revert "Fixes price calculation"

    This reverts commit d79ba4d.

commit d79ba4d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:49:03 2022 +0200

    Fixes price calculation

commit 9a7f59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:42:38 2022 +0200

    Fixes NaN error in receive form

commit def95de
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:38:01 2022 +0200

    Unit conversion fixes for receive form

commit 045e0d1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 15:02:14 2022 +0200

    Fixed group_order_article_quantities floating point values

commit 2405832
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 10:01:57 2022 +0200

    Fixes floating point error when posting group order

commit 1e328cd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 15:41:58 2022 +0200

    Fixed calculation errors

commit 32f478d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:33:29 2022 +0200

    Removed TODO

commit e9b8916
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:28:21 2022 +0200

    Fixed rubocop warning

commit be42e73
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:23:15 2022 +0200

    Made order_articles units float

commit 5760015
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jul 12 20:43:54 2022 +0200

    Added hackathon seeds and fixed some rounding issues

commit b33728b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 11 19:33:23 2022 +0200

    Fixes pack size calculation

commit ec31210
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:35:08 2022 +0200

    Made goa quantity and tolerance accept floats

commit 9a58885
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:34:43 2022 +0200

    Fixes bug in stepping

commit b6b6b31
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 11:13:39 2022 +0200

    group order form: round values

commit 0f0bc0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 10:53:45 2022 +0200

    group order granularity fixes

commit c776081
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 09:36:40 2022 +0200

    Don't show unit conversion field, if there's nothing to convert

commit 8f330a7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 3 10:09:23 2022 +0200

    Fixes conversion error, when there's no ratios

commit 1bb36a4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 1 14:42:34 2022 +0200

    Fixes article form issues

commit a2f085b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 20:25:45 2022 +0200

    Fixes error in accounting

commit 49e3db0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 17:04:33 2022 +0200

    Fixes another error in conversion field

commit 63f6710
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 09:40:12 2022 +0200

    Fixes error in conversion field

commit 66b2459
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 19 12:19:52 2022 +0200

    Fixes price in article form

commit 870f5b7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:41:55 2022 +0200

    Added unit convertes for billing article fields

commit 35f3c54
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:05:26 2022 +0200

    Fixed conversion error in article form

commit 0acb048
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 12:25:01 2022 +0200

    Done with billing in a first version

commit 12228da
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 12 11:34:40 2022 +0200

    Started with billing

commit 1b484f3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 22:09:16 2022 +0200

    Receive form edit article

commit c2579a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 10:19:05 2022 +0200

    Receive page adaptations

commit 7b8f1b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 20:26:34 2022 +0200

    Some more minimum order quantity fixes

commit cde1f1d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 15:22:22 2022 +0200

    Minimum order quantity fixes

commit ec53546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun May 15 13:02:53 2022 +0200

    Started with minimum order quantity

commit 65f3bdd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat May 14 12:36:33 2022 +0200

    Article form fix

commit 1708d23
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri May 13 13:38:17 2022 +0200

    Conversion fixes

commit b7f32d7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 29 14:53:22 2022 +0200

    Added unit to article_prices

commit 4ecf7d4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 23 20:23:02 2022 +0200

    Adapted order fax (though this is still a matter of debate)

commit 98f6bbf
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 22 14:35:23 2022 +0200

    Duplicate new properties in ArticlePrice

commit 07ed7a0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 15 15:35:31 2022 +0200

    Continued with group order form

commit d60b547
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 2 19:05:33 2022 +0200

    Started remodelling group order form

commit a1f4060
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Mar 27 14:51:52 2022 +0200

    Unit conversions work in a first version

commit f9ba668
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 25 11:38:12 2022 +0100

    Flat ratios

commit d86be97
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 18 12:10:17 2022 +0100

    Added units file convertor and result to enable easier transformations between units with the same base unit

commit 40fb822
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 4 09:54:38 2022 +0100

    Articles form - all fields implemented in a first version

commit f020ebb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Mar 2 18:36:09 2022 +0100

    Article edit form: Moved js to separate file

commit 5e8e093
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 10:44:38 2022 +0100

    Renamed fields

commit 65e26a3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 09:18:51 2022 +0100

    Fixes docker-compose foodsoft build

commit 038b00e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 19:36:18 2022 +0100

    Saving conversions works in a first version

commit 0153785
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:50:59 2022 +0100

    Added minimum_order_amount to articles

commit 57cb7c1
Merge: 979eebc f371f70
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:44:59 2022 +0100

    Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon

commit 979eebc
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:43:47 2022 +0100

    article data UI for new unit handling

commit f371f70
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:26:23 2022 +0100

    Added article unit conversions model and fixed migration

commit 41adb65
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:16:08 2022 +0100

    Added units of measure from https://datahub.io/core/unece-units-of-measure

commit e0a7073
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:01:22 2022 +0100

    rubocop fixes

commit 5194e96
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 19 23:07:18 2022 +0100

    First attempt at unit migration
lentschi added a commit that referenced this issue Mar 15, 2024
Squashed commit of the following:

commit a23f34f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 17:17:27 2024 +0100

    Fixes #51

commit 3aa7f50
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 13:37:20 2024 +0100

    Fixes #52

commit 8a288b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 12:11:17 2024 +0100

    Fixes #48 (another fix)

commit 6cb809e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 11:37:48 2024 +0100

    Closes #24 again

commit d0f321c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:54:25 2024 +0100

    Fixes #43

commit 943f178
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:41:08 2024 +0100

    On #47: Escape commas in ratio unit names

commit 614cfdc
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 14:29:46 2024 +0100

    Some more fixes for #44

commit f351dee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 16 16:16:32 2024 +0100

    Some more fixes for #44

commit 34b6a51
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 16:48:25 2024 +0100

    Fixes #40

commit 5c12485
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 14:13:31 2024 +0100

    On #47: Removed unused columns from import/export

commit 3341d9d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 9 14:56:34 2024 +0100

    Closes #31

commit 9b66b28
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Feb 5 08:04:38 2024 +0100

    Fixes #45

commit da4e186
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 17:47:38 2024 +0100

    Fixes parts of #44:

    - accounting menu: group order amounts (see posting above)
    - group order result (of a closed or settled order)
    - manage order menu: sorted in articles / sorted in groups

commit 4644497
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 13:56:14 2024 +0100

    Fixes #41

    see incorrect bugfix for #7 in 34c198f

commit 97f635a
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 15:14:38 2024 +0100

    Fixes #38

commit 9642e9b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 12:16:19 2024 +0100

    Fixes #48

commit 683d2af
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jan 14 18:09:45 2024 +0100

    First draft of #31

commit 88b7528
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 15:07:51 2024 +0100

    Revert "Fixes with upstream rubocop 1.50.2"

    This reverts commit a5ce332.

commit a5ce332
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 14:45:36 2024 +0100

    Fixes with upstream rubocop 1.50.2

commit 4561797
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:58:45 2024 +0100

    Closes #34

commit 5a06392
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:27:03 2024 +0100

    Fixes #33

commit aac0546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:17:26 2024 +0100

    Fixes #36

commit dd35ba6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 5 09:39:31 2024 +0100

    Fixes article import (load extra units)

commit ac81c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 17:27:49 2024 +0100

    Fixed bug in import (related to #10)

commit 38de812
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 15:41:04 2024 +0100

    Adapted seeds

commit d069d39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 11:24:15 2024 +0100

    Fixes nasty bug with article unit migrations

commit 43897db
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 20:38:37 2024 +0100

    Closes #30

commit 545b368
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 18:35:01 2024 +0100

    Fixes issue in units migration

commit 56bfb79
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:34:28 2024 +0100

    Fixes bug in order articles controller

commit 9a0f813
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:20:41 2024 +0100

    On #23: Added some translations

commit 21740ad
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:29:07 2024 +0100

    Fixes unit conversion tests

commit a5205c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:04:10 2024 +0100

    Closes #26

commit 275306f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 09:10:57 2024 +0100

    Changes for #10 and #25

commit 00b81f5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jan 2 18:16:38 2024 +0100

    Closes #26

commit 0478db2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 16:51:23 2023 +0100

    Fixes incorrect article units migration

commit 68de953
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 11:05:28 2023 +0100

    Fixes bug in stock takings

commit 262e475
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 18:49:29 2023 +0100

    Fixed exports

commit 948c480
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 17:10:32 2023 +0100

    Some more bugfixing

commit 380f279
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Dec 27 20:15:07 2023 +0100

    Bugfixing

commit 6b8c112
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Dec 26 16:34:54 2023 +0100

    Another fix for #28

commit 34c198f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 19:19:00 2023 +0100

    Another fix for #7

commit 240f2d2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 10:15:09 2023 +0100

    Some formatting issues

commit 1942755
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 19:39:26 2023 +0100

    On #25: Persist and display migration state (button no longer available if migration has been performed once)

commit 85cb33c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 14:45:22 2023 +0100

    Closes #28

commit 3cb2c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:49:19 2023 +0100

    Enhanced units display in dropdowns and order view

commit be321b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:11:18 2023 +0100

    On #25: Moved auto conversion unit tests

commit c56cf44
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 19 16:47:44 2023 +0100

    Started with #25

commit 56acdcb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 4 16:38:25 2023 +0100

    First implementations of #24 and #10

commit 700f9a5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Oct 29 18:00:19 2023 +0100

    Added more available units

commit 241e836
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 14:15:04 2023 +0200

    Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script

commit 4aad223
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 11:18:30 2023 +0200

    Swapped XPA for XPK

commit 948ef32
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 27 15:36:02 2023 +0200

    Article form usability and bug fixes

commit 0002749
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 21 13:25:27 2023 +0200

    Implemented edit all form

commit 3353cc7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 20 12:45:10 2023 +0200

    shared articles list design enhancements

commit b3218ed
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 14 10:30:27 2023 +0200

    Fix for #19

commit 67c0e38
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Oct 12 11:32:04 2023 +0200

    Fixes conversion error with stock articles

commit a4316a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 23 15:24:36 2023 +0200

    enable article sync via https

commit b8574ee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 28 16:27:49 2023 +0200

    Single article import form for #19

commit a196514
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Apr 23 19:15:25 2023 +0200

    Continued with link generation for #19

commit c5a63c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 22 18:01:10 2023 +0200

    Added link generation for #19

commit 5e2c91b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 8 18:31:57 2023 +0200

    Continued with #19

commit 9337d08
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 7 14:44:05 2023 +0200

    More additions to #19

commit 72c953f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 25 14:43:57 2023 +0100

    Continued with #19

commit 748f8b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 11 16:02:39 2023 +0100

    Started with #19

commit 4c9a831
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 20:14:53 2023 +0100

    Added temporary fake article JSON import generator

commit 64493b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 17:30:03 2023 +0100

    Partial fixes for #14 (will all be replaced by #20)

commit c3f5168
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 11 12:37:46 2023 +0100

    Closes #18

commit ef0660b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 10 10:33:02 2023 +0100

    Fixes #17

    see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120

commit 4b20a39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 11 11:33:44 2022 +0100

    Fixes issue with article versioning (wrong ID in update)

commit 4e1d3a9
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 20:07:25 2022 +0100

    Fixed Stock logic and started repairing specs

commit 3fa3526
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 15:24:25 2022 +0100

    TODOs

commit f2e6b76
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 26 18:47:28 2022 +0100

    Proposal for #13

commit 4a7d4aa
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 25 11:38:26 2022 +0100

    Closes #7

commit cd2caf0
Merge: 1907b02 aa307c3
Author: lentschi <office@florian-lentsch.at>
Date:   Sat Nov 26 17:09:52 2022 +0100

    Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2

    Article versioning refactoring

commit aa307c3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 12:10:49 2022 +0100

    Basic ordering workflow and exports are functioning

commit 117bca3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 10:37:23 2022 +0100

    Article model before_save versioning logic

commit edc199b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:35:57 2022 +0100

    Adapted model relations & adapted hackathon seeds

commit cfbe59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:31:51 2022 +0100

    Article versioning - Global replaces:

    Case-sensitive & regex:
    Case-sensitive & regex:
    \.price\.(?!to_) -> .article_version.
    oa\.article(?!_) -> oa.article_version
    order_article\.article(?!_) -> order_article.article_version
    \.article_version\.supplier(?!_) -> .article_version.article.supplier
    oa\.article_id -> oa.article_version.article_id
    (?<!_)article_price -> article_version
    ArticlePrice -> ArticleVersion

    Exclude: ./db/migrate/**/*.rb

    Renames:
    app/models/article_price.rb -> app/models/article_version.rb
    app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml

commit 8d04a02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Oct 26 14:23:51 2022 +0200

    Article versioning schema migration

commit 1907b02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 21 13:22:08 2022 +0200

    Adapted article price to use supplier_order_unit as base

commit 9a31c07
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:48:14 2022 +0200

    Reduced seeded price for potatoes

commit c72ef55
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:43:40 2022 +0200

    Fixes error in unit conversion

commit 9e6d6e4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 12:04:58 2022 +0200

    Fixes warnings in order accounting

commit 354a0b6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 10:33:59 2022 +0200

    Fixes missing units calculation with minimum order quantity

commit fda2bb4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 18 07:51:48 2022 +0200

    Some more price calculation fixes

commit 0314133
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:58:04 2022 +0200

    Revert "Fixes price calculation"

    This reverts commit d79ba4d.

commit d79ba4d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:49:03 2022 +0200

    Fixes price calculation

commit 9a7f59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:42:38 2022 +0200

    Fixes NaN error in receive form

commit def95de
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:38:01 2022 +0200

    Unit conversion fixes for receive form

commit 045e0d1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 15:02:14 2022 +0200

    Fixed group_order_article_quantities floating point values

commit 2405832
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 10:01:57 2022 +0200

    Fixes floating point error when posting group order

commit 1e328cd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 15:41:58 2022 +0200

    Fixed calculation errors

commit 32f478d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:33:29 2022 +0200

    Removed TODO

commit e9b8916
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:28:21 2022 +0200

    Fixed rubocop warning

commit be42e73
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:23:15 2022 +0200

    Made order_articles units float

commit 5760015
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jul 12 20:43:54 2022 +0200

    Added hackathon seeds and fixed some rounding issues

commit b33728b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 11 19:33:23 2022 +0200

    Fixes pack size calculation

commit ec31210
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:35:08 2022 +0200

    Made goa quantity and tolerance accept floats

commit 9a58885
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:34:43 2022 +0200

    Fixes bug in stepping

commit b6b6b31
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 11:13:39 2022 +0200

    group order form: round values

commit 0f0bc0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 10:53:45 2022 +0200

    group order granularity fixes

commit c776081
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 09:36:40 2022 +0200

    Don't show unit conversion field, if there's nothing to convert

commit 8f330a7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 3 10:09:23 2022 +0200

    Fixes conversion error, when there's no ratios

commit 1bb36a4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 1 14:42:34 2022 +0200

    Fixes article form issues

commit a2f085b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 20:25:45 2022 +0200

    Fixes error in accounting

commit 49e3db0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 17:04:33 2022 +0200

    Fixes another error in conversion field

commit 63f6710
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 09:40:12 2022 +0200

    Fixes error in conversion field

commit 66b2459
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 19 12:19:52 2022 +0200

    Fixes price in article form

commit 870f5b7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:41:55 2022 +0200

    Added unit convertes for billing article fields

commit 35f3c54
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:05:26 2022 +0200

    Fixed conversion error in article form

commit 0acb048
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 12:25:01 2022 +0200

    Done with billing in a first version

commit 12228da
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 12 11:34:40 2022 +0200

    Started with billing

commit 1b484f3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 22:09:16 2022 +0200

    Receive form edit article

commit c2579a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 10:19:05 2022 +0200

    Receive page adaptations

commit 7b8f1b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 20:26:34 2022 +0200

    Some more minimum order quantity fixes

commit cde1f1d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 15:22:22 2022 +0200

    Minimum order quantity fixes

commit ec53546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun May 15 13:02:53 2022 +0200

    Started with minimum order quantity

commit 65f3bdd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat May 14 12:36:33 2022 +0200

    Article form fix

commit 1708d23
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri May 13 13:38:17 2022 +0200

    Conversion fixes

commit b7f32d7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 29 14:53:22 2022 +0200

    Added unit to article_prices

commit 4ecf7d4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 23 20:23:02 2022 +0200

    Adapted order fax (though this is still a matter of debate)

commit 98f6bbf
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 22 14:35:23 2022 +0200

    Duplicate new properties in ArticlePrice

commit 07ed7a0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 15 15:35:31 2022 +0200

    Continued with group order form

commit d60b547
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 2 19:05:33 2022 +0200

    Started remodelling group order form

commit a1f4060
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Mar 27 14:51:52 2022 +0200

    Unit conversions work in a first version

commit f9ba668
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 25 11:38:12 2022 +0100

    Flat ratios

commit d86be97
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 18 12:10:17 2022 +0100

    Added units file convertor and result to enable easier transformations between units with the same base unit

commit 40fb822
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 4 09:54:38 2022 +0100

    Articles form - all fields implemented in a first version

commit f020ebb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Mar 2 18:36:09 2022 +0100

    Article edit form: Moved js to separate file

commit 5e8e093
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 10:44:38 2022 +0100

    Renamed fields

commit 65e26a3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 09:18:51 2022 +0100

    Fixes docker-compose foodsoft build

commit 038b00e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 19:36:18 2022 +0100

    Saving conversions works in a first version

commit 0153785
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:50:59 2022 +0100

    Added minimum_order_amount to articles

commit 57cb7c1
Merge: 979eebc f371f70
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:44:59 2022 +0100

    Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon

commit 979eebc
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:43:47 2022 +0100

    article data UI for new unit handling

commit f371f70
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:26:23 2022 +0100

    Added article unit conversions model and fixed migration

commit 41adb65
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:16:08 2022 +0100

    Added units of measure from https://datahub.io/core/unece-units-of-measure

commit e0a7073
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:01:22 2022 +0100

    rubocop fixes

commit 5194e96
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 19 23:07:18 2022 +0100

    First attempt at unit migration
lentschi added a commit that referenced this issue Mar 15, 2024
commit 8df48b744fbee9a5557c75782b47dfc4eb6ee18e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 11:36:13 2024 +0100

    Another attempt at running rubocop

commit a94f05d3062b2c9875f529c7cdc47f8c095caf9b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 11:11:21 2024 +0100

    Revert "rubocop -a with upstream rubocop"

    This reverts commit 9457ec09b254937c98f0e213dd95283b75291f46.

commit 9457ec09b254937c98f0e213dd95283b75291f46
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 15 10:28:12 2024 +0100

    rubocop -a with upstream rubocop

commit a23f34f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 17:17:27 2024 +0100

    Fixes #51

commit 3aa7f50
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 13:37:20 2024 +0100

    Fixes #52

commit 8a288b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 12:11:17 2024 +0100

    Fixes #48 (another fix)

commit 6cb809e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 1 11:37:48 2024 +0100

    Closes #24 again

commit d0f321c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:54:25 2024 +0100

    Fixes #43

commit 943f178
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 15:41:08 2024 +0100

    On #47: Escape commas in ratio unit names

commit 614cfdc
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 23 14:29:46 2024 +0100

    Some more fixes for #44

commit f351dee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 16 16:16:32 2024 +0100

    Some more fixes for #44

commit 34b6a51
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 16:48:25 2024 +0100

    Fixes #40

commit 5c12485
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 11 14:13:31 2024 +0100

    On #47: Removed unused columns from import/export

commit 3341d9d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 9 14:56:34 2024 +0100

    Closes #31

commit 9b66b28
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Feb 5 08:04:38 2024 +0100

    Fixes #45

commit da4e186
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 17:47:38 2024 +0100

    Fixes parts of #44:

    - accounting menu: group order amounts (see posting above)
    - group order result (of a closed or settled order)
    - manage order menu: sorted in articles / sorted in groups

commit 4644497
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 4 13:56:14 2024 +0100

    Fixes #41

    see incorrect bugfix for #7 in 34c198f

commit 97f635a
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 15:14:38 2024 +0100

    Fixes #38

commit 9642e9b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 3 12:16:19 2024 +0100

    Fixes #48

commit 683d2af
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jan 14 18:09:45 2024 +0100

    First draft of #31

commit 88b7528
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 15:07:51 2024 +0100

    Revert "Fixes with upstream rubocop 1.50.2"

    This reverts commit a5ce332.

commit a5ce332
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 14:45:36 2024 +0100

    Fixes with upstream rubocop 1.50.2

commit 4561797
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:58:45 2024 +0100

    Closes #34

commit 5a06392
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:27:03 2024 +0100

    Fixes #33

commit aac0546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 12 10:17:26 2024 +0100

    Fixes #36

commit dd35ba6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jan 5 09:39:31 2024 +0100

    Fixes article import (load extra units)

commit ac81c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 17:27:49 2024 +0100

    Fixed bug in import (related to #10)

commit 38de812
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 15:41:04 2024 +0100

    Adapted seeds

commit d069d39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jan 4 11:24:15 2024 +0100

    Fixes nasty bug with article unit migrations

commit 43897db
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 20:38:37 2024 +0100

    Closes #30

commit 545b368
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 18:35:01 2024 +0100

    Fixes issue in units migration

commit 56bfb79
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:34:28 2024 +0100

    Fixes bug in order articles controller

commit 9a0f813
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 13:20:41 2024 +0100

    On #23: Added some translations

commit 21740ad
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:29:07 2024 +0100

    Fixes unit conversion tests

commit a5205c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 11:04:10 2024 +0100

    Closes #26

commit 275306f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Jan 3 09:10:57 2024 +0100

    Changes for #10 and #25

commit 00b81f5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jan 2 18:16:38 2024 +0100

    Closes #26

commit 0478db2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 16:51:23 2023 +0100

    Fixes incorrect article units migration

commit 68de953
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Dec 30 11:05:28 2023 +0100

    Fixes bug in stock takings

commit 262e475
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 18:49:29 2023 +0100

    Fixed exports

commit 948c480
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 29 17:10:32 2023 +0100

    Some more bugfixing

commit 380f279
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Dec 27 20:15:07 2023 +0100

    Bugfixing

commit 6b8c112
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Dec 26 16:34:54 2023 +0100

    Another fix for #28

commit 34c198f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 19:19:00 2023 +0100

    Another fix for #7

commit 240f2d2
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 15 10:15:09 2023 +0100

    Some formatting issues

commit 1942755
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 19:39:26 2023 +0100

    On #25: Persist and display migration state (button no longer available if migration has been performed once)

commit 85cb33c
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 10 14:45:22 2023 +0100

    Closes #28

commit 3cb2c0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:49:19 2023 +0100

    Enhanced units display in dropdowns and order view

commit be321b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Dec 1 09:11:18 2023 +0100

    On #25: Moved auto conversion unit tests

commit c56cf44
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 19 16:47:44 2023 +0100

    Started with #25

commit 56acdcb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 4 16:38:25 2023 +0100

    First implementations of #24 and #10

commit 700f9a5
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Oct 29 18:00:19 2023 +0100

    Added more available units

commit 241e836
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 14:15:04 2023 +0200

    Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script

commit 4aad223
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 28 11:18:30 2023 +0200

    Swapped XPA for XPK

commit 948ef32
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 27 15:36:02 2023 +0200

    Article form usability and bug fixes

commit 0002749
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 21 13:25:27 2023 +0200

    Implemented edit all form

commit 3353cc7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 20 12:45:10 2023 +0200

    shared articles list design enhancements

commit b3218ed
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Oct 14 10:30:27 2023 +0200

    Fix for #19

commit 67c0e38
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Oct 12 11:32:04 2023 +0200

    Fixes conversion error with stock articles

commit a4316a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 23 15:24:36 2023 +0200

    enable article sync via https

commit b8574ee
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 28 16:27:49 2023 +0200

    Single article import form for #19

commit a196514
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Apr 23 19:15:25 2023 +0200

    Continued with link generation for #19

commit c5a63c7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 22 18:01:10 2023 +0200

    Added link generation for #19

commit 5e2c91b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 8 18:31:57 2023 +0200

    Continued with #19

commit 9337d08
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 7 14:44:05 2023 +0200

    More additions to #19

commit 72c953f
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 25 14:43:57 2023 +0100

    Continued with #19

commit 748f8b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Mar 11 16:02:39 2023 +0100

    Started with #19

commit 4c9a831
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 20:14:53 2023 +0100

    Added temporary fake article JSON import generator

commit 64493b8
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 10 17:30:03 2023 +0100

    Partial fixes for #14 (will all be replaced by #20)

commit c3f5168
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 11 12:37:46 2023 +0100

    Closes #18

commit ef0660b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 10 10:33:02 2023 +0100

    Fixes #17

    see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120

commit 4b20a39
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Dec 11 11:33:44 2022 +0100

    Fixes issue with article versioning (wrong ID in update)

commit 4e1d3a9
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 20:07:25 2022 +0100

    Fixed Stock logic and started repairing specs

commit 3fa3526
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 27 15:24:25 2022 +0100

    TODOs

commit f2e6b76
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Nov 26 18:47:28 2022 +0100

    Proposal for #13

commit 4a7d4aa
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 25 11:38:26 2022 +0100

    Closes #7

commit cd2caf0
Merge: 1907b02 aa307c3
Author: lentschi <office@florian-lentsch.at>
Date:   Sat Nov 26 17:09:52 2022 +0100

    Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2

    Article versioning refactoring

commit aa307c3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 12:10:49 2022 +0100

    Basic ordering workflow and exports are functioning

commit 117bca3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Nov 18 10:37:23 2022 +0100

    Article model before_save versioning logic

commit edc199b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:35:57 2022 +0100

    Adapted model relations & adapted hackathon seeds

commit cfbe59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Nov 6 18:31:51 2022 +0100

    Article versioning - Global replaces:

    Case-sensitive & regex:
    Case-sensitive & regex:
    \.price\.(?!to_) -> .article_version.
    oa\.article(?!_) -> oa.article_version
    order_article\.article(?!_) -> order_article.article_version
    \.article_version\.supplier(?!_) -> .article_version.article.supplier
    oa\.article_id -> oa.article_version.article_id
    (?<!_)article_price -> article_version
    ArticlePrice -> ArticleVersion

    Exclude: ./db/migrate/**/*.rb

    Renames:
    app/models/article_price.rb -> app/models/article_version.rb
    app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml

commit 8d04a02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Oct 26 14:23:51 2022 +0200

    Article versioning schema migration

commit 1907b02
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Oct 21 13:22:08 2022 +0200

    Adapted article price to use supplier_order_unit as base

commit 9a31c07
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:48:14 2022 +0200

    Reduced seeded price for potatoes

commit c72ef55
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 15:43:40 2022 +0200

    Fixes error in unit conversion

commit 9e6d6e4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 12:04:58 2022 +0200

    Fixes warnings in order accounting

commit 354a0b6
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 22 10:33:59 2022 +0200

    Fixes missing units calculation with minimum order quantity

commit fda2bb4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 18 07:51:48 2022 +0200

    Some more price calculation fixes

commit 0314133
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:58:04 2022 +0200

    Revert "Fixes price calculation"

    This reverts commit d79ba4d.

commit d79ba4d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:49:03 2022 +0200

    Fixes price calculation

commit 9a7f59d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:42:38 2022 +0200

    Fixes NaN error in receive form

commit def95de
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 17 11:38:01 2022 +0200

    Unit conversion fixes for receive form

commit 045e0d1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 15:02:14 2022 +0200

    Fixed group_order_article_quantities floating point values

commit 2405832
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Jul 16 10:01:57 2022 +0200

    Fixes floating point error when posting group order

commit 1e328cd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 15:41:58 2022 +0200

    Fixed calculation errors

commit 32f478d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:33:29 2022 +0200

    Removed TODO

commit e9b8916
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:28:21 2022 +0200

    Fixed rubocop warning

commit be42e73
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 15 13:23:15 2022 +0200

    Made order_articles units float

commit 5760015
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Tue Jul 12 20:43:54 2022 +0200

    Added hackathon seeds and fixed some rounding issues

commit b33728b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jul 11 19:33:23 2022 +0200

    Fixes pack size calculation

commit ec31210
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:35:08 2022 +0200

    Made goa quantity and tolerance accept floats

commit 9a58885
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 10 13:34:43 2022 +0200

    Fixes bug in stepping

commit b6b6b31
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 11:13:39 2022 +0200

    group order form: round values

commit 0f0bc0e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 10:53:45 2022 +0200

    group order granularity fixes

commit c776081
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 8 09:36:40 2022 +0200

    Don't show unit conversion field, if there's nothing to convert

commit 8f330a7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jul 3 10:09:23 2022 +0200

    Fixes conversion error, when there's no ratios

commit 1bb36a4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jul 1 14:42:34 2022 +0200

    Fixes article form issues

commit a2f085b
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 20:25:45 2022 +0200

    Fixes error in accounting

commit 49e3db0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 17:04:33 2022 +0200

    Fixes another error in conversion field

commit 63f6710
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Jun 24 09:40:12 2022 +0200

    Fixes error in conversion field

commit 66b2459
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 19 12:19:52 2022 +0200

    Fixes price in article form

commit 870f5b7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:41:55 2022 +0200

    Added unit convertes for billing article fields

commit 35f3c54
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 20:05:26 2022 +0200

    Fixed conversion error in article form

commit 0acb048
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Thu Jun 16 12:25:01 2022 +0200

    Done with billing in a first version

commit 12228da
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 12 11:34:40 2022 +0200

    Started with billing

commit 1b484f3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 22:09:16 2022 +0200

    Receive form edit article

commit c2579a1
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Mon Jun 6 10:19:05 2022 +0200

    Receive page adaptations

commit 7b8f1b0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 20:26:34 2022 +0200

    Some more minimum order quantity fixes

commit cde1f1d
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Jun 5 15:22:22 2022 +0200

    Minimum order quantity fixes

commit ec53546
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun May 15 13:02:53 2022 +0200

    Started with minimum order quantity

commit 65f3bdd
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat May 14 12:36:33 2022 +0200

    Article form fix

commit 1708d23
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri May 13 13:38:17 2022 +0200

    Conversion fixes

commit b7f32d7
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 29 14:53:22 2022 +0200

    Added unit to article_prices

commit 4ecf7d4
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 23 20:23:02 2022 +0200

    Adapted order fax (though this is still a matter of debate)

commit 98f6bbf
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 22 14:35:23 2022 +0200

    Duplicate new properties in ArticlePrice

commit 07ed7a0
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Apr 15 15:35:31 2022 +0200

    Continued with group order form

commit d60b547
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Apr 2 19:05:33 2022 +0200

    Started remodelling group order form

commit a1f4060
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Mar 27 14:51:52 2022 +0200

    Unit conversions work in a first version

commit f9ba668
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 25 11:38:12 2022 +0100

    Flat ratios

commit d86be97
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 18 12:10:17 2022 +0100

    Added units file convertor and result to enable easier transformations between units with the same base unit

commit 40fb822
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Mar 4 09:54:38 2022 +0100

    Articles form - all fields implemented in a first version

commit f020ebb
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Wed Mar 2 18:36:09 2022 +0100

    Article edit form: Moved js to separate file

commit 5e8e093
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 10:44:38 2022 +0100

    Renamed fields

commit 65e26a3
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Fri Feb 25 09:18:51 2022 +0100

    Fixes docker-compose foodsoft build

commit 038b00e
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 19:36:18 2022 +0100

    Saving conversions works in a first version

commit 0153785
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:50:59 2022 +0100

    Added minimum_order_amount to articles

commit 57cb7c1
Merge: 979eebc f371f70
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:44:59 2022 +0100

    Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon

commit 979eebc
Author: Ostler, Leonard <leonard.ostler@student.tugraz.at>
Date:   Sun Feb 20 13:43:47 2022 +0100

    article data UI for new unit handling

commit f371f70
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 13:26:23 2022 +0100

    Added article unit conversions model and fixed migration

commit 41adb65
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:16:08 2022 +0100

    Added units of measure from https://datahub.io/core/unece-units-of-measure

commit e0a7073
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sun Feb 20 12:01:22 2022 +0100

    rubocop fixes

commit 5194e96
Author: Florian Lentsch <office@florian-lentsch.at>
Date:   Sat Feb 19 23:07:18 2022 +0100

    First attempt at unit migration
@lentschi
Copy link
Contributor Author

lentschi commented Aug 2, 2024

Spanish, French, Dutch and Turkish added by free API translation in 3fca7de

lentschi added a commit that referenced this issue Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants