wvengen
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
wvengen
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
wvengen
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
Julius
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
Julius
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
Julius
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
Julius
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
wvengen
27a73be68f
Merge remote-tracking branch 'foodcoops/master' into feature-receive
2014-01-02 18:57:59 +01:00
Julius
b22677eced
Change order link from invoice form to avoid access problems
2013-12-30 11:26:10 +01:00
wvengen
f5bd7a43e4
update balancing order article edit screen to support received units
2013-12-23 15:25:45 +01:00
wvengen
03bb83ecc0
show different warning signs for mismatch with ordered and received
2013-12-23 12:35:09 +01:00
wvengen
41ea9ed66e
hide receive screen for stock orders
2013-12-21 17:36:25 +01:00
wvengen
3d511ea2fb
only show receive in finance when access to ordering
2013-12-18 22:19:36 +01:00
wvengen
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
wvengen
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
wvengen
1ab09b41bd
fix articles_for_select2 helper
2013-12-18 17:34:45 +01:00
wvengen
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
Julius
40e9e82295
Mark two i18n issues
2013-12-14 10:03:32 +01:00
wvengen
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
wvengen
c900cf4988
make product redistribution work!
2013-11-27 00:06:25 +01:00
wvengen
2d99141229
only allow to add articles not already present in receive
2013-11-26 13:31:07 +01:00
wvengen
9cb9bf6c1a
focus newly added input in receive
2013-11-26 13:00:34 +01:00
wvengen
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
wvengen
9c340ec08e
more clarity whether a number is number units or boxes
2013-11-25 15:13:54 +01:00
wvengen
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
wvengen
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
wvengen
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
wvengen
98e7189d31
Merge branch 'master' into i18n
...
Conflicts:
app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
wvengen
67e29620f4
i18n simple_form move of invoices
2013-10-09 23:37:08 +02:00
wvengen
a9dff7f1df
add missing i18n
2013-10-04 10:25:53 +02:00
wvengen
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
wvengen
0abb63279f
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile.lock
2013-09-18 13:00:26 +02:00
wvengen
e20898c5ee
Merge branch 'tests-rspec' into master-spec
2013-09-10 11:37:05 +02:00
wvengen
12c0636941
fix i18n buglets ( closes #167 )
2013-09-10 10:27:13 +02:00
wvengen
37e5b0c25c
add balancing integration spec
2013-07-26 18:34:03 +02:00
wvengen
33b27d2fa7
proper usage of jQuery.on(), and update javascript in views as well
2013-07-08 22:41:06 +02:00
wvengen
cab6ada8b8
small invoice i18n cleanup/refactoring
2013-06-21 14:24:05 +02:00
wvengen
906093b3ce
small i18n fixes and clarifications
2013-06-21 13:49:34 +02:00
wvengen
3cfd8b2d44
fix i18n key
2013-06-21 13:25:52 +02:00
wvengen
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
wvengen
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
wvengen
3b7cbf71e0
fix i18n typos
2013-05-16 00:05:47 +02:00
wvengen
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
wvengen
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
Benjamin Meichsner
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
Benjamin Meichsner
9c21a14c7e
Update group results when editing order article in balancing.
2013-04-08 14:26:40 +02:00
wvengen
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
wvengen
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Benjamin Meichsner
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
Benjamin Meichsner
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
Benjamin Meichsner
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
wvengen
19527f8425
fix some link handling in i18n (using html_safe)
2013-03-09 00:48:52 +01:00
wvengen
b81f414ae5
finish finance/order_articles i18n + en translation
2013-03-08 23:35:50 +01:00
wvengen
2b03a15a9a
finish finance invoice i18n and en translation
2013-02-27 12:31:01 +01:00
Manuel Wiedenmann
0065c44b74
i18n finance ordergroups
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
d2cd5b2b02
i18n group order articles
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
benni
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
benni
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
benni
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
davidrabel
cda3c37e20
Umlaute eingefügt
2012-07-19 15:37:17 +02:00
davidrabel
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
benni
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
benni
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
benni
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
benni
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
benni
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
benni
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
Benjamin Meichsner
3a85d4f49f
Fixed bug on ordergroups account managment page.
2010-05-28 11:50:18 +02:00
sandoz
305a4ac895
Don't show action "Create invoice" for stock order
2009-10-05 13:36:57 +02:00
Benjamin Meichsner
529956ea5a
Merge branch 'wiki'
...
Conflicts:
app/helpers/pages_helper.rb
public/stylesheets/main.css
public/stylesheets/print.css
2009-09-28 15:04:07 +02:00
sandoz
f7e24d26b4
Better layout with equal distance from each sides.
...
* Added css class middle_column
2009-08-21 23:37:05 +02:00
root
7e2506baa2
Fixed haml bug.
2009-08-06 16:14:36 +02:00
Benjamin Meichsner
f72dccae18
Added edit invoice link to balancing sheet. Closes #8
2009-08-04 13:25:59 +02:00
Benjamin Meichsner
578002501b
Hide ordergroups with result = 0.
2009-04-03 18:01:19 +02:00
Benjamin Meichsner
8fb4334610
Modified sort_link helper method to allo non ajax links.
2009-04-03 17:16:39 +02:00
sandoz
5a7fe17437
Make list of ordered articles sortable in _edit_results_by_articles
...
* For the moment you can sort by article name and order number
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:48 +08:00
sandoz
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
sandoz
54715e50fc
Changed caption of group orders sum price
...
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
(FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
2009-03-22 14:16:52 +01:00
sandoz
cde1fb3525
Show total price of ordered units per article in finance/balancing
...
* Implement functions total_price and total_gross_price on model
order_article
* Show total_price and total_gross_price in view finance/balancing
_order_article (Closed #108 )
2009-03-22 14:16:52 +01:00
sandoz
2e490d1a52
Capitalized first letter of 'netto' and 'brutto' in Captions.
2009-03-22 14:16:52 +01:00
sandoz
6da9190b03
Added buttons to in/decrease group order article results.
2009-03-20 20:37:13 +01:00
sandoz
8fbce954e3
Correct 'brutto'-price to be price.gross not fc_price.
...
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
2009-03-20 20:28:44 +01:00
sandoz
2c52944956
Fixed buggy link in finance/balancing/new.html.haml
...
* Link to "Rechnung anlegen" did not send supplier id.
2009-03-20 16:32:47 +01:00
Benjamin Meichsner
da08365816
Fixed bug order.profit calculation.
...
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +01:00
Benjamin Meichsner
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
Benjamin Meichsner
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
Benjamin Meichsner
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
Benjamin Meichsner
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
Benjamin Meichsner
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
Benjamin Meichsner
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
Benjamin Meichsner
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +01:00
Benjamin Meichsner
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
Benjamin Meichsner
ec402ffa7b
Fixed order.close workflow. (formerly known as order.balance)
2009-01-30 22:27:55 +01:00
Benjamin Meichsner
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
