From 47308d27c317cbdcb76a663ce4f3476bf4458b21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Jun 2016 14:37:06 +0200
Subject: [PATCH] Missing column import_key and import for vat payments
---
.../compta/paiement/class/cpaiement.class.php | 463 ++++++++++++++++++
.../compta/paiement/class/paiement.class.php | 3 +-
htdocs/core/modules/modTax.class.php | 23 +-
.../install/mysql/migration/3.9.0-4.0.0.sql | 1 +
htdocs/install/mysql/tables/llx_tva.sql | 13 +-
htdocs/langs/en_US/compta.lang | 3 +-
6 files changed, 492 insertions(+), 14 deletions(-)
create mode 100644 htdocs/compta/paiement/class/cpaiement.class.php
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
new file mode 100644
index 00000000000..5428f4abdbf
--- /dev/null
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -0,0 +1,463 @@
+<?php
+/* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2015 Florian Henry <florian.henry@open-concept.pro>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/compat/paiement/class/cpaiement.class.php
+ * \ingroup facture
+ * \brief This file is to manage CRUD function of type of payments
+ */
+
+
+/**
+ * Class Cpaiement
+ */
+class Cpaiement
+{
+ /**
+ * @var string Id to identify managed objects
+ */
+ public $element = 'cpaiement';
+ /**
+ * @var string Name of table without prefix where object is stored
+ */
+ public $table_element = 'c_paiement';
+
+ /**
+ * @var CpaiementLine[] Lines
+ */
+ public $lines = array();
+
+ /**
+ */
+
+ public $code;
+ public $libelle;
+ public $type;
+ public $active;
+ public $accountancy_code;
+ public $module;
+
+ /**
+ */
+
+
+ /**
+ * Constructor
+ *
+ * @param DoliDb $db Database handler
+ */
+ public function __construct(DoliDB $db)
+ {
+ $this->db = $db;
+ }
+
+ /**
+ * Create object into database
+ *
+ * @param User $user User that creates
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ *
+ * @return int <0 if KO, Id of created object if OK
+ */
+ public function create(User $user, $notrigger = false)
+ {
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $error = 0;
+
+ // Clean parameters
+
+ if (isset($this->code)) {
+ $this->code = trim($this->code);
+ }
+ if (isset($this->libelle)) {
+ $this->libelle = trim($this->libelle);
+ }
+ if (isset($this->type)) {
+ $this->type = trim($this->type);
+ }
+ if (isset($this->active)) {
+ $this->active = trim($this->active);
+ }
+ if (isset($this->accountancy_code)) {
+ $this->accountancy_code = trim($this->accountancy_code);
+ }
+ if (isset($this->module)) {
+ $this->module = trim($this->module);
+ }
+
+
+
+ // Check parameters
+ // Put here code to add control on parameters values
+
+ // Insert request
+ $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+
+ $sql.= 'id,';
+ $sql.= 'code,';
+ $sql.= 'libelle,';
+ $sql.= 'type,';
+ $sql.= 'active,';
+ $sql.= 'accountancy_code,';
+ $sql.= 'module';
+
+
+ $sql .= ') VALUES (';
+
+ $sql .= ' '.(! isset($this->id)?'NULL':$this->id).',';
+ $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+ $sql .= ' '.(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").',';
+ $sql .= ' '.(! isset($this->type)?'NULL':$this->type).',';
+ $sql .= ' '.(! isset($this->active)?'NULL':$this->active).',';
+ $sql .= ' '.(! isset($this->accountancy_code)?'NULL':"'".$this->db->escape($this->accountancy_code)."'").',';
+ $sql .= ' '.(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'");
+
+
+ $sql .= ')';
+
+ $this->db->begin();
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error ++;
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ }
+
+ if (!$error) {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+ if (!$notrigger) {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action to call a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+ //if ($result < 0) $error++;
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error) {
+ $this->db->rollback();
+
+ return - 1 * $error;
+ } else {
+ $this->db->commit();
+
+ return $this->id;
+ }
+ }
+
+ /**
+ * Load object in memory from the database
+ *
+ * @param int $id Id object
+ * @param string $ref Ref
+ *
+ * @return int <0 if KO, 0 if not found, >0 if OK
+ */
+ public function fetch($id, $ref = null)
+ {
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $sql = 'SELECT';
+ $sql .= ' t.id,';
+ $sql .= " t.code,";
+ $sql .= " t.libelle,";
+ $sql .= " t.type,";
+ $sql .= " t.active,";
+ $sql .= " t.accountancy_code,";
+ $sql .= " t.module";
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+ if (null !== $ref) {
+ $sql .= ' WHERE t.code = ' . '\'' . $ref . '\'';
+ } else {
+ $sql .= ' WHERE t.id = ' . $id;
+ }
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $numrows = $this->db->num_rows($resql);
+ if ($numrows) {
+ $obj = $this->db->fetch_object($resql);
+
+ $this->id = $obj->id;
+
+ $this->code = $obj->code;
+ $this->libelle = $obj->libelle;
+ $this->type = $obj->type;
+ $this->active = $obj->active;
+ $this->accountancy_code = $obj->accountancy_code;
+ $this->module = $obj->module;
+
+
+ }
+ $this->db->free($resql);
+
+ if ($numrows) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+ return - 1;
+ }
+ }
+
+ /**
+ * Load object in memory from the database
+ *
+ * @param string $sortorder Sort Order
+ * @param string $sortfield Sort field
+ * @param int $limit offset limit
+ * @param int $offset offset limit
+ * @param array $filter filter array
+ * @param string $filtermode filter mode (AND or OR)
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+ {
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $sql = 'SELECT';
+ $sql .= ' t.id,';
+ $sql .= " t.code,";
+ $sql .= " t.libelle,";
+ $sql .= " t.type,";
+ $sql .= " t.active,";
+ $sql .= " t.accountancy_code,";
+ $sql .= " t.module";
+
+
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+ // Manage filter
+ $sqlwhere = array();
+ if (count($filter) > 0) {
+ foreach ($filter as $key => $value) {
+ $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+ }
+ }
+ if (count($sqlwhere) > 0) {
+ $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+ }
+
+ if (!empty($sortfield)) {
+ $sql .= $this->db->order($sortfield,$sortorder);
+ }
+ if (!empty($limit)) {
+ $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+ }
+ $this->lines = array();
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+
+ while ($obj = $this->db->fetch_object($resql)) {
+ $line = new CpaiementLine();
+
+ $line->id = $obj->id;
+
+ $line->code = $obj->code;
+ $line->libelle = $obj->libelle;
+ $line->type = $obj->type;
+ $line->active = $obj->active;
+ $line->accountancy_code = $obj->accountancy_code;
+ $line->module = $obj->module;
+
+
+
+ $this->lines[$line->id] = $line;
+ }
+ $this->db->free($resql);
+
+ return $num;
+ } else {
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+ return - 1;
+ }
+ }
+
+ /**
+ * Update object into database
+ *
+ * @param User $user User that modifies
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function update(User $user, $notrigger = false)
+ {
+ $error = 0;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ // Clean parameters
+
+ if (isset($this->code)) {
+ $this->code = trim($this->code);
+ }
+ if (isset($this->libelle)) {
+ $this->libelle = trim($this->libelle);
+ }
+ if (isset($this->type)) {
+ $this->type = trim($this->type);
+ }
+ if (isset($this->active)) {
+ $this->active = trim($this->active);
+ }
+ if (isset($this->accountancy_code)) {
+ $this->accountancy_code = trim($this->accountancy_code);
+ }
+ if (isset($this->module)) {
+ $this->module = trim($this->module);
+ }
+
+
+
+ // Check parameters
+ // Put here code to add a control on parameters values
+
+ // Update request
+ $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+ $sql .= ' id = '.(isset($this->id)?$this->id:"null").',';
+ $sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+ $sql .= ' libelle = '.(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").',';
+ $sql .= ' type = '.(isset($this->type)?$this->type:"null").',';
+ $sql .= ' active = '.(isset($this->active)?$this->active:"null").',';
+ $sql .= ' accountancy_code = '.(isset($this->accountancy_code)?"'".$this->db->escape($this->accountancy_code)."'":"null").',';
+ $sql .= ' module = '.(isset($this->module)?"'".$this->db->escape($this->module)."'":"null");
+ $sql .= ' WHERE id=' . $this->id;
+
+ $this->db->begin();
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error ++;
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ }
+
+ if (!$error && !$notrigger) {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+
+ // Commit or rollback
+ if ($error) {
+ $this->db->rollback();
+
+ return - 1 * $error;
+ } else {
+ $this->db->commit();
+
+ return 1;
+ }
+ }
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function delete(User $user, $notrigger = false)
+ {
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $error = 0;
+
+ $this->db->begin();
+
+ if (!$error) {
+ if (!$notrigger) {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ if (!$error) {
+ $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+ $sql .= ' WHERE id=' . $this->id;
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error ++;
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ }
+ }
+
+ // Commit or rollback
+ if ($error) {
+ $this->db->rollback();
+
+ return - 1 * $error;
+ } else {
+ $this->db->commit();
+
+ return 1;
+ }
+ }
+
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ public function initAsSpecimen()
+ {
+ $this->id = 0;
+
+ $this->code = '';
+ $this->libelle = '';
+ $this->type = '';
+ $this->active = '';
+ $this->accountancy_code = '';
+ $this->module = '';
+
+
+ }
+
+}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 62f8c1b6717..099d05cfa84 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -62,8 +62,9 @@ class Paiement extends CommonObject
var $bank_line; // Id de la ligne d'ecriture bancaire
// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
// fk_paiement dans llx_paiement_facture est le rowid du paiement
+ var $fk_paiement; // Type of paiment
-
+
/**
* Constructor
*
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 5c2beab5dfa..293384b49a8 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -135,10 +135,10 @@ class modTax extends DolibarrModules
$this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id';
$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax',1).')';
- // Import Taxes
+ // Import social contributions
$r++;
$this->import_code[$r]=$this->rights_class.'_'.$r;
- $this->import_label[$r]="ImportDataset_tax_1"; // Translation key
+ $this->import_label[$r]="ImportDataset_tax_contrib"; // Translation key
$this->import_icon[$r]='tax';
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('t'=>MAIN_DB_PREFIX.'chargesociales');
@@ -152,6 +152,25 @@ class modTax extends DolibarrModules
$this->import_examplevalues_array[$r]=array('t.libelle'=>"Social/fiscal contribution",'t.fk_type'=>"TAXPRO (must be id or code found into dictionary)",
't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
);
+
+ // Import Taxes
+ $r++;
+ $this->import_code[$r]=$this->rights_class.'_'.$r;
+ $this->import_label[$r]="ImportDataset_tax_vat"; // Translation key
+ $this->import_icon[$r]='tax';
+ $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
+ $this->import_tables_array[$r]=array('t'=>MAIN_DB_PREFIX.'tva');
+ $this->import_fields_array[$r]=array('t.datep'=>"DatePayment*",'t.datev'=>"DateValue*",'t.label'=>"Label*",'t.fk_typepayment'=>"PaymentMode*",
+ 't.amount'=>"Amount*",'t.num_payment'=>'Numero'
+ );
+
+ $this->import_convertvalue_array[$r]=array(
+ 't.fk_typepayment'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/paiement/class/cpaiement.class.php','class'=>'Cpaiement','method'=>'fetch','element'=>'Cpaiement')
+ );
+ $this->import_examplevalues_array[$r]=array('t.label'=>"VAT Payment 1st quarter 2016",'t.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
+ 't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
+ );
+
}
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 1ddc7479bcb..c20ef305c39 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -119,6 +119,7 @@ ALTER TABLE llx_facturedet ADD COLUMN fk_contract_line integer NULL AFTER rang;
ALTER TABLE llx_facturedet_rec ADD COLUMN import_key varchar(14);
ALTER TABLE llx_chargesociales ADD COLUMN import_key varchar(14);
+ALTER TABLE llx_tva ADD COLUMN import_key varchar(14);
--DROP TABLE llx_website_page;
--DROP TABLE llx_website;
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index c5b1542198c..f33280ff511 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -30,14 +30,7 @@ create table llx_tva
entity integer DEFAULT 1 NOT NULL, -- multi company id
note text,
fk_bank integer,
- fk_user_creat integer, -- utilisateur qui a cree l'info
- fk_user_modif integer -- utilisateur qui a modifi� l'info
+ fk_user_creat integer, -- utilisateur who create record
+ fk_user_modif integer, -- utilisateur who modify record
+ import_key varchar(14)
)ENGINE=innodb;
-
---
--- List of codes for the field entity
---
--- 1 : first company vat
--- 2 : second company vat
--- 3 : etc...
---
\ No newline at end of file
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index f8942c406a9..c2893c0dbcc 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -225,5 +225,6 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on t
SameCountryCustomersWithVAT=National customers report
BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
LinkedFichinter=Link to an intervention
-ImportDataset_tax_1=Import social/fiscal taxes
+ImportDataset_tax_contrib=Import social/fiscal taxes
+ImportDataset_tax_vat=Import vat payments
ErrorBankAccountNotFound=Error: Bank account not found
--
GitLab