Merge branch 'master' into registry-787

# Conflicts:
#	db/structure.sql

db/migrate/20180228055259_add_registrars_vat_rate.rb

@@ -0,0 +1,5 @@
+class AddRegistrarsVatRate < ActiveRecord::Migration
+  def change
+    add_column :registrars, :vat_rate, :decimal, precision: 4, scale: 3
+  end
+end

db/migrate/20180228064342_rename_invoices_vat_prc_to_vat_rate.rb

@@ -0,0 +1,5 @@
+class RenameInvoicesVatPrcToVatRate < ActiveRecord::Migration
+  def change
+    rename_column :invoices, :vat_prc, :vat_rate
+  end
+end

db/migrate/20180228070102_change_invoices_vat_rate_type.rb

@@ -0,0 +1,5 @@
+class ChangeInvoicesVatRateType < ActiveRecord::Migration
+  def change
+    change_column :invoices, :vat_rate, :decimal, precision: 4, scale: 3
+  end
+end

db/migrate/20180228070431_change_invoice_vat_rate_to_null.rb

@@ -0,0 +1,5 @@
+class ChangeInvoiceVatRateToNull < ActiveRecord::Migration
+  def change
+    change_column_null :invoices, :vat_rate, true
+  end
+end

db/migrate/20180228074442_remove_registrars_vat.rb

@@ -0,0 +1,5 @@
+class RemoveRegistrarsVat < ActiveRecord::Migration
+  def change
+    remove_column :registrars, :vat, :boolean
+  end
+end

db/migrate/20180310142630_remove_invoices_invoice_type.rb

@@ -0,0 +1,5 @@
+class RemoveInvoicesInvoiceType < ActiveRecord::Migration
+  def change
+    remove_column :invoices, :invoice_type, :string
+  end
+end

db/migrate/20180313090437_rename_invoices_sum_cache_to_total.rb

@@ -0,0 +1,5 @@
+class RenameInvoicesSumCacheToTotal < ActiveRecord::Migration
+  def change
+    rename_column :invoices, :sum_cache, :total
+  end
+end

db/migrate/20180313124751_change_invoices_total_to_not_null.rb

@@ -0,0 +1,5 @@
+class ChangeInvoicesTotalToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :invoices, :total, false
+  end
+end

db/migrate/20180314122722_add_invoices_buyer_vat_no.rb

@@ -0,0 +1,5 @@
+class AddInvoicesBuyerVatNo < ActiveRecord::Migration
+  def change
+    add_column :invoices, :buyer_vat_no, :string
+  end
+end

db/structure.sql

@@ -997,13 +997,12 @@ CREATE TABLE invoices (
     id integer NOT NULL,
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
-    invoice_type character varying NOT NULL,
     due_date timestamp without time zone NOT NULL,
     payment_term character varying,
     currency character varying NOT NULL,
     description character varying,
     reference_no character varying,
-    vat_prc numeric(10,2) NOT NULL,
+    vat_rate numeric(4,3),
     paid_at timestamp without time zone,
     seller_id integer,
     seller_name character varying NOT NULL,
@@ -1036,8 +1035,9 @@ CREATE TABLE invoices (
     updator_str character varying,
     number integer,
     cancelled_at timestamp without time zone,
-    sum_cache numeric(10,2),
-    in_directo boolean DEFAULT false
+    total numeric(10,2) NOT NULL,
+    in_directo boolean DEFAULT false,
+    buyer_vat_no character varying
 );
 
 
@@ -2153,11 +2153,11 @@ CREATE TABLE registrars (
     code character varying NOT NULL,
     website character varying,
     accounting_customer_code character varying NOT NULL,
-    vat boolean,
     legacy_id integer,
     reference_no character varying,
     test_registrar boolean DEFAULT false,
-    language character varying NOT NULL
+    language character varying NOT NULL,
+    vat_rate numeric(4,3)
 );
 
 
@@ -4668,6 +4668,16 @@ INSERT INTO schema_migrations (version) VALUES ('20180214213743');
 
 INSERT INTO schema_migrations (version) VALUES ('20180218004148');
 
+INSERT INTO schema_migrations (version) VALUES ('20180228055259');
+
+INSERT INTO schema_migrations (version) VALUES ('20180228064342');
+
+INSERT INTO schema_migrations (version) VALUES ('20180228070102');
+
+INSERT INTO schema_migrations (version) VALUES ('20180228070431');
+
+INSERT INTO schema_migrations (version) VALUES ('20180228074442');
+
 INSERT INTO schema_migrations (version) VALUES ('20180306180401');
 
 INSERT INTO schema_migrations (version) VALUES ('20180306181538');
@@ -4694,5 +4704,13 @@ INSERT INTO schema_migrations (version) VALUES ('20180309053921');
 
 INSERT INTO schema_migrations (version) VALUES ('20180309054510');
 
+INSERT INTO schema_migrations (version) VALUES ('20180310142630');
+
+INSERT INTO schema_migrations (version) VALUES ('20180313090437');
+
+INSERT INTO schema_migrations (version) VALUES ('20180313124751');
+
+INSERT INTO schema_migrations (version) VALUES ('20180314122722');
+
 INSERT INTO schema_migrations (version) VALUES ('20180327151906');