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

Fix #5350 date_pointoftax prevented creating invoices

Browse Source
This commit is contained in:
Raphaël Doursenaud 2016-06-16 13:08:06 +02:00
parent 49d515be7e
commit eb54c3f8af
No known key found for this signature in database
GPG Key ID: 6992A63407576955
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -358,7 +358,7 @@ class Facture extends CommonInvoice
$sql.= ", ".($this->remise_absolue>0?$this->remise_absolue:'NULL');
$sql.= ", ".($this->remise_percent>0?$this->remise_percent:'NULL');
$sql.= ", '".$this->db->idate($this->date)."'";
$sql.= ", '".$this->db->idate($this->date_pointoftax)."'";
$sql.= ", ".(strval($this->date_pointoftax)!='' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null');
$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");

4
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
View File

@ -111,7 +111,7 @@ ALTER TABLE llx_cronjob ADD COLUMN test varchar(255) DEFAULT '1';
ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
ALTER TABLE llx_facture ADD COLUMN date_pointoftax date;
ALTER TABLE llx_facture ADD COLUMN date_pointoftax date DEFAULT NULL;
UPDATE llx_projet as p set p.opp_percent = (SELECT percent FROM llx_c_lead_status as cls WHERE cls.rowid = p.fk_opp_status) WHERE p.opp_percent IS NULL AND p.fk_opp_status IS NOT NULL;
@ -506,4 +506,4 @@ CREATE TABLE llx_oauth_state (
entity integer
)ENGINE=InnoDB;
ALTER TABLE llx_import_model MODIFY COLUMN type varchar(50);
ALTER TABLE llx_import_model MODIFY COLUMN type varchar(50);

2
htdocs/install/mysql/tables/llx_facture.sql
View File

@ -38,7 +38,7 @@ create table llx_facture
fk_soc integer NOT NULL,
datec datetime, -- date de creation de la facture
datef date, -- date invoice
date_pointoftax date, -- date point of tax (for GB)
date_pointoftax date DEFAULT NULL, -- date point of tax (for GB)
date_valid date, -- date validation
tms timestamp, -- date creation/modification
paye smallint DEFAULT 0 NOT NULL,