Merge branch 'staging' into 'production'

Deploying compte comptable into production

See merge request sottye/hytha35!3

gestion/lib/Controller/PageController.php

@@ -1817,7 +1817,7 @@ class PageController extends Controller {
 							);
 						}
 						else{
-							$facture_temp["client"] = $facture->facture_group_name;
+							$facture_temp["client"] =  $facture->group_code_comptable ??'-';
 							$facture_temp["nom_client"] = $facture->facture_group_name;
 							$devisList = $this->myDb->getDevisByClientGroupFacturationIdAndMonthYear(
 								$facture->facture_client_group_facturation_id,

gestion/lib/Db/Bdd.php

@@ -52,7 +52,7 @@ class Bdd {
         "portal_code","alarm_code","funeral_code",
         "product_brand","product_reference",
         "fk_user_uuid",
-        "phone_number","address",'postal_code','city','email','siret_number','tva_intracommu',
+        "phone_number","address",'postal_code','city','email','siret_number','tva_intracommu',"code_comptable",
         'order_number','case_number','fk_template_type_key',
         'facture_case_number','facture_order_number','taker_name');
         $this->whiteTable = array(
@@ -374,6 +374,7 @@ class Bdd {
         facture_client.entreprise as facture_client_entreprise,
         facture_client.fk_client_group_id as facture_client_group_id,
         facture_client_group_facturation.group_facturation_name as facture_group_name,
+        facture_client_group_facturation.code_comptable as group_code_comptable,
         facture.document_generated_date as facture_document_generated_date,
         facture.document_sent_date as facture_document_sent_date,
         facture.month as facture_month,
@@ -3030,7 +3031,9 @@ class Bdd {
                     client_group_facturation.city as group_city,
                     client_group_facturation.email as group_email,
                     client_group_facturation.siret_number as group_siret_number,
-                    client_group_facturation.tva_intracommu as group_tva_intracommu
+                    client_group_facturation.tva_intracommu as group_tva_intracommu,
+                    client_group_facturation.code_comptable as group_code_comptable
+
                     FROM ".$this->tableprefix."devis_facture as devis_facture
                     LEFT JOIN ".$this->tableprefix."devis as devis on devis_facture.fk_devis_id = devis.id
                     LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
@@ -3105,6 +3108,7 @@ class Bdd {
                     $factureData["siret"] = $devis["group_siret_number"];
                     $factureData["group_name"] = $devis["group_name"] ?? "";
                     $templateType = $devis['fk_template_type_key'] ?? ClientTemplateTypeConstant::PRIVEES;
+                    $templateType = $devis['code_comptable'] ?? '-';
                     $factureData["group_type"] = "group";
 
                 }
@@ -4740,7 +4744,9 @@ COMMENTAIRES: ".$comment;
         client_group_facturation.email as group_email,
         client_group_facturation.siret_number as group_siret_number,
         client_group_facturation.tva_intracommu as group_tva_intracommu,
-        client_group_facturation.fk_template_type_key as fk_template_type_key
+        client_group_facturation.fk_template_type_key as fk_template_type_key,
+        client_group_facturation.code_comptable as code_comptable
+     
         FROM ".$this->tableprefix."devis as devis
         LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
         LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id
@@ -4793,7 +4799,8 @@ COMMENTAIRES: ".$comment;
                 client_group_facturation.email as group_email,
                 client_group_facturation.siret_number as group_siret_number,
                 client_group_facturation.tva_intracommu as group_tva_intracommu,
-                client_group_facturation.fk_template_type_key as fk_template_type_key
+                client_group_facturation.fk_template_type_key as fk_template_type_key,
+                client_group_facturation.code_comptable as code_comptable
                 FROM ".$this->tableprefix."devis as devis
                 LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
                 LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id

gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php

@@ -506,6 +506,7 @@ class InvoiceRecapService {
                 "group_city" => $facture->group_city,
                 "group_postal_code" => $facture->group_postal_code,
                 "group_siret_number" => $facture->group_siret_number,
+                "code_comptable" => $facture->code_comptable ?? '-',
                 "client_siret" => $facture->client_siret
             );
             $produits = json_decode($this->gestionBdd->getListProduit($facture->id_devis,$idNextcloud));
@@ -550,7 +551,7 @@ class InvoiceRecapService {
                     $clientCity = '';
                     $tvaIntraCommuValue = '';
                     $clientMail = '';
-                    $date_facture;
+                    $date_facture = '';
                     foreach ($client as $key => $facture) {
                         $current_client = $facture['nom_client'];
                         $clientHeaderLabel = $current_client;

gestion/lib/Sql/20250402-ADD_CODE_COMPTABLE_IN_FACTURE_GROUPEVALUE.sql

@@ -0,0 +1,2 @@
+alter table oc_gestion_client_group_facturation 
+add column code_comptable VARCHAR(100) DEFAULT '';

gestion/src/js/objects/clientGroupFacturation.mjs

@@ -38,6 +38,10 @@ export class ClientGroupFacturation {
       myresp.siret_number != null && myresp.siret_number.length > 0
         ? myresp.siret_number
         : "-";
+
+    //Add codeComtable
+    this.codeComptable = myresp.code_comptable != null && myresp.code_comptable.length > 0 ? myresp.code_comptable : "-";
+
     this.tvaIntraCommu =
       myresp.tva_intracommu != null && myresp.tva_intracommu.length > 0
         ? myresp.tva_intracommu
@@ -85,6 +89,11 @@ export class ClientGroupFacturation {
         '">' +
         this.phoneNumber +
         "</div>",
+      '<div class="editable" data-table="client_group_facturation" data-column="code_comptable" data-id="' +
+        this.id +
+        '">' +
+        this.codeComptable +
+        "</div>",
       '<div class="editable" data-table="client_group_facturation" data-column="siret_number" data-id="' +
         this.id +
         '">' +

gestion/templates/content/clientGroupFacturation.php

@@ -21,6 +21,7 @@
                 <th><?php p($l->t('Code postal'));?></th>
                 <th><?php p($l->t('Email'));?></th>
                 <th><?php p($l->t('Téléphone'));?></th>
+                <th><?php p($l->t('Code Comptable'));?></th>
                 <th><?php p($l->t('Siret'));?></th>
                 <th><?php p($l->t('Tva Intra-communautaire'));?></th>
                 <th><?php p($l->t('Modèle de facture'));?></th>

gestion/webpack.config.js

@@ -0,0 +1,85 @@
+const path = require('path');
+var webpack = require('webpack');
+
+module.exports =
+[
+  {
+    mode: "production",
+    performance: { hints: false },
+    entry: {
+      client: './src/js/client.js',
+      defunt: './src/js/defunt.js',
+      defuntShow: './src/js/defuntShow.js',
+      thanatopracteur: './src/js/thanatopracteur.js',
+      devis: './src/js/devis.js',
+      devisShow: './src/js/devisShow.js',
+      trajet: './src/js/trajet.js',
+      trajetdetails: './src/js/trajetdetails.js',
+      lieu: './src/js/lieu.js',
+      facture: './src/js/facture.js',
+      factureShow: './src/js/factureShow.js',
+      apercusTousDevis: './src/js/apercusTousDevis.js',
+      apercusToutesFactures: './src/js/apercusToutesFactures.js',
+      produit: './src/js/produit.js',
+      article: './src/js/article.js',
+      bibliotheque: './src/js/bibliotheque.js',
+      statistique: './src/js/statistique.js',
+      legalnotice: './src/js/legalnotice.js',
+      adminSection: './src/js/adminSection.js',
+      configuration: './src/js/configuration.js',
+      clientGroupDiscount: './src/js/clientGroupDiscount.js',
+      clientGroup: './src/js/clientGroup.js',
+      clientGroupFacturation : './src/js/clientGroupFacturation.js',
+      pdf: './src/js/pdf.js',
+      factureGroupDetails: './src/js/factureGroupDetails.js'
+    },
+    output: {
+      filename: '../js/[name].app.js',
+    },
+    optimization: {
+      minimize: true
+    },
+    plugins: [
+      new webpack.ProvidePlugin({
+           $: 'jquery',
+           jQuery: 'jquery',
+           "window.jQuery": "jquery",
+           jquery: 'jquery'
+       }),
+     ],
+    module: {
+        rules: [
+            {
+                test: /\.(css|scss)$/i,
+                use: [
+                    {
+                      loader: 'style-loader',
+                    },
+                    {
+                      loader: 'css-loader',
+                    },
+                    {
+                      loader: 'postcss-loader',
+                      options: {
+                        postcssOptions: {
+                          plugins: () => [
+                            require('autoprefixer')
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      loader: 'sass-loader',
+                    },
+                ],
+              },
+              {
+                test: /\.(ttf|eot|svg|gif|png)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+                use: [{
+                    loader: 'file-loader'
+                }]
+              },
+          ],
+      },
+  },
+];