lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix creation date was not filled

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-16 20:47:33 +01:00
parent 26ba0a9ec2
commit a84ed841cc
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/tva/card.php
View File

@ -82,13 +82,13 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$object->datev=$datev;
$object->datep=$datep;
$amount = price2num(GETPOST("amount"));
$amount = price2num(GETPOST("amount",'alpha'));
if ($refund == 1) {
$amount= -$amount;
}
$object->amount= $amount;
$object->label=GETPOST("label");
$object->note=GETPOST("note");
$object->label=GETPOST("label",'alpha');
$object->note=GETPOST("note",'none');
if (empty($object->datev))
{
@ -304,7 +304,7 @@ if ($id)
{
$head=vat_prepare_head($object);
dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/reglement.php">'.$langs->trans("BackToList").'</a>';

15
htdocs/compta/tva/class/tva.class.php
View File

@ -100,9 +100,7 @@ class Tva extends CommonObject
$sql.= "fk_bank,";
$sql.= "fk_user_creat,";
$sql.= "fk_user_modif";
$sql.= ") VALUES (";
$sql.= " '".$this->db->idate($now)."',";
$sql.= " '".$this->db->idate($this->datep)."',";
$sql.= " '".$this->db->idate($this->datev)."',";
@ -112,7 +110,6 @@ class Tva extends CommonObject
$sql.= " ".($this->fk_bank <= 0 ? "NULL" : "'".$this->db->escape($this->fk_bank)."'").",";
$sql.= " '".$this->db->escape($this->fk_user_creat)."',";
$sql.= " '".$this->db->escape($this->fk_user_modif)."'";
$sql.= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
@ -496,6 +493,7 @@ class Tva extends CommonObject
$this->fk_bank=trim($this->fk_bank);
$this->fk_user_creat=trim($this->fk_user_creat);
$this->fk_user_modif=trim($this->fk_user_modif);
if (empty($this->datec)) $this->datec = dol_now();
// Check parameters
if (! $this->label)
@ -520,8 +518,10 @@ class Tva extends CommonObject
}
// Insert into llx_tva
$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (datep";
$sql.= ", datev";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
$sql.= "datec";
$sql.= ", datep";
$sql.= ", datev";
$sql.= ", amount";
$sql.= ", fk_typepayment";
$sql.= ", num_payment";
@ -532,7 +532,8 @@ class Tva extends CommonObject
$sql.= ", entity";
$sql.= ") ";
$sql.= " VALUES (";
$sql.= "'".$this->db->idate($this->datep)."'";
$sql.= " '".$this->db->idate($this->datec)."'";
$sql.= ", '".$this->db->idate($this->datep)."'";
$sql.= ", '".$this->db->idate($this->datev)."'";
$sql.= ", ".$this->amount;
$sql.= ", '".$this->db->escape($this->type_payment)."'";
@ -678,7 +679,7 @@ class Tva extends CommonObject
*/
function info($id)
{
$sql = "SELECT t.rowid, t.tms, t.datec, t.fk_user_creat";
$sql = "SELECT t.rowid, t.tms, t.fk_user_modif, t.datec, t.fk_user_creat";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
$sql.= " WHERE t.rowid = ".$id;

2
htdocs/compta/tva/info.php
View File

@ -51,7 +51,7 @@ $object->info($id);
$head = vat_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("VATPayment"), 0, 'payment');
dol_fiche_head($head, 'info', $langs->trans("VATPayment"), -1, 'payment');
$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/reglement.php">'.$langs->trans("BackToList").'</a>';

1
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
View File

@ -595,6 +595,7 @@ ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_fk_user (f
ALTER TABLE llx_actioncomm_reminder ADD UNIQUE INDEX uk_actioncomm_reminder_unique(fk_user, typeremind, offsetvalue, offsetunit);
UPDATE llx_tva SET datec = tms where datec IS NULL;
-- VPGSQL8.2 CREATE SEQUENCE llx_supplier_proposal_rowid_seq;
-- VPGSQL8.2 ALTER TABLE llx_supplier_proposal ALTER COLUMN rowid SET DEFAULT nextval('llx_supplier_proposal_rowid_seq');