search

tigeorgia / shenmartav

Website for shenmartav.ge
GNU General Public License v2.0
3 stars 9 forks source link

Change "other income" to "business income"? #92

Closed ddohler closed 12 years ago

ddohler commented 12 years ago

As far as I recall, we are calculating the "Other income" field using solely income from the Entrepreneurship table in the income declarations. @sebastiantransparency can you confirm?

If you confirm, we'll send you new mouseover texts, and then please change the label to "Business income."

sebastiantransparency commented 12 years ago

that's right, it's only from entrepreneurial. please send me updated mouseover texts and i will change the label accordingly. maybe we should also change it in the model (and the views) to avoid later confusion? that would require a bit more time, but should be doable < 5h. or maybe other_income will include other sources than entrepreneurial at some stage and we should just stick with changing the label? iirc, 'cash' or 'contract' are not part of any income yet.

ddohler commented 12 years ago

Let's leave the database as-is for now and just change the external label. We'll have a meeting with the CSB guys later this month (they do the asset declarations), and one of the things we'll bring up is the difficulty of calculating total income because of the way they mix income, expenses, and other text in the declaration documents. We'll also ask (again) for a direct XML/CSV/whatever dump of the database.

ddohler commented 12 years ago

Shifting this to @EkaR for mouseover text.

EkaR commented 12 years ago

Updated right here: http://goo.gl/ERT9M, does this look okay?:

BUSINESS INCOME Income that a representative receives from businesses owned by him/her. წარმომადგენლის ბიზნეს აქტივობებიდან მიღებული შემოსავალი.

EkaR commented 12 years ago

Changed Georgian under Rosetta.

ddohler commented 12 years ago

Back to @sebastiantransparency

sebastiantransparency commented 12 years ago

ok, i only changed the label in various places. but after Derek's talk to the CSB, we should change it properly. it's not only the database, there are a dozen or so places with variable names and CSS ids which are named 'other_income' of some sorts.

@EkaR in future please don't change the translation before the master has been updated. now you have a fuzzy translation that doesn't show up and you have to check it again (in Rosetta).

EkaR commented 12 years ago

Oops, sorry, understood!