diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..494e563b587a36b8bc00549743f2f3fb1f3ba173
--- /dev/null
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -0,0 +1,617 @@
+<?php
+/* Copyright (C) 2016 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/compta/sociales/class/cchargesociales.class.php
+ * \ingroup tax
+ * \brief File to manage type of social/fiscal taxes
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class Cchargesociales
+ */
+class Cchargesociales
+{
+ /**
+ * @var string Id to identify managed objects
+ */
+ public $element = 'cchargesociales';
+ /**
+ * @var string Name of table without prefix where object is stored
+ */
+ public $table_element = 'c_chargesociales';
+
+ /**
+ * @var CchargesocialesLine[] Lines
+ */
+ public $lines = array();
+
+ /**
+ */
+
+ public $libelle;
+ public $deductible;
+ public $active;
+ public $code;
+ public $fk_pays;
+ public $module;
+ public $accountancy_code;
+
+ /**
+ */
+
+
+ /**
+ * 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->libelle)) {
+ $this->libelle = trim($this->libelle);
+ }
+ if (isset($this->deductible)) {
+ $this->deductible = trim($this->deductible);
+ }
+ if (isset($this->active)) {
+ $this->active = trim($this->active);
+ }
+ if (isset($this->code)) {
+ $this->code = trim($this->code);
+ }
+ if (isset($this->fk_pays)) {
+ $this->fk_pays = trim($this->fk_pays);
+ }
+ if (isset($this->module)) {
+ $this->module = trim($this->module);
+ }
+ if (isset($this->accountancy_code)) {
+ $this->accountancy_code = trim($this->accountancy_code);
+ }
+
+
+
+ // Check parameters
+ // Put here code to add control on parameters values
+
+ // Insert request
+ $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+
+ $sql.= 'libelle,';
+ $sql.= 'deductible,';
+ $sql.= 'active,';
+ $sql.= 'code,';
+ $sql.= 'fk_pays,';
+ $sql.= 'module';
+ $sql.= 'accountancy_code';
+
+
+ $sql .= ') VALUES (';
+
+ $sql .= ' '.(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").',';
+ $sql .= ' '.(! isset($this->deductible)?'NULL':$this->deductible).',';
+ $sql .= ' '.(! isset($this->active)?'NULL':$this->active).',';
+ $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+ $sql .= ' '.(! isset($this->fk_pays)?'NULL':$this->fk_pays).',';
+ $sql .= ' '.(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'").',';
+ $sql .= ' '.(! isset($this->accountancy_code)?'NULL':"'".$this->db->escape($this->accountancy_code)."'");
+
+
+ $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.libelle,";
+ $sql .= " t.deductible,";
+ $sql .= " t.active,";
+ $sql .= " t.code,";
+ $sql .= " t.fk_pays,";
+ $sql .= " t.module,";
+ $sql .= " t.accountancy_code";
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+ if (null !== $ref) {
+ $sql .= " WHERE t.code = '" . $this->db->escape($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->libelle = $obj->libelle;
+ $this->deductible = $obj->deductible;
+ $this->active = $obj->active;
+ $this->code = $obj->code;
+ $this->fk_pays = $obj->fk_pays;
+ $this->module = $obj->module;
+ $this->accountancy_code = $obj->accountancy_code;
+
+
+ }
+ $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.libelle,";
+ $sql .= " t.deductible,";
+ $sql .= " t.active,";
+ $sql .= " t.code,";
+ $sql .= " t.fk_pays,";
+ $sql .= " t.module,";
+ $sql .= " t.accountancy_code";
+
+
+ $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 CchargesocialesLine();
+
+ $line->id = $obj->id;
+ $line->libelle = $obj->libelle;
+ $line->deductible = $obj->deductible;
+ $line->active = $obj->active;
+ $line->code = $obj->code;
+ $line->fk_pays = $obj->fk_pays;
+ $line->module = $obj->module;
+ $line->accountancy_code = $obj->accountancy_code;
+
+ $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->libelle)) {
+ $this->libelle = trim($this->libelle);
+ }
+ if (isset($this->deductible)) {
+ $this->deductible = trim($this->deductible);
+ }
+ if (isset($this->active)) {
+ $this->active = trim($this->active);
+ }
+ if (isset($this->code)) {
+ $this->code = trim($this->code);
+ }
+ if (isset($this->fk_pays)) {
+ $this->fk_pays = trim($this->fk_pays);
+ }
+ if (isset($this->module)) {
+ $this->module = trim($this->module);
+ }
+ if (isset($this->accountancy_code)) {
+ $this->accountancy_code = trim($this->accountancy_code);
+ }
+
+
+
+ // Check parameters
+ // Put here code to add a control on parameters values
+
+ // Update request
+ $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+ $sql .= ' libelle = '.(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").',';
+ $sql .= ' deductible = '.(isset($this->deductible)?$this->deductible:"null").',';
+ $sql .= ' active = '.(isset($this->active)?$this->active:"null").',';
+ $sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+ $sql .= ' fk_pays = '.(isset($this->fk_pays)?$this->fk_pays:"null").',';
+ $sql .= ' module = '.(isset($this->module)?"'".$this->db->escape($this->module)."'":"null").',';
+ $sql .= ' accountancy_code = '.(isset($this->accountancy_code)?"'".$this->db->escape($this->accountancy_code)."'":"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;
+ }
+ }
+
+ /**
+ * Load an object from its id and create a new one in database
+ *
+ * @param int $fromid Id of object to clone
+ *
+ * @return int New id of clone
+ */
+ public function createFromClone($fromid)
+ {
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ global $user;
+ $error = 0;
+ $object = new Cchargesociales($this->db);
+
+ $this->db->begin();
+
+ // Load source object
+ $object->fetch($fromid);
+ // Reset object
+ $object->id = 0;
+
+ // Clear fields
+ // ...
+
+ // Create clone
+ $result = $object->create($user);
+
+ // Other options
+ if ($result < 0) {
+ $error ++;
+ $this->errors = $object->errors;
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ }
+
+ // End
+ if (!$error) {
+ $this->db->commit();
+
+ return $object->id;
+ } else {
+ $this->db->rollback();
+
+ return - 1;
+ }
+ }
+
+ /**
+ * Return a link to the user card (with optionaly the picto)
+ * Use this->id,this->lastname, this->firstname
+ *
+ * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+ * @param string $option On what the link point to
+ * @param integer $notooltip 1=Disable tooltip
+ * @param int $maxlen Max length of visible user name
+ * @param string $morecss Add more css on link
+ * @return string String with URL
+ */
+ function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+ {
+ global $langs, $conf, $db;
+ global $dolibarr_main_authentication, $dolibarr_main_demo;
+ global $menumanager;
+
+
+ $result = '';
+ $companylink = '';
+
+ $label = '<u>' . $langs->trans("MyModule") . '</u>';
+ $label.= '<div width="100%">';
+ $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+ $link = '<a href="'.DOL_URL_ROOT.'/tax/card.php?id='.$this->id.'"';
+ $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
+ $link.= '>';
+ $linkend='</a>';
+
+ if ($withpicto)
+ {
+ $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+ if ($withpicto != 2) $result.=' ';
+ }
+ $result.= $link . $this->ref . $linkend;
+ return $result;
+ }
+
+ /**
+ * Retourne le libelle du status d'un user (actif, inactif)
+ *
+ * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+ * @return string Label of status
+ */
+ function getLibStatut($mode=0)
+ {
+ return $this->LibStatut($this->status,$mode);
+ }
+
+ /**
+ * Renvoi le libelle d'un status donne
+ *
+ * @param int $status Id status
+ * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+ * @return string Label of status
+ */
+ function LibStatut($status,$mode=0)
+ {
+ global $langs;
+
+ if ($mode == 0)
+ {
+ $prefix='';
+ if ($status == 1) return $langs->trans('Enabled');
+ if ($status == 0) return $langs->trans('Disabled');
+ }
+ if ($mode == 1)
+ {
+ if ($status == 1) return $langs->trans('Enabled');
+ if ($status == 0) return $langs->trans('Disabled');
+ }
+ if ($mode == 2)
+ {
+ if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+ if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+ }
+ if ($mode == 3)
+ {
+ if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+ if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+ }
+ if ($mode == 4)
+ {
+ if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+ if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+ }
+ if ($mode == 5)
+ {
+ if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+ if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+ }
+ }
+
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ public function initAsSpecimen()
+ {
+ $this->id = 0;
+
+ $this->libelle = '';
+ $this->deductible = '';
+ $this->active = '';
+ $this->code = '';
+ $this->fk_pays = '';
+ $this->module = '';
+ $this->accountancy_code = '';
+
+
+ }
+
+}
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 1499c79d683741b7ff73b7dbd373bdf969536a7d..e5653ba2ee31e071d5c4b091988fc004cca5a833 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -24,9 +24,9 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-/** \class ChargeSociales
- * \brief Classe permettant la gestion des paiements des charges
- * La tva collectee n'est calculee que sur les factures payees.
+/**
+ * Classe permettant la gestion des paiements des charges
+ * La tva collectee n'est calculee que sur les factures payees.
*/
class ChargeSociales extends CommonObject
{
@@ -72,7 +72,7 @@ class ChargeSociales extends CommonObject
function fetch($id, $ref='')
{
$sql = "SELECT cs.rowid, cs.date_ech,";
- $sql.= " cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode,";
+ $sql.= " cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode, cs.import_key,";
$sql.= " c.libelle";
$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs, ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql.= " WHERE cs.fk_type = c.id";
@@ -96,7 +96,8 @@ class ChargeSociales extends CommonObject
$this->amount = $obj->amount;
$this->paye = $obj->paye;
$this->periode = $this->db->jdate($obj->periode);
-
+ $this->import_key = $this->import_key;
+
$this->db->free($resql);
return 1;
@@ -485,7 +486,7 @@ class ChargeSociales extends CommonObject
*/
function info($id)
{
- $sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev";
+ $sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key";
$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
$sql.= " WHERE e.rowid = ".$id;
@@ -514,7 +515,7 @@ class ChargeSociales extends CommonObject
$this->date_creation = $this->db->jdate($obj->datec);
$this->date_modification = $this->db->jdate($obj->datem);
$this->date_validation = $this->db->jdate($obj->datev);
-
+ $this->import_key = $obj->import_key;
}
$this->db->free($result);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f74c09dce3a6a2db699b520463026f859be1246a..34e52b3c205c42addf756a4bf9079df4ebd23e01 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -719,7 +719,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
$limittitle=30;
$out.='<a class="tabTitle">';
if ($picto) $out.=img_picto($title,($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
- //$out.='<span class="tabTitleText">'.dol_trunc($title,$limittitle).'</span>';
+ $out.='<span class="tabTitleText">'.dol_trunc($title,$limittitle).'</span>';
$out.='</a>';
}
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index b8297c1879243d11e9aef30f0371a567c9525098..5c2beab5dface61442a59986d1a0c89233f17016 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -134,6 +134,24 @@ class modTax extends DolibarrModules
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
$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
+ $r++;
+ $this->import_code[$r]=$this->rights_class.'_'.$r;
+ $this->import_label[$r]="ImportDataset_tax_1"; // 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');
+ $this->import_fields_array[$r]=array('t.libelle'=>"Label*",'t.fk_type'=>"Type",
+ 't.amount'=>"Amount*",'t.date_ech'=>"DateDue*",'t.periode'=>"PeriodEndDate*"
+ );
+
+ $this->import_convertvalue_array[$r]=array(
+ 't.fk_type'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/sociales/class/cchargesociales.class.php','class'=>'Cchargesociales','method'=>'fetch','element'=>'Cchargesociales')
+ );
+ $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"
+ );
}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 9b40c35ead603ae2087610aec734c445ee5e01fa..3b52372d68492969baab29c1676adce51ece24a2 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -44,7 +44,7 @@ $entitytoicon=array(
'order'=>'order' ,'order_line'=>'order',
'intervention'=>'intervention' ,'inter_line'=>'intervention',
'member'=>'user' ,'member_type'=>'group','subscription'=>'payment',
- 'tax'=>'generic' ,'tax_type'=>'generic',
+ 'tax'=>'bill' ,'tax_type'=>'generic',
'account'=>'account',
'payment'=>'payment',
'product'=>'product','stock'=>'generic','warehouse'=>'stock',
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 140b0c15089d78ec6e1053e5bd11c17b067e6195..b66dc079262b7c044dd81eec3a1e5768ddc91754 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
@@ -115,6 +115,8 @@ UPDATE llx_projet as p set p.opp_percent = (SELECT percent FROM llx_c_lead_statu
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);
+
--DROP TABLE llx_website_page;
--DROP TABLE llx_website;
CREATE TABLE llx_website
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index cca0c87ede28e6ba0719664fe89edc6f46a8c8f7..68607b1065af19e3f2964c10ea4b51d1e3d2238b 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -29,7 +29,8 @@ create table llx_chargesociales
fk_type integer NOT NULL,
amount real default 0 NOT NULL,
paye smallint default 0 NOT NULL,
- periode date
+ periode date,
+ import_key varchar(14)
)ENGINE=innodb;
--
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index c6526b51d288e0abe8285ca1e460efadbc86c34d..7325c7ed67498440ba25ccf9cf5a1dede662ce26 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -225,3 +225,4 @@ 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
\ No newline at end of file
diff --git a/htdocs/theme/eldy/img/object_tax.png b/htdocs/theme/eldy/img/object_tax.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4022e77740bb96770f8fee065c58284e3518c45
Binary files /dev/null and b/htdocs/theme/eldy/img/object_tax.png differ
diff --git a/htdocs/theme/md/img/object_tax.png b/htdocs/theme/md/img/object_tax.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4022e77740bb96770f8fee065c58284e3518c45
Binary files /dev/null and b/htdocs/theme/md/img/object_tax.png differ