459 Commits

Author	SHA1	Message	Date
elf Pavlik	2a4f3f9ae4	making test pass	2015-12-21 10:11:08 +01:00
knopfler81	ed48b691e1	translations in app/assets/javascripts/admin	2015-12-21 10:11:08 +01:00
Emmanuel	30141bd488	few translations in app/assets/javascripts/admin/	2015-12-21 10:11:08 +01:00
victor goutay	e16e3fba40	translations in app/assets/javascripts/admin/	2015-12-21 10:11:08 +01:00
ludivinecp	69ab113201	translations in app/assets/javascripts/admin/	2015-12-21 10:11:07 +01:00
elf Pavlik	8a390dd237	fixing test failing after i18n changes	2015-12-21 10:11:07 +01:00
julienFR88	5290d0be6b	add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin	2015-12-21 10:11:07 +01:00
Edem	6cd7fbb455	all string translated in admin bulk orders management	2015-12-21 10:11:07 +01:00
Edem	8ccf527e01	all strings in app/views/spree/admin/overview/* translated!	2015-12-21 10:11:06 +01:00
Edem	d2ec4fcf88	Everything string translated in admin/entreprise_relationships	2015-12-21 10:11:06 +01:00
julienFR88	8fa293f561	my admin interface translations	2015-12-21 10:10:58 +01:00
apprenti	b58306aad8	my first translations	2015-12-21 09:47:18 +01:00
Edem	2a2f8f3531	admin entreprise_group are translated!	2015-12-21 09:47:18 +01:00
Rob Harrington	0ed8cf973d	Adding an example bill calculator to business model config edit page ... To allow super admin to see the effects of any changes they make to BMC settings	2015-12-16 19:18:58 +11:00
Rob Harrington	ca3c464fda	Reorganising busines model config settings, moving account invoice tax rate in busines model config settings	2015-12-16 19:18:57 +11:00
Rob Harrington	5b72f53738	Adding helper for describing monthly billing charges	2015-12-16 19:18:57 +11:00
Rob Harrington	cb9b61f393	WIP: Adding an edit view for BMC variables	2015-12-16 19:18:56 +11:00
Rob Harrington	e20b06bb97	Adding basic route and controller for business model configuration	2015-12-16 19:18:56 +11:00
Rob Harrington	c91f1301f0	Adding preferences to enterprises for sorting of order cycles in shopfront list	2015-12-16 11:55:23 +11:00
Rob Harrington	e6a51bb49d	Adding actions dropdown to admin order view/pages	2015-12-16 11:55:23 +11:00
Rob Harrington	ae0ad73b4a	Printable Invoices Improvements for Food Connect ... Adding cusotmer instructions, hiding tax column when not present, order cycle name appears at top of invoice and items are sorted by product name	2015-12-16 11:55:23 +11:00
Rob Harrington	96aace971f	Merge remote-tracking branch 'origin/master' into line_item_naming	2015-11-25 15:13:56 +11:00
Paul Mackay	a2a87cc68f	#715: Add missing strings for en-GB locale.	2015-11-23 16:44:39 +00:00
Rob Harrington	75846a4d1f	Merge branch 'master' into line_item_naming	2015-11-16 10:38:42 +11:00
Maikel Linke	8bfe459241	i18n fixes of html display	2015-11-13 14:22:17 +11:00
Maikel Linke	5d5fda3a25	Merge remote-tracking branch 'origin/master' into i18n ... Conflicts: config/locales/en.yml	2015-11-13 10:07:29 +11:00
Rob Harrington	a96cdd5ee7	Merge branch 'master' into line_item_naming ... Conflicts: app/views/admin/order_cycles/edit.html.haml	2015-11-13 09:54:26 +11:00
Rob Harrington	be8038e9d0	Merge branch 'master' into line_item_naming ... Conflicts: lib/open_food_network/order_cycle_management_report.rb lib/open_food_network/packing_report.rb	2015-11-12 14:40:11 +11:00
Rohan Mitchell	e20d8d3e95	Merge branch 'master' into folklabs-producer-emails	2015-11-11 14:20:25 +11:00
Rohan Mitchell	727ecae62b	Admin can modify a taxed adjustment on an order	2015-11-11 11:53:04 +11:00
Rohan Mitchell	d794981ecf	Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.	2015-11-11 11:53:04 +11:00
Maikel Linke	a06b452e7e	updated norwegian locale	2015-11-07 16:42:35 +11:00
Maikel Linke	0b6cbb43d6	updated locale nb.yml	2015-11-06 11:56:25 +11:00
Rob Harrington	bf6bd2dc68	Hack down routes available for Admin::LineItemsController	2015-11-05 17:18:32 +11:00
Maikel Linke	90d52151b6	Updated fr.yml	2015-11-05 11:53:38 +11:00
Rob Harrington	b43049af47	WIP: BOM Refactor, building line_item fetch and update logic with ngResource	2015-11-04 18:16:17 +11:00
Rob Harrington	ae7e744644	WIP: BOM Refactor, adding for_line_items action to enterprises controller	2015-11-04 15:02:29 +11:00
Maikel Linke	fd747f9012	Updated French locale	2015-10-30 12:20:12 +11:00
Maikel Linke	4eed222f18	Fixed several i18n issues reported by Myriam	2015-10-29 14:55:38 +11:00
Rohan Mitchell	f63a80300b	Merge branch 'master' into folklabs-producer-emails	2015-10-29 11:49:24 +11:00
Rob Harrington	18a7317185	Merge branch 'account-invoices' into line_item_naming ... Conflicts: app/models/spree/line_item_decorator.rb	2015-10-28 13:42:27 +11:00
Rob Harrington	ef08977dbe	Prevent invoices from being sent unless the distributor of an order has set their ABN	2015-10-21 16:23:48 +11:00
Maikel Linke	7163664725	updated locales fr and nb	2015-10-21 14:36:02 +11:00
Maikel Linke	2053fbecda	Merge branch 'i18n-replace-strings-in-js' into i18n ... Conflicts: .travis.yml app/views/spree/order_mailer/confirm_email_for_customer.html.haml config/locales/en.yml	2015-10-21 14:09:43 +11:00
Maikel Linke	2ea1a59666	depricating db2fog.rb initializer due to invalid bucket name ... Once everybody changed their server config, we can remove that file.	2015-10-21 10:04:28 +11:00
Rob Harrington	f12fd7b4a3	Adding button for print action to admin orders show page	2015-10-16 17:25:40 +11:00
Rob Harrington	40d627cb34	Adding new route for printing an order to pdf	2015-10-16 17:25:40 +11:00
Rob Harrington	6e7fc6a0f7	Adding invoice action to orders controller, to allow sending of invoice email	2015-10-16 17:25:40 +11:00
Rob Harrington	3a505abfc7	Adding WickedPDF for generation of order invoices	2015-10-16 17:25:39 +11:00
Rohan Mitchell	ecc3bad8c8	Merge branch 'master' into folklabs-producer-emails	2015-10-16 12:38:54 +11:00