From fe49d9e060e7ad661fa991bb6d401acccd442a94 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 18 May 2017 12:35:48 +0300 Subject: [PATCH] Update readme --- README.md | 1 + database/setup.sql | 27 ++++++++++++++++++--------- docs/install.rst | 2 ++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c26fc1d52f31..e92b340cc957 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ For information on how contribute to Invoice Ninja, please see our [contributing ## Credits * [Hillel Coren](https://hillelcoren.com/) +* [David Bomba](https://github.com/turbo124) * [All contributors](https://github.com/invoiceninja/invoiceninja/graphs/contributors) **Special thanks to:** diff --git a/database/setup.sql b/database/setup.sql index 84e38b8b875b..63eee3dd4cfd 100644 --- a/database/setup.sql +++ b/database/setup.sql @@ -291,7 +291,6 @@ CREATE TABLE `accounts` ( `num_days_reminder3` smallint(6) NOT NULL DEFAULT '30', `custom_invoice_text_label1` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `custom_invoice_text_label2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `default_tax_rate_id` int(10) unsigned DEFAULT NULL, `recurring_hour` smallint(6) NOT NULL DEFAULT '8', `invoice_number_pattern` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `quote_number_pattern` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, @@ -354,6 +353,10 @@ CREATE TABLE `accounts` ( `reset_counter_date` date DEFAULT NULL, `custom_contact_label1` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `custom_contact_label2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `tax_name1` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `tax_rate1` decimal(13,3) NOT NULL, + `tax_name2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `tax_rate2` decimal(13,3) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `accounts_account_key_unique` (`account_key`), KEY `accounts_timezone_id_foreign` (`timezone_id`), @@ -605,6 +608,7 @@ CREATE TABLE `clients` ( `language_id` int(10) unsigned DEFAULT NULL, `invoice_number_counter` int(11) DEFAULT '1', `quote_number_counter` int(11) DEFAULT '1', + `public_notes` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`), UNIQUE KEY `clients_account_id_public_id_unique` (`account_id`,`public_id`), KEY `clients_user_id_foreign` (`user_id`), @@ -1210,7 +1214,7 @@ CREATE TABLE `gateways` ( LOCK TABLES `gateways` WRITE; /*!40000 ALTER TABLE `gateways` DISABLE KEYS */; -INSERT INTO `gateways` VALUES (1,'2017-05-15 12:51:22','2017-05-15 12:51:22','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-05-15 12:51:22','2017-05-15 12:51:22','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-05-15 12:51:22','2017-05-15 12:51:22','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-05-15 12:51:22','2017-05-15 12:51:22','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-05-15 12:51:22','2017-05-15 12:51:22','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-05-15 12:51:22','2017-05-15 12:51:22','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-05-15 12:51:22','2017-05-15 12:51:22','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-05-15 12:51:22','2017-05-15 12:51:22','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-05-15 12:51:22','2017-05-15 12:51:22','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-05-15 12:51:22','2017-05-15 12:51:22','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-05-15 12:51:22','2017-05-15 12:51:22','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-05-15 12:51:22','2017-05-15 12:51:22','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-05-15 12:51:22','2017-05-15 12:51:22','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-05-15 12:51:22','2017-05-15 12:51:22','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-05-15 12:51:22','2017-05-15 12:51:22','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-05-15 12:51:22','2017-05-15 12:51:22','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-05-15 12:51:22','2017-05-15 12:51:22','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-05-15 12:51:22','2017-05-15 12:51:22','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-05-15 12:51:22','2017-05-15 12:51:22','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-05-15 12:51:22','2017-05-15 12:51:22','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-05-15 12:51:22','2017-05-15 12:51:22','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-05-15 12:51:22','2017-05-15 12:51:22','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-05-15 12:51:22','2017-05-15 12:51:22','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-05-15 12:51:22','2017-05-15 12:51:22','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-05-15 12:51:22','2017-05-15 12:51:22','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-05-15 12:51:22','2017-05-15 12:51:22','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-05-15 12:51:22','2017-05-15 12:51:22','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-05-15 12:51:22','2017-05-15 12:51:22','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-05-15 12:51:22','2017-05-15 12:51:22','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-05-15 12:51:22','2017-05-15 12:51:22','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-05-15 12:51:22','2017-05-15 12:51:22','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-05-15 12:51:22','2017-05-15 12:51:22','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-05-15 12:51:22','2017-05-15 12:51:22','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-05-15 12:51:22','2017-05-15 12:51:22','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-05-15 12:51:22','2017-05-15 12:51:22','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-05-15 12:51:22','2017-05-15 12:51:22','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-05-15 12:51:22','2017-05-15 12:51:22','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-05-15 12:51:22','2017-05-15 12:51:22','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-05-15 12:51:22','2017-05-15 12:51:22','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-05-15 12:51:22','2017-05-15 12:51:22','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-05-15 12:51:22','2017-05-15 12:51:22','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-05-15 12:51:22','2017-05-15 12:51:22','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-05-15 12:51:22','2017-05-15 12:51:22','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-05-15 12:51:22','2017-05-15 12:51:22','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-05-15 12:51:22','2017-05-15 12:51:22','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-05-15 12:51:22','2017-05-15 12:51:22','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-05-15 12:51:22','2017-05-15 12:51:22','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-05-15 12:51:22','2017-05-15 12:51:22','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-05-15 12:51:22','2017-05-15 12:51:22','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-05-15 12:51:22','2017-05-15 12:51:22','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-05-15 12:51:22','2017-05-15 12:51:22','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-05-15 12:51:22','2017-05-15 12:51:22','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-05-15 12:51:22','2017-05-15 12:51:22','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-05-15 12:51:22','2017-05-15 12:51:22','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-05-15 12:51:22','2017-05-15 12:51:22','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-05-15 12:51:22','2017-05-15 12:51:22','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-05-15 12:51:22','2017-05-15 12:51:22','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-05-15 12:51:22','2017-05-15 12:51:22','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-05-15 12:51:22','2017-05-15 12:51:22','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-05-15 12:51:22','2017-05-15 12:51:22','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-05-15 12:51:22','2017-05-15 12:51:22','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-05-15 12:51:22','2017-05-15 12:51:22','Custom','Custom',1,1,8,0,NULL,1,0); +INSERT INTO `gateways` VALUES (1,'2017-05-17 14:06:16','2017-05-17 14:06:16','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-05-17 14:06:16','2017-05-17 14:06:16','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-05-17 14:06:16','2017-05-17 14:06:16','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-05-17 14:06:16','2017-05-17 14:06:16','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-05-17 14:06:16','2017-05-17 14:06:16','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-05-17 14:06:16','2017-05-17 14:06:16','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-05-17 14:06:16','2017-05-17 14:06:16','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-05-17 14:06:16','2017-05-17 14:06:16','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-05-17 14:06:16','2017-05-17 14:06:16','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-05-17 14:06:16','2017-05-17 14:06:16','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-05-17 14:06:16','2017-05-17 14:06:16','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-05-17 14:06:16','2017-05-17 14:06:16','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-05-17 14:06:16','2017-05-17 14:06:16','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-05-17 14:06:16','2017-05-17 14:06:16','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-05-17 14:06:16','2017-05-17 14:06:16','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-05-17 14:06:16','2017-05-17 14:06:16','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-05-17 14:06:16','2017-05-17 14:06:16','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-05-17 14:06:16','2017-05-17 14:06:16','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-05-17 14:06:16','2017-05-17 14:06:16','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-05-17 14:06:16','2017-05-17 14:06:16','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-05-17 14:06:16','2017-05-17 14:06:16','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-05-17 14:06:16','2017-05-17 14:06:16','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-05-17 14:06:16','2017-05-17 14:06:16','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-05-17 14:06:16','2017-05-17 14:06:16','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-05-17 14:06:16','2017-05-17 14:06:16','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-05-17 14:06:16','2017-05-17 14:06:16','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-05-17 14:06:16','2017-05-17 14:06:16','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-05-17 14:06:16','2017-05-17 14:06:16','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-05-17 14:06:16','2017-05-17 14:06:16','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-05-17 14:06:16','2017-05-17 14:06:16','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-05-17 14:06:16','2017-05-17 14:06:16','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-05-17 14:06:16','2017-05-17 14:06:16','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-05-17 14:06:16','2017-05-17 14:06:16','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-05-17 14:06:16','2017-05-17 14:06:16','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-05-17 14:06:16','2017-05-17 14:06:16','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-05-17 14:06:16','2017-05-17 14:06:16','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-05-17 14:06:16','2017-05-17 14:06:16','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-05-17 14:06:16','2017-05-17 14:06:16','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-05-17 14:06:16','2017-05-17 14:06:16','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-05-17 14:06:16','2017-05-17 14:06:16','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-05-17 14:06:16','2017-05-17 14:06:16','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-05-17 14:06:16','2017-05-17 14:06:16','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-05-17 14:06:16','2017-05-17 14:06:16','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-05-17 14:06:16','2017-05-17 14:06:16','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-05-17 14:06:16','2017-05-17 14:06:16','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-05-17 14:06:16','2017-05-17 14:06:16','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-05-17 14:06:16','2017-05-17 14:06:16','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-05-17 14:06:16','2017-05-17 14:06:16','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-05-17 14:06:16','2017-05-17 14:06:16','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-05-17 14:06:16','2017-05-17 14:06:16','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-05-17 14:06:16','2017-05-17 14:06:16','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-05-17 14:06:16','2017-05-17 14:06:16','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-05-17 14:06:16','2017-05-17 14:06:16','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-05-17 14:06:16','2017-05-17 14:06:16','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-05-17 14:06:16','2017-05-17 14:06:16','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-05-17 14:06:16','2017-05-17 14:06:16','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-05-17 14:06:16','2017-05-17 14:06:16','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-05-17 14:06:16','2017-05-17 14:06:16','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-05-17 14:06:16','2017-05-17 14:06:16','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-05-17 14:06:16','2017-05-17 14:06:16','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-05-17 14:06:16','2017-05-17 14:06:16','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-05-17 14:06:16','2017-05-17 14:06:16','Custom','Custom',1,1,8,0,NULL,1,0); /*!40000 ALTER TABLE `gateways` ENABLE KEYS */; UNLOCK TABLES; @@ -1439,6 +1443,7 @@ CREATE TABLE `invoices` ( `tax_rate2` decimal(13,3) NOT NULL, `client_enable_auto_bill` tinyint(1) NOT NULL DEFAULT '0', `is_public` tinyint(1) NOT NULL DEFAULT '0', + `private_notes` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`), UNIQUE KEY `invoices_account_id_public_id_unique` (`account_id`,`public_id`), UNIQUE KEY `invoices_account_id_invoice_number_unique` (`account_id`,`invoice_number`), @@ -1750,7 +1755,7 @@ CREATE TABLE `migrations` ( LOCK TABLES `migrations` WRITE; /*!40000 ALTER TABLE `migrations` DISABLE KEYS */; -INSERT INTO `migrations` VALUES ('2013_11_05_180133_confide_setup_users_table',1),('2013_11_28_195703_setup_countries_table',1),('2014_02_13_151500_add_cascase_drops',1),('2014_02_19_151817_add_support_for_invoice_designs',1),('2014_03_03_155556_add_phone_to_account',1),('2014_03_19_201454_add_language_support',1),('2014_03_20_200300_create_payment_libraries',1),('2014_03_23_051736_enable_forcing_jspdf',1),('2014_03_25_102200_add_sort_and_recommended_to_gateways',1),('2014_04_03_191105_add_pro_plan',1),('2014_04_17_100523_add_remember_token',1),('2014_04_17_145108_add_custom_fields',1),('2014_04_23_170909_add_products_settings',1),('2014_04_29_174315_add_advanced_settings',1),('2014_05_17_175626_add_quotes',1),('2014_06_17_131940_add_accepted_credit_cards_to_account_gateways',1),('2014_07_13_142654_one_click_install',1),('2014_07_17_205900_support_hiding_quantity',1),('2014_07_24_171214_add_zapier_support',1),('2014_10_01_141248_add_company_vat_number',1),('2014_10_05_141856_track_last_seen_message',1),('2014_10_06_103529_add_timesheets',1),('2014_10_06_195330_add_invoice_design_table',1),('2014_10_13_054100_add_invoice_number_settings',1),('2014_10_14_225227_add_danish_translation',1),('2014_10_22_174452_add_affiliate_price',1),('2014_10_30_184126_add_company_id_number',1),('2014_11_04_200406_allow_null_client_currency',1),('2014_12_03_154119_add_discount_type',1),('2015_02_12_102940_add_email_templates',1),('2015_02_17_131714_support_token_billing',1),('2015_02_27_081836_add_invoice_footer',1),('2015_03_03_140259_add_tokens',1),('2015_03_09_151011_add_ip_to_activity',1),('2015_03_15_174122_add_pdf_email_attachment_option',1),('2015_03_30_100000_create_password_resets_table',1),('2015_04_12_093447_add_sv_language',1),('2015_04_13_100333_add_notify_approved',1),('2015_04_16_122647_add_partial_amount_to_invoices',1),('2015_05_21_184104_add_font_size',1),('2015_05_27_121828_add_tasks',1),('2015_05_27_170808_add_custom_invoice_labels',1),('2015_06_09_134208_add_has_tasks_to_invoices',1),('2015_06_14_093410_enable_resuming_tasks',1),('2015_06_14_173025_multi_company_support',1),('2015_07_07_160257_support_locking_account',1),('2015_07_08_114333_simplify_tasks',1),('2015_07_19_081332_add_custom_design',1),('2015_07_27_183830_add_pdfmake_support',1),('2015_08_13_084041_add_formats_to_datetime_formats_table',1),('2015_09_04_080604_add_swap_postal_code',1),('2015_09_07_135935_add_account_domain',1),('2015_09_10_185135_add_reminder_emails',1),('2015_10_07_135651_add_social_login',1),('2015_10_21_075058_add_default_tax_rates',1),('2015_10_21_185724_add_invoice_number_pattern',1),('2015_10_27_180214_add_is_system_to_activities',1),('2015_10_29_133747_add_default_quote_terms',1),('2015_11_01_080417_encrypt_tokens',1),('2015_11_03_181318_improve_currency_localization',1),('2015_11_30_133206_add_email_designs',1),('2015_12_27_154513_add_reminder_settings',1),('2015_12_30_042035_add_client_view_css',1),('2016_01_04_175228_create_vendors_table',1),('2016_01_06_153144_add_invoice_font_support',1),('2016_01_17_155725_add_quote_to_invoice_option',1),('2016_01_18_195351_add_bank_accounts',1),('2016_01_24_112646_add_bank_subaccounts',1),('2016_01_27_173015_add_header_footer_option',1),('2016_02_01_135956_add_source_currency_to_expenses',1),('2016_02_25_152948_add_client_password',1),('2016_02_28_081424_add_custom_invoice_fields',1),('2016_03_14_066181_add_user_permissions',1),('2016_03_14_214710_add_support_three_decimal_taxes',1),('2016_03_22_168362_add_documents',1),('2016_03_23_215049_support_multiple_tax_rates',1),('2016_04_16_103943_enterprise_plan',1),('2016_04_18_174135_add_page_size',1),('2016_04_23_182223_payments_changes',1),('2016_05_16_102925_add_swap_currency_symbol_to_currency',1),('2016_05_18_085739_add_invoice_type_support',1),('2016_05_24_164847_wepay_ach',1),('2016_07_08_083802_support_new_pricing',1),('2016_07_13_083821_add_buy_now_buttons',1),('2016_08_10_184027_add_support_for_bots',1),('2016_09_05_150625_create_gateway_types',1),('2016_10_20_191150_add_expense_to_activities',1),('2016_11_03_113316_add_invoice_signature',1),('2016_11_03_161149_add_bluevine_fields',1),('2016_11_28_092904_add_task_projects',1),('2016_12_13_113955_add_pro_plan_discount',1),('2017_01_01_214241_add_inclusive_taxes',1),('2017_02_23_095934_add_custom_product_fields',1),('2017_03_16_085702_add_gateway_fee_location',1),('2017_04_16_101744_add_custom_contact_fields',1),('2017_04_30_174702_add_multiple_database_support',1),('2017_05_10_144928_add_oauth_to_lookups',1); +INSERT INTO `migrations` VALUES ('2013_11_05_180133_confide_setup_users_table',1),('2013_11_28_195703_setup_countries_table',1),('2014_02_13_151500_add_cascase_drops',1),('2014_02_19_151817_add_support_for_invoice_designs',1),('2014_03_03_155556_add_phone_to_account',1),('2014_03_19_201454_add_language_support',1),('2014_03_20_200300_create_payment_libraries',1),('2014_03_23_051736_enable_forcing_jspdf',1),('2014_03_25_102200_add_sort_and_recommended_to_gateways',1),('2014_04_03_191105_add_pro_plan',1),('2014_04_17_100523_add_remember_token',1),('2014_04_17_145108_add_custom_fields',1),('2014_04_23_170909_add_products_settings',1),('2014_04_29_174315_add_advanced_settings',1),('2014_05_17_175626_add_quotes',1),('2014_06_17_131940_add_accepted_credit_cards_to_account_gateways',1),('2014_07_13_142654_one_click_install',1),('2014_07_17_205900_support_hiding_quantity',1),('2014_07_24_171214_add_zapier_support',1),('2014_10_01_141248_add_company_vat_number',1),('2014_10_05_141856_track_last_seen_message',1),('2014_10_06_103529_add_timesheets',1),('2014_10_06_195330_add_invoice_design_table',1),('2014_10_13_054100_add_invoice_number_settings',1),('2014_10_14_225227_add_danish_translation',1),('2014_10_22_174452_add_affiliate_price',1),('2014_10_30_184126_add_company_id_number',1),('2014_11_04_200406_allow_null_client_currency',1),('2014_12_03_154119_add_discount_type',1),('2015_02_12_102940_add_email_templates',1),('2015_02_17_131714_support_token_billing',1),('2015_02_27_081836_add_invoice_footer',1),('2015_03_03_140259_add_tokens',1),('2015_03_09_151011_add_ip_to_activity',1),('2015_03_15_174122_add_pdf_email_attachment_option',1),('2015_03_30_100000_create_password_resets_table',1),('2015_04_12_093447_add_sv_language',1),('2015_04_13_100333_add_notify_approved',1),('2015_04_16_122647_add_partial_amount_to_invoices',1),('2015_05_21_184104_add_font_size',1),('2015_05_27_121828_add_tasks',1),('2015_05_27_170808_add_custom_invoice_labels',1),('2015_06_09_134208_add_has_tasks_to_invoices',1),('2015_06_14_093410_enable_resuming_tasks',1),('2015_06_14_173025_multi_company_support',1),('2015_07_07_160257_support_locking_account',1),('2015_07_08_114333_simplify_tasks',1),('2015_07_19_081332_add_custom_design',1),('2015_07_27_183830_add_pdfmake_support',1),('2015_08_13_084041_add_formats_to_datetime_formats_table',1),('2015_09_04_080604_add_swap_postal_code',1),('2015_09_07_135935_add_account_domain',1),('2015_09_10_185135_add_reminder_emails',1),('2015_10_07_135651_add_social_login',1),('2015_10_21_075058_add_default_tax_rates',1),('2015_10_21_185724_add_invoice_number_pattern',1),('2015_10_27_180214_add_is_system_to_activities',1),('2015_10_29_133747_add_default_quote_terms',1),('2015_11_01_080417_encrypt_tokens',1),('2015_11_03_181318_improve_currency_localization',1),('2015_11_30_133206_add_email_designs',1),('2015_12_27_154513_add_reminder_settings',1),('2015_12_30_042035_add_client_view_css',1),('2016_01_04_175228_create_vendors_table',1),('2016_01_06_153144_add_invoice_font_support',1),('2016_01_17_155725_add_quote_to_invoice_option',1),('2016_01_18_195351_add_bank_accounts',1),('2016_01_24_112646_add_bank_subaccounts',1),('2016_01_27_173015_add_header_footer_option',1),('2016_02_01_135956_add_source_currency_to_expenses',1),('2016_02_25_152948_add_client_password',1),('2016_02_28_081424_add_custom_invoice_fields',1),('2016_03_14_066181_add_user_permissions',1),('2016_03_14_214710_add_support_three_decimal_taxes',1),('2016_03_22_168362_add_documents',1),('2016_03_23_215049_support_multiple_tax_rates',1),('2016_04_16_103943_enterprise_plan',1),('2016_04_18_174135_add_page_size',1),('2016_04_23_182223_payments_changes',1),('2016_05_16_102925_add_swap_currency_symbol_to_currency',1),('2016_05_18_085739_add_invoice_type_support',1),('2016_05_24_164847_wepay_ach',1),('2016_07_08_083802_support_new_pricing',1),('2016_07_13_083821_add_buy_now_buttons',1),('2016_08_10_184027_add_support_for_bots',1),('2016_09_05_150625_create_gateway_types',1),('2016_10_20_191150_add_expense_to_activities',1),('2016_11_03_113316_add_invoice_signature',1),('2016_11_03_161149_add_bluevine_fields',1),('2016_11_28_092904_add_task_projects',1),('2016_12_13_113955_add_pro_plan_discount',1),('2017_01_01_214241_add_inclusive_taxes',1),('2017_02_23_095934_add_custom_product_fields',1),('2017_03_16_085702_add_gateway_fee_location',1),('2017_04_16_101744_add_custom_contact_fields',1),('2017_04_30_174702_add_multiple_database_support',1),('2017_05_10_144928_add_oauth_to_lookups',1),('2017_05_16_101715_add_default_note_to_client',1); /*!40000 ALTER TABLE `migrations` ENABLE KEYS */; UNLOCK TABLES; @@ -1801,7 +1806,7 @@ CREATE TABLE `payment_libraries` ( LOCK TABLES `payment_libraries` WRITE; /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */; -INSERT INTO `payment_libraries` VALUES (1,'2017-05-15 12:51:20','2017-05-15 12:51:20','Omnipay',1),(2,'2017-05-15 12:51:20','2017-05-15 12:51:20','PHP-Payments [Deprecated]',1); +INSERT INTO `payment_libraries` VALUES (1,'2017-05-17 14:06:14','2017-05-17 14:06:14','Omnipay',1),(2,'2017-05-17 14:06:14','2017-05-17 14:06:14','PHP-Payments [Deprecated]',1); /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */; UNLOCK TABLES; @@ -1911,7 +1916,7 @@ CREATE TABLE `payment_terms` ( LOCK TABLES `payment_terms` WRITE; /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */; -INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,1),(2,10,'Net 10','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,2),(3,14,'Net 14','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,3),(4,15,'Net 15','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,4),(5,30,'Net 30','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,5),(6,60,'Net 60','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,6),(7,90,'Net 90','2017-05-15 12:51:20','2017-05-15 12:51:20',NULL,0,0,7),(8,-1,'Net 0','2017-05-15 12:51:24','2017-05-15 12:51:24',NULL,0,0,0); +INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,1),(2,10,'Net 10','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,2),(3,14,'Net 14','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,3),(4,15,'Net 15','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,4),(5,30,'Net 30','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,5),(6,60,'Net 60','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,6),(7,90,'Net 90','2017-05-17 14:06:14','2017-05-17 14:06:14',NULL,0,0,7),(8,-1,'Net 0','2017-05-17 14:06:17','2017-05-17 14:06:17',NULL,0,0,0); /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */; UNLOCK TABLES; @@ -1929,7 +1934,7 @@ CREATE TABLE `payment_types` ( PRIMARY KEY (`id`), KEY `payment_types_gateway_type_id_foreign` (`gateway_type_id`), CONSTRAINT `payment_types_gateway_type_id_foreign` FOREIGN KEY (`gateway_type_id`) REFERENCES `gateway_types` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1938,7 +1943,7 @@ CREATE TABLE `payment_types` ( LOCK TABLES `payment_types` WRITE; /*!40000 ALTER TABLE `payment_types` DISABLE KEYS */; -INSERT INTO `payment_types` VALUES (1,'Apply Credit',NULL),(2,'Bank Transfer',2),(3,'Cash',NULL),(4,'Debit',1),(5,'ACH',2),(6,'Visa Card',1),(7,'MasterCard',1),(8,'American Express',1),(9,'Discover Card',1),(10,'Diners Card',1),(11,'EuroCard',1),(12,'Nova',1),(13,'Credit Card Other',1),(14,'PayPal',3),(15,'Google Wallet',NULL),(16,'Check',NULL),(17,'Carte Blanche',1),(18,'UnionPay',1),(19,'JCB',1),(20,'Laser',1),(21,'Maestro',1),(22,'Solo',1),(23,'Switch',1),(24,'iZettle',1),(25,'Swish',2),(26,'Venmo',NULL); +INSERT INTO `payment_types` VALUES (1,'Apply Credit',NULL),(2,'Bank Transfer',2),(3,'Cash',NULL),(4,'Debit',1),(5,'ACH',2),(6,'Visa Card',1),(7,'MasterCard',1),(8,'American Express',1),(9,'Discover Card',1),(10,'Diners Card',1),(11,'EuroCard',1),(12,'Nova',1),(13,'Credit Card Other',1),(14,'PayPal',3),(15,'Google Wallet',NULL),(16,'Check',NULL),(17,'Carte Blanche',1),(18,'UnionPay',1),(19,'JCB',1),(20,'Laser',1),(21,'Maestro',1),(22,'Solo',1),(23,'Switch',1),(24,'iZettle',1),(25,'Swish',2),(26,'Venmo',NULL),(27,'Money Order',NULL); /*!40000 ALTER TABLE `payment_types` ENABLE KEYS */; UNLOCK TABLES; @@ -1979,6 +1984,7 @@ CREATE TABLE `payments` ( `bank_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `ip` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `credit_ids` text COLLATE utf8_unicode_ci, + `private_notes` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`), UNIQUE KEY `payments_account_id_public_id_unique` (`account_id`,`public_id`), KEY `payments_contact_id_foreign` (`contact_id`), @@ -2031,10 +2037,13 @@ CREATE TABLE `products` ( `cost` decimal(13,2) NOT NULL, `qty` decimal(13,2) DEFAULT NULL, `public_id` int(10) unsigned NOT NULL, - `default_tax_rate_id` int(10) unsigned DEFAULT NULL, `is_deleted` tinyint(1) NOT NULL DEFAULT '0', `custom_value1` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `custom_value2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `tax_name1` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `tax_rate1` decimal(13,3) NOT NULL, + `tax_name2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `tax_rate2` decimal(13,3) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `products_account_id_public_id_unique` (`account_id`,`public_id`), KEY `products_user_id_foreign` (`user_id`), @@ -2506,4 +2515,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2017-05-15 18:51:24 +-- Dump completed on 2017-05-17 20:06:18 diff --git a/docs/install.rst b/docs/install.rst index d3b89cf7f292..2d4d1b5bbad9 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -21,6 +21,8 @@ Automated Installers - Softaculous: `softaculous.com `_ +.. Tip:: You can use `github.com/turbo124/Plane2Ninja `_ to migrate your data from InvoicePlane. + Steps to Install ^^^^^^^^^^^^^^^^