Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.6.2 #412

Merged
merged 10 commits into from
Sep 29, 2024
Merged

2.6.2 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
852e9cf
new 2024
baimard May 1, 2024
62b5a1c
Merge branch 'master' of github.com:baimard/gestion
baimard May 1, 2024
a7000e5
Tests
baimard May 4, 2024
4fcb3d8
Merge branch 'master' of github.com:baimard/gestion into dev
baimard Sep 28, 2024
aa58e71
reboot
baimard Sep 28, 2024
d5ba869
V2.6.0
baimard Sep 28, 2024
fca2953
2.6.1 - Possibility to share with others users
baimard Sep 28, 2024
c71cdbe
2.6.1 - final
baimard Sep 28, 2024
e65bdee
#411 hot fix
baimard Sep 29, 2024
8fc4ba1
Merge branch 'master' into dev
baimard Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ If you need to adapt this application to your country laws, please open issue.

[Love my work ? Buy me a coffee !](https://www.buymeacoffee.com/benjaminaimard)
]]></description>
<version>2.6.1</version>
<version>2.6.2</version>
<licence>agpl</licence>
<author mail="benjamin@cybercorp.fr" homepage="https://github.com/baimard">Benjamin AIMARD</author>
<namespace>Gestion</namespace>
Expand Down
25 changes: 3 additions & 22 deletions lib/Migration/Version20300Date20230714134445.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
}

if (!$table->hasColumn('id_configuration')) {
$table->addColumn('id_configuration', 'integer', ['length' => 11, notnull => false]);
$table->addColumn('id_configuration', 'integer', ['length' => 11, 'notnull' => false]);
}
}

Expand All @@ -133,7 +133,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
}

if (!$table->hasColumn('id_configuration')) {
$table->addColumn('id_configuration', 'integer', ['length' => 11, notnull => false]);
$table->addColumn('id_configuration', 'integer', ['length' => 11, 'notnull' => false]);
}


Expand Down Expand Up @@ -179,23 +179,4 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
$this->changeId($this->rows_produit,"produit");
$this->changeId($this->rows_produit_devis,"produit_devis");
}
}

// ALTER TABLE `oc_gestion_client` CHANGE `id_configuration` `id_nextcloud` VARCHAR(64) NOT NULL;
// ALTER TABLE `oc_gestion_devis` CHANGE `id_configuration` `id_nextcloud` VARCHAR(64) NOT NULL;
// ALTER TABLE `oc_gestion_facture` CHANGE `id_configuration` `id_nextcloud` VARCHAR(64) NOT NULL;
// ALTER TABLE `oc_gestion_produit` CHANGE `id_configuration` `id_nextcloud` VARCHAR(64) NOT NULL;
// ALTER TABLE `oc_gestion_produit_devis` CHANGE `id_configuration` `id_nextcloud` VARCHAR(64) NOT NULL;


// UPDATE `oc_gestion_client` SET `id_nextcloud` = 'nextcloud' WHERE `oc_gestion_client`.`id` = 1;
// UPDATE `oc_gestion_client` SET `id_nextcloud` = 'nextcloud' WHERE `oc_gestion_client`.`id` = 2;
// UPDATE `oc_gestion_client` SET `id_nextcloud` = 'test' WHERE `oc_gestion_client`.`id` = 3;

// UPDATE `oc_gestion_produit` SET `id_nextcloud` = 'nextcloud' WHERE `oc_gestion_produit`.`id` = 1;
// UPDATE `oc_gestion_produit` SET `id_nextcloud` = 'test' WHERE `oc_gestion_produit`.`id` = 2;

// UPDATE `oc_gestion_devis` SET `id_nextcloud` = 'nextcloud' WHERE `oc_gestion_devis`.`id` = 1;

// UPDATE `oc_gestion_produit_devis` SET `id_nextcloud` = 'nextcloud' WHERE `oc_gestion_produit_devis`.`id` = 1;

}
2 changes: 1 addition & 1 deletion templates/content/changelog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div syle="display: none;" id="modalConfig" class="modal">
<div class="modal-content">
<span class="modalClose">&times;</span>
<h2><?php p($l->t('Welcome to GESTION')); ?> 2.6.1</h2>
<h2><?php p($l->t('Welcome to GESTION')); ?> 2.6.2</h2>
<p style="font-size:14px;margin-bottom:20px;"><b><?php p($l->t('To start with this application you need to configure your company information, follow this link')); ?></b> &#128073;<a style="font-size:20px;" href="<?php echo ($_['url']['config']); ?>"><?php p($l->t('My company')); ?></a></p>
<p style="font-size:16px;"><b><?php p($l->t('If you like my work you can:')); ?> &#129321; <a href="https://www.buymeacoffee.com/benjaminaimard"><?php p($l->t('buy me a coffee')); ?></a></b> &#129321;</p>
<p style="margin-bottom:20px;"><?php p($l->t('If you need documentation, follow this link')); ?> &#128073; <a href="https://baimard.github.io/gestion/"><?php p($l->t('Documentation')); ?></a>
Expand Down
Loading