Merge branch 'registry-772' into registry-623

# Conflicts:
#	app/models/invoice.rb
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-03-10 16:48:47 +02:00
commit 7acd41595c
10 changed files with 29 additions and 12 deletions

View file

@ -998,7 +998,6 @@ 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,
@ -3244,7 +3243,7 @@ ALTER TABLE ONLY settings
--
-- Name: unique_code; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_code; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -3260,7 +3259,7 @@ ALTER TABLE ONLY contacts
--
-- Name: unique_name; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_name; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -3268,7 +3267,7 @@ ALTER TABLE ONLY registrars
--
-- Name: unique_reference_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_reference_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -3276,7 +3275,7 @@ ALTER TABLE ONLY registrars
--
-- Name: unique_reg_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_reg_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -4713,3 +4712,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180309053921');
INSERT INTO schema_migrations (version) VALUES ('20180309054510');
INSERT INTO schema_migrations (version) VALUES ('20180310142630');