Use id in index
This commit is contained in:
Laurent Destailleur
commit
b534c40f13
10 changed files with 127 additions and 75 deletions
|
|
@ -214,7 +214,7 @@ $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.t
|
|||
$tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays = c.rowid and c.active = 1";
|
||||
$tabsql[8] = "SELECT t.id as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
|
||||
$tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
|
||||
$tabsql[10] = "SELECT t.rowid, t.entity, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays = c.rowid AND t.entity = ".getEntity($tabname[10]);
|
||||
$tabsql[10] = "SELECT t.rowid, t.entity, t.type_vat, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays = c.rowid AND t.entity = ".getEntity($tabname[10]);
|
||||
$tabsql[11] = "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
|
||||
$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.deposit_percent, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity IN (".getEntity($tabname[12]).")";
|
||||
$tabsql[13] = "SELECT c.id as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity IN (".getEntity($tabname[13]).")";
|
||||
|
|
@ -308,7 +308,7 @@ $tabfield[6] = "code,libelle,type,color,position";
|
|||
$tabfield[7] = "code,libelle,country,accountancy_code";
|
||||
$tabfield[8] = "code,libelle,country_id,country".(getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? ',position' : '');
|
||||
$tabfield[9] = "code,label,unicode";
|
||||
$tabfield[10] = "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
|
||||
$tabfield[10] = "country_id,country,type_vat,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
|
||||
$tabfield[11] = "element,source,code,libelle,position";
|
||||
$tabfield[12] = "code,libelle,libelle_facture,deposit_percent,nbjour,type_cdr,decalage,sortorder";
|
||||
$tabfield[13] = "code,libelle,type";
|
||||
|
|
@ -355,7 +355,7 @@ $tabfieldvalue[6] = "code,libelle,type,color,position";
|
|||
$tabfieldvalue[7] = "code,libelle,country,accountancy_code";
|
||||
$tabfieldvalue[8] = "code,libelle,country".(getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? ',position' : '');
|
||||
$tabfieldvalue[9] = "code,label,unicode";
|
||||
$tabfieldvalue[10] = "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
|
||||
$tabfieldvalue[10] = "country,type_vat,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
|
||||
$tabfieldvalue[11] = "element,source,code,libelle,position";
|
||||
$tabfieldvalue[12] = "code,libelle,libelle_facture,deposit_percent,nbjour,type_cdr,decalage,sortorder";
|
||||
$tabfieldvalue[13] = "code,libelle,type";
|
||||
|
|
@ -402,7 +402,7 @@ $tabfieldinsert[6] = "code,libelle,type,color,position";
|
|||
$tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code";
|
||||
$tabfieldinsert[8] = "code,libelle,fk_country".(getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? ',position' : '');
|
||||
$tabfieldinsert[9] = "code_iso,label,unicode";
|
||||
$tabfieldinsert[10] = "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note,entity";
|
||||
$tabfieldinsert[10] = "fk_pays,type_vat,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note,entity";
|
||||
$tabfieldinsert[11] = "element,source,code,libelle,position";
|
||||
$tabfieldinsert[12] = "code,libelle,libelle_facture,deposit_percent,nbjour,type_cdr,decalage,sortorder,entity";
|
||||
$tabfieldinsert[13] = "code,libelle,type,entity";
|
||||
|
|
@ -675,6 +675,13 @@ if ($id == 11) {
|
|||
);
|
||||
}
|
||||
|
||||
// Define type_vatList (used for dictionary "llx_c_tva")
|
||||
$type_vatList = array(
|
||||
"0" => $langs->trans("All"),
|
||||
"1" => $langs->trans("Sell"),
|
||||
"2" => $langs->trans("Buy")
|
||||
);
|
||||
|
||||
// Define localtax_typeList (used for dictionary "llx_c_tva")
|
||||
$localtax_typeList = array(
|
||||
"0" => $langs->trans("No"),
|
||||
|
|
@ -761,14 +768,14 @@ if (empty($reshook)) {
|
|||
continue; // For a column name 'sortorder', we use the field name 'position'
|
||||
}
|
||||
if ((!GETPOSTISSET($value) || GETPOST($value) == '')
|
||||
&& (
|
||||
!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto', 'deposit_percent')) // Fields that are not mandatory
|
||||
&& (
|
||||
!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto', 'deposit_percent')) // Fields that are not mandatory
|
||||
&& ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10
|
||||
)
|
||||
) {
|
||||
$ok = 0;
|
||||
$fieldnamekey = $value;
|
||||
// We take translate key of field
|
||||
$ok = 0;
|
||||
$fieldnamekey = $value;
|
||||
// We take translate key of field
|
||||
if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
|
||||
$fieldnamekey = 'Label';
|
||||
}
|
||||
|
|
@ -821,7 +828,7 @@ if (empty($reshook)) {
|
|||
$fieldnamekey = 'UseByDefault';
|
||||
}
|
||||
|
||||
setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
|
||||
setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
|
||||
}
|
||||
}
|
||||
// Other special checks
|
||||
|
|
@ -1358,9 +1365,9 @@ if ($id > 0) {
|
|||
|
||||
$newcardbutton = '';
|
||||
/*$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton .= dolGetButtonTitleSeparator();
|
||||
*/
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton .= dolGetButtonTitleSeparator();
|
||||
*/
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/admin/dict.php?action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
|
||||
|
||||
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'tools', 0, $newcardbutton, '', $listlimit, 1, 0, 1);
|
||||
|
|
@ -1837,6 +1844,9 @@ if ($id > 0) {
|
|||
$cssprefix = 'center ';
|
||||
}
|
||||
|
||||
if ($value == 'type_vat') {
|
||||
$valuetoshow = $langs->trans("VATType"); $cssprefix = "center "; $sortable = 0;
|
||||
}
|
||||
if ($value == 'localtax1_type') {
|
||||
$valuetoshow = $langs->trans("UseLocalTax")." 2";
|
||||
$cssprefix = "center ";
|
||||
|
|
@ -2301,6 +2311,13 @@ if ($id > 0) {
|
|||
$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->$value);
|
||||
} elseif ($value == 'localtax1' || $value == 'localtax2') {
|
||||
$class = "center";
|
||||
} elseif ($value == 'type_vat') {
|
||||
if ($obj->type_vat != 0) {
|
||||
$valuetoshow = $type_vatList[$valuetoshow];
|
||||
} else {
|
||||
$valuetoshow = $langs->transnoentitiesnoconv("All");
|
||||
}
|
||||
$class = "center";
|
||||
} elseif ($value == 'localtax1_type') {
|
||||
if ($obj->localtax1 != 0) {
|
||||
$valuetoshow = $localtax_typeList[$valuetoshow];
|
||||
|
|
@ -2371,7 +2388,7 @@ if ($id > 0) {
|
|||
if (in_array($value, array('nbjour', 'decalage', 'pos', 'position', 'deposit_percent'))) {
|
||||
$class .= ' right';
|
||||
}
|
||||
if (in_array($value, array('localtax1_type', 'localtax2_type'))) {
|
||||
if (in_array($value, array('type_vat', 'localtax1_type', 'localtax2_type'))) {
|
||||
$class .= ' nowraponall';
|
||||
}
|
||||
if (in_array($value, array('use_default', 'fk_parent', 'sortorder'))) {
|
||||
|
|
@ -2545,7 +2562,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
|
|||
global $conf, $langs, $db, $mysoc;
|
||||
global $form;
|
||||
global $region_id;
|
||||
global $elementList, $sourceList, $localtax_typeList;
|
||||
global $elementList, $sourceList, $localtax_typeList, $type_vatList;
|
||||
|
||||
$formadmin = new FormAdmin($db);
|
||||
$formcompany = new FormCompany($db);
|
||||
|
|
@ -2684,6 +2701,11 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
|
|||
);
|
||||
print $form->selectarray('unit', $units, (!empty($obj->{$value}) ? $obj->{$value} : ''), 0, 0, 0);
|
||||
print '</td>';
|
||||
} elseif ($value == 'type_vat') {
|
||||
// VAT type 0: all, 1: sell, 2: purchase
|
||||
print '<td class="center">';
|
||||
print $form->selectarray($value, $type_vatList, (!empty($obj->{$value}) ? $obj->{$value}:''));
|
||||
print '</td>';
|
||||
} elseif ($value == 'localtax1_type' || $value == 'localtax2_type') {
|
||||
// Le type de taxe locale
|
||||
print '<td class="center">';
|
||||
|
|
|
|||
|
|
@ -6372,10 +6372,10 @@ class Form
|
|||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
|
||||
/**
|
||||
* Load into the cache vat rates of a country
|
||||
* Load into the cache ->cache_vatrates, all the vat rates of a country
|
||||
*
|
||||
* @param string $country_code Country code with quotes ("'CA'", or "'CA,IN,...'")
|
||||
* @return int Nb of loaded lines, 0 if already loaded, <0 if KO
|
||||
* @param string $country_code Country code with quotes ("'CA'", or "'CA,IN,...'")
|
||||
* @return int Nb of loaded lines, 0 if already loaded, <0 if KO
|
||||
*/
|
||||
public function load_cache_vatrates($country_code)
|
||||
{
|
||||
|
|
@ -6389,8 +6389,8 @@ class Form
|
|||
|
||||
dol_syslog(__METHOD__, LOG_DEBUG);
|
||||
|
||||
$sql = "SELECT DISTINCT t.rowid, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";
|
||||
$sql .= " FROM " . $this->db->prefix() . "c_tva as t, " . $this->db->prefix() . "c_country as c";
|
||||
$sql = "SELECT t.rowid, t.type_vat, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";
|
||||
$sql .= " FROM ".$this->db->prefix()."c_tva as t, ".$this->db->prefix()."c_country as c";
|
||||
$sql .= " WHERE t.fk_pays = c.rowid";
|
||||
$sql .= " AND t.active > 0";
|
||||
$sql .= " AND t.entity IN (".getEntity('c_tva').")";
|
||||
|
|
@ -6403,17 +6403,19 @@ class Form
|
|||
if ($num) {
|
||||
for ($i = 0; $i < $num; $i++) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
$this->cache_vatrates[$i]['rowid'] = $obj->rowid;
|
||||
$this->cache_vatrates[$i]['code'] = $obj->code;
|
||||
$this->cache_vatrates[$i]['txtva'] = $obj->taux;
|
||||
$this->cache_vatrates[$i]['nprtva'] = $obj->recuperableonly;
|
||||
$this->cache_vatrates[$i]['localtax1'] = $obj->localtax1;
|
||||
$this->cache_vatrates[$i]['localtax1_type'] = $obj->localtax1_type;
|
||||
$this->cache_vatrates[$i]['localtax2'] = $obj->localtax2;
|
||||
$this->cache_vatrates[$i]['localtax2_type'] = $obj->localtax1_type;
|
||||
|
||||
$this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : ''); // Label must contains only 0-9 , . % or *
|
||||
$this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label
|
||||
$tmparray = array();
|
||||
$tmparray['rowid'] = $obj->rowid;
|
||||
$tmparray['type_vat'] = $obj->type_vat;
|
||||
$tmparray['code'] = $obj->code;
|
||||
$tmparray['txtva'] = $obj->taux;
|
||||
$tmparray['nprtva'] = $obj->recuperableonly;
|
||||
$tmparray['localtax1'] = $obj->localtax1;
|
||||
$tmparray['localtax1_type'] = $obj->localtax1_type;
|
||||
$tmparray['localtax2'] = $obj->localtax2;
|
||||
$tmparray['localtax2_type'] = $obj->localtax1_type;
|
||||
$tmparray['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : ''); // Label must contains only 0-9 , . % or *
|
||||
$tmparray['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label
|
||||
$positiverates = '';
|
||||
if ($obj->taux) {
|
||||
$positiverates .= ($positiverates ? '/' : '') . $obj->taux;
|
||||
|
|
@ -6427,7 +6429,9 @@ class Form
|
|||
if (empty($positiverates)) {
|
||||
$positiverates = '0';
|
||||
}
|
||||
$this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label
|
||||
$tmparray['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label
|
||||
|
||||
$this->cache_vatrates[$obj->rowid] = $tmparray;
|
||||
}
|
||||
|
||||
return $num;
|
||||
|
|
@ -6456,24 +6460,25 @@ class Form
|
|||
* Output an HTML select vat rate.
|
||||
* The name of this function should be selectVat. We keep bad name for compatibility purpose.
|
||||
*
|
||||
* @param string $htmlname Name of HTML select field
|
||||
* @param float|string $selectedrate Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
|
||||
* @param Societe $societe_vendeuse Thirdparty seller
|
||||
* @param Societe $societe_acheteuse Thirdparty buyer
|
||||
* @param int $idprod Id product. O if unknown of NA.
|
||||
* @param int $info_bits Miscellaneous information on line (1 for NPR)
|
||||
* @param int|string $type ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)
|
||||
* If seller not subject to VAT, default VAT=0. End of rule.
|
||||
* If (seller country==buyer country), then default VAT=product's VAT. End of rule.
|
||||
* If (seller and buyer in EU) and sold product = new means of transportation (car, boat, airplane), default VAT =0 (VAT must be paid by the buyer to his country's tax office and not the seller). End of rule.
|
||||
* If (seller and buyer in EU) and buyer=private person, then default VAT=VAT of sold product. End of rule.
|
||||
* If (seller and buyer in EU) and buyer=company then default VAT =0. End of rule.
|
||||
* Else, default proposed VAT==0. End of rule.
|
||||
* @param bool $options_only Return HTML options lines only (for ajax treatment)
|
||||
* @param int $mode 0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
|
||||
* @return string
|
||||
* @param string $htmlname Name of HTML select field
|
||||
* @param float|string $selectedrate Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
|
||||
* @param Societe $societe_vendeuse Thirdparty seller
|
||||
* @param Societe $societe_acheteuse Thirdparty buyer
|
||||
* @param int $idprod Id product. O if unknown of NA.
|
||||
* @param int $info_bits Miscellaneous information on line (1 for NPR)
|
||||
* @param int|string $type ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)
|
||||
* If seller not subject to VAT, default VAT=0. End of rule.
|
||||
* If (seller country==buyer country), then default VAT=product's VAT. End of rule.
|
||||
* If (seller and buyer in EU) and sold product = new means of transportation (car, boat, airplane), default VAT =0 (VAT must be paid by the buyer to his country's tax office and not the seller). End of rule.
|
||||
* If (seller and buyer in EU) and buyer=private person, then default VAT=VAT of sold product. End of rule.
|
||||
* If (seller and buyer in EU) and buyer=company then default VAT =0. End of rule.
|
||||
* Else, default proposed VAT==0. End of rule.
|
||||
* @param bool $options_only Return HTML options lines only (for ajax treatment)
|
||||
* @param int $mode 0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
|
||||
* @param int $type_vat 0=All type, 1=VAT rate sale, 2=VAT rate purchase
|
||||
* @return string
|
||||
*/
|
||||
public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = null, $societe_acheteuse = null, $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)
|
||||
public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = null, $societe_acheteuse = null, $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0, $type_vat = 0)
|
||||
{
|
||||
// phpcs:enable
|
||||
global $langs, $conf, $mysoc;
|
||||
|
|
@ -6535,8 +6540,17 @@ class Form
|
|||
}
|
||||
}
|
||||
|
||||
// Now we get list
|
||||
$num = $this->load_cache_vatrates($code_country); // If no vat defined, return -1 with message into this->error
|
||||
// Now we load the list of VAT
|
||||
$this->load_cache_vatrates($code_country); // If no vat defined, return -1 with message into this->error
|
||||
// Keep only the VAT qualified for $type_vat
|
||||
$arrayofvatrates = array();
|
||||
foreach ($this->cache_vatrates as $cachevalue) {
|
||||
if (empty($cachevalue['type_vat']) || $cachevalue['type_vat'] != $type_vat) {
|
||||
$arrayofvatrates[] = $cachevalue;
|
||||
}
|
||||
}
|
||||
|
||||
$num = count($arrayofvatrates);
|
||||
|
||||
if ($num > 0) {
|
||||
// Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
|
||||
|
|
@ -6560,7 +6574,7 @@ class Form
|
|||
if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {
|
||||
if (!getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS')) {
|
||||
// We take the last one found in list
|
||||
$defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
|
||||
$defaulttx = $arrayofvatrates[$num - 1]['txtva'];
|
||||
} else {
|
||||
// We will use the rate defined into MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
|
||||
$defaulttx = '';
|
||||
|
|
@ -6591,7 +6605,7 @@ class Form
|
|||
}
|
||||
|
||||
$selectedfound = false;
|
||||
foreach ($this->cache_vatrates as $rate) {
|
||||
foreach ($arrayofvatrates as $rate) {
|
||||
// Keep only 0 if seller is not subject to VAT
|
||||
if ($disabled && $rate['txtva'] != 0) {
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -442,10 +442,15 @@ if ($nolinesbefore) {
|
|||
}
|
||||
print '<td class="nobottom linecolvat right">';
|
||||
$coldisplay++;
|
||||
if ($object->element == 'propal' || $object->element == 'commande' || $object->element == 'facture' || $object->element == 'facturerec') {
|
||||
$type_tva = 1;
|
||||
} elseif ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {
|
||||
$type_tva = 2;
|
||||
}
|
||||
if ($seller->tva_assuj == "0") {
|
||||
echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
|
||||
} else {
|
||||
echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);
|
||||
echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1, $type_tva);
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2010-2022 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
|
||||
* Copyright (C) 2012 Cédric Salvador <csalvador@gpcsolutions.fr>
|
||||
* Copyright (C) 2012-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2022 OpenDSI <support@open-dsi.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -205,9 +205,14 @@ $coldisplay++;
|
|||
|
||||
// VAT Rate
|
||||
$coldisplay++;
|
||||
if ($object->element == 'propal' || $object->element == 'commande' || $object->element == 'facture' || $object->element == 'facturerec') {
|
||||
$type_tva = 1;
|
||||
} elseif ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {
|
||||
$type_tva = 2;
|
||||
}
|
||||
if (!$situationinvoicelinewithparent) {
|
||||
print '<td class="right">';
|
||||
print $form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : ($line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : '')), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1);
|
||||
print $form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : ($line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : '')), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1, $type_tva);
|
||||
print '</td>';
|
||||
} else {
|
||||
print '<td class="right"><input size="1" type="text" class="flat right" name="tva_tx" value="'.price($line->tva_tx).'" readonly />%</td>';
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2020 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2015-2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2015-2023 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
||||
*
|
||||
|
|
@ -2364,7 +2364,7 @@ if ($action == 'create') {
|
|||
// VAT
|
||||
$selectedvat = price2num($line->vatrate).(!empty($line->vat_src_code) ? ' ('.$line->vat_src_code.')' : '');
|
||||
print '<td class="right">';
|
||||
print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $selectedvat), $mysoc, '', 0, 0, '', false, 1);
|
||||
print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $selectedvat), $mysoc, '', 0, 0, '', false, 1, 2);
|
||||
print '</td>';
|
||||
|
||||
// Unit price
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
-- Be carefull to requests order.
|
||||
-- This file must be loaded by calling /install/index.php page
|
||||
-- when current version is 18.0.0 or higher.
|
||||
|
||||
--
|
||||
-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
|
||||
-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
|
||||
|
||||
|
||||
-- v17
|
||||
-- Missing in v17 or lower
|
||||
|
||||
-- VMYSQL4.3 ALTER TABLE llx_emailcollector_emailcollector MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
|
||||
|
||||
|
|
@ -86,7 +87,6 @@ ALTER TABLE llx_payment_salary MODIFY COLUMN datep datetime;
|
|||
INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1179, 117, 'I-28' , 28, 0, '0', 0, '0', 0, 'IGST', 1);
|
||||
INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1176, 117, 'C+S-18', 0, 9, '1', 9, '1', 0, 'CGST+SGST - Same state sales', 1);
|
||||
|
||||
|
||||
ALTER TABLE llx_user ADD COLUMN flagdelsessionsbefore datetime DEFAULT NULL;
|
||||
|
||||
ALTER TABLE llx_website ADD COLUMN pageviews_previous_month BIGINT UNSIGNED DEFAULT 0;
|
||||
|
|
|
|||
|
|
@ -198,3 +198,6 @@ CREATE TABLE llx_c_product_thirdparty_relation_type
|
|||
active tinyint default 1 NOT NULL
|
||||
) ENGINE = innodb;
|
||||
|
||||
|
||||
ALTER TABLE llx_c_tva ADD COLUMN type_vat smallint NOT NULL DEFAULT 0 AFTER fk_pays;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,20 +20,21 @@
|
|||
|
||||
create table llx_c_tva
|
||||
(
|
||||
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
entity integer DEFAULT 1 NOT NULL,
|
||||
fk_pays integer NOT NULL,
|
||||
code varchar(10) DEFAULT '', -- a key to describe vat entry, for example FR20
|
||||
taux double NOT NULL,
|
||||
localtax1 varchar(20) NOT NULL DEFAULT '0',
|
||||
localtax1_type varchar(10) NOT NULL DEFAULT '0',
|
||||
localtax2 varchar(20) NOT NULL DEFAULT '0',
|
||||
localtax2_type varchar(10) NOT NULL DEFAULT '0',
|
||||
use_default tinyint DEFAULT 0, -- set to 1 to be the default vat when no vat defined on product
|
||||
recuperableonly integer NOT NULL DEFAULT 0,
|
||||
note varchar(128),
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
accountancy_code_sell varchar(32) DEFAULT NULL,
|
||||
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
entity integer DEFAULT 1 NOT NULL,
|
||||
fk_pays integer NOT NULL,
|
||||
type_vat smallint NOT NULL DEFAULT 0, -- 0: all, 1: sell, 2: purchase
|
||||
code varchar(10) DEFAULT '', -- a key to describe vat entry, for example FR20
|
||||
taux double NOT NULL,
|
||||
localtax1 varchar(20) NOT NULL DEFAULT '0',
|
||||
localtax1_type varchar(10) NOT NULL DEFAULT '0',
|
||||
localtax2 varchar(20) NOT NULL DEFAULT '0',
|
||||
localtax2_type varchar(10) NOT NULL DEFAULT '0',
|
||||
use_default tinyint DEFAULT 0, -- set to 1 to be the default vat when no vat defined on product
|
||||
recuperableonly integer NOT NULL DEFAULT 0,
|
||||
note varchar(128),
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
accountancy_code_sell varchar(32) DEFAULT NULL,
|
||||
accountancy_code_buy varchar(32) DEFAULT NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
|
|
|||
|
|
@ -1123,6 +1123,7 @@ VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sale
|
|||
VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
|
||||
VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
|
||||
VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration. This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
|
||||
VATType=VAT type
|
||||
##### Local Taxes #####
|
||||
TypeOfSaleTaxes=Type of sales tax
|
||||
LTRate=Rate
|
||||
|
|
|
|||
|
|
@ -144,11 +144,12 @@ if (empty($reshook)) {
|
|||
// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
|
||||
$vatratecode = $reg[1];
|
||||
// Get record from code
|
||||
$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
|
||||
$sql = "SELECT t.rowid, t.type_vat, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
|
||||
$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
|
||||
$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
|
||||
$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
|
||||
$sql .= " AND t.type_vat IN (0, 1)"; // Use only VAT rates type all or i.e. the sales type VAT rates.
|
||||
$sql .= " AND t.entity IN (".getEntity('c_tva').")";
|
||||
$resql = $db->query($sql);
|
||||
if ($resql) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue