498 Commits

Author	SHA1	Message	Date
Rob Harrington	7ef0964af2	Adding shortcuts for both sales tax reports to the reports index	2017-03-15 23:57:13 +11:00
Rob Harrington	18472ea8c3	Making 'tax types' report the default sales tax report	2017-03-15 23:56:44 +11:00
Rob Harrington	36e0f45a89	Show the shops invoice text on old invoice template	2017-03-15 17:39:21 +11:00
Pierre de Lacroix	70707969f3	Add Qz integration	2017-03-15 15:06:28 +11:00
Pierre de Lacroix	2fe25c6219	Allow both invoice layouts to coexist ... Add a new "Invoice" page in the admin backend with a checkbox to toggle between layouts	2017-03-15 15:06:28 +11:00
Pierre de Lacroix	cc1ef5b28b	fixes on invoice and tax report	2017-03-15 15:04:57 +11:00
Rob Harrington	0429906eed	Slight adjustments to invoice layout ... 1. Hide tax column when no tax included in the order 2. Save a little bit of space in the header by sharing rows	2017-03-15 15:03:46 +11:00
Pierre de Lacroix	88a09da325	fix for pull request #1374	2017-03-15 15:03:18 +11:00
Pierre de Lacroix	8570471c00	add tax rates report	2017-03-15 15:03:18 +11:00
Pierre de Lacroix	7925af30d6	add enterprise logo and custom text on invoices	2017-03-15 15:03:18 +11:00
Pierre de Lacroix	2d2792225a	change invoice layout to include amount for each relevant tax rate	2017-03-15 15:03:18 +11:00
François Turbelin	be6b09a6e0	Adding i18n keys on JS templates	2017-03-12 12:22:13 +01:00
Lynne Davis	cad3464f56	Adjusted BOM spec to reflect currency symbol changes	2016-12-09 11:40:55 +00:00
Rohan Mitchell	d574b8943b	WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM	2016-11-04 09:39:17 +11:00
Rob Harrington	261a574da9	Tweaking styling on enterprise change form, and dashboard header row	2016-09-07 11:13:48 +10:00
Rob Harrington	be51a55f16	Only display shopfront trial message on dashboard page. Fixes #1120	2016-09-02 13:45:49 +10:00
Continuous Integration	9ba07a2afb	Merge remote-tracking branch 'origin/master' into HEAD	2016-06-15 11:26:02 +10:00
Bing Xie	82dc2a8c98	Update bulk products editing page	2016-06-15 10:51:34 +10:00
Bing Xie	860a537f30	Add save bar to bulk editing product page	2016-06-15 10:51:34 +10:00
Maikel Linke	cb679a6aba	Remove duplicate "What's this?" from order cycles overview	2016-06-10 09:18:26 +10:00
Rob Harrington	4d83bf2135	Payment methods can be tagged	2016-05-27 16:25:10 +10:00
Rob Harrington	385fd91e70	Adding angularjs payment method controller, updating payment method edit form	2016-05-27 16:25:10 +10:00
Rob Harrington	b9f6cb8800	Adding translations for all column names	2016-05-25 08:10:20 +10:00
Rob Harrington	1d8719b474	Default column visibility can be set per user using ColumnPreferences model	2016-05-25 08:10:20 +10:00
Rob Harrington	533a94267a	Refactoring save-bar	2016-05-25 08:10:20 +10:00
Rob Harrington	8838a89ecc	Don't typecast product and variant on_hand from DOM when it is 'On demand'	2016-05-25 08:10:20 +10:00
Rob Harrington	6a610ff7a4	Merge remote-tracking branch 'origin/master' into uk/trial-length	2016-05-20 12:22:47 +10:00
Bing Xie	f8ec0d316a	Save bar can support cancel button	2016-05-12 11:04:40 +10:00
Bing Xie	78b4a35d12	Keep the action with save button	2016-05-12 10:45:41 +10:00
Bing Xie	2214c83ec7	Use save_bar on order cycle update form	2016-05-12 10:45:41 +10:00
Lynne Davis	51629cd0c0	Adding translations for shop front trials	2016-04-15 16:55:06 +01:00
elf Pavlik	f15e948085	small i18n fixes #878	2016-04-14 16:10:21 -05:00
elf Pavlik	6d0dc438a7	i18n fixes after @sstead feedback in #799	2016-03-21 16:55:57 -06:00
Maikel Linke	2546603a67	Remove what_is_this from locale ... It got replaced by admin.whats_this. Changed views to use the new key.	2016-03-11 17:08:13 +11:00
Maikel Linke	5225686d8f	Re-merge bulk order view	2016-03-11 12:23:12 +11:00
Maikel Linke	3e5f53b082	Rename i18n key what_is_this	2016-03-11 12:13:17 +11:00
Maikel Linke	02cc5adf78	Revert false HAML indent	2016-03-09 19:04:37 +11:00
Maikel Linke	02cbad2697	Remove duplicate lines from merging	2016-03-09 18:49:35 +11:00
elf Pavlik	68db9b9926	fixing faling tests	2016-02-28 19:58:03 +00:00
Nicolas Blanc	cb33ede9dc	Revert "elf-pavlik@ee52f1d" ... This reverts commit a8d7732a39.	2016-02-28 19:54:44 +00:00
Nicolas Blanc	a8d7732a39	elf-pavlik@ee52f1d	2016-02-28 19:23:26 +00:00
Nicolas Blanc	4621f625a0	new validation6 02/25/2016	2016-02-25 12:36:21 +00:00
Nicolas Blanc	5e71790cd1	new validation5 02/25/2016	2016-02-25 11:04:21 +00:00
Rohan Mitchell	258e84fc0a	Replace with-tip with ofn-with-tip: misc	2016-02-24 11:26:37 +11:00
Rohan Mitchell	d699f8321a	Replace with-tip with ofn-with-tip: dashboard	2016-02-24 11:26:37 +11:00
Nicolas Blanc	52d5b8936e	new validation4 02/22/2016	2016-02-22 14:54:31 +00:00
Nicolas Blanc	1738db9e1f	new validation 02/22/2016	2016-02-22 13:00:27 +00:00
Nicolas Blanc	614f83799e	new test 2016/02/20	2016-02-20 19:23:22 +00:00
Nicolas Blanc	2be005d344	i18n from berlin hackathon	2016-01-31 12:16:33 +00:00
Rob Harrington	cc4dc068ab	Adding variant SKU field to BPE	2016-01-13 18:49:34 +11:00