Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
9a986aaa26
3 changed files with 14 additions and 9 deletions
|
|
@ -2252,7 +2252,7 @@ class Expedition extends CommonObject
|
|||
|
||||
$this->db->begin();
|
||||
|
||||
$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET fk_statut = ".self::STATUS_CLOSED;
|
||||
$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET fk_statut = ".self::STATUS_CLOSED.", date_expedition = '".$this->db->escape($this->db->idate(dol_now()))."'";
|
||||
$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut > 0";
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
|
|
|
|||
|
|
@ -114,3 +114,6 @@ create table llx_paymentexpensereport_expensereport
|
|||
|
||||
|
||||
ALTER TABLE llx_contrat ADD COLUMN denormalized_lower_planned_end_date datetime;
|
||||
|
||||
-- Missing field vat_reverse_charge with constant MAIN_COMPANY_PERENTITY_SHARED
|
||||
ALTER TABLE llx_societe_perentity ADD COLUMN vat_reverse_charge tinyint DEFAULT 0;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
-- ========================================================================
|
||||
-- Copyright (C) 2021 Open-Dsi <support@open-dsi.fr>
|
||||
-- Copyright (C) 2021 Open-Dsi <support@open-dsi.fr>
|
||||
-- Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
--
|
||||
-- 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
|
||||
|
|
@ -18,11 +19,12 @@
|
|||
|
||||
create table llx_societe_perentity
|
||||
(
|
||||
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
||||
fk_soc integer,
|
||||
entity integer DEFAULT 1 NOT NULL, -- multi company id
|
||||
accountancy_code_customer varchar(24), -- customer accountancy auxiliary account
|
||||
accountancy_code_supplier varchar(24), -- supplier accountancy auxiliary account
|
||||
accountancy_code_sell varchar(32), -- Selling accountancy code
|
||||
accountancy_code_buy varchar(32) -- Buying accountancy code
|
||||
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
||||
fk_soc integer,
|
||||
entity integer DEFAULT 1 NOT NULL, -- multi company id
|
||||
accountancy_code_customer varchar(24), -- customer accountancy auxiliary account
|
||||
accountancy_code_supplier varchar(24), -- supplier accountancy auxiliary account
|
||||
accountancy_code_sell varchar(32), -- Selling accountancy code
|
||||
accountancy_code_buy varchar(32), -- Buying accountancy code
|
||||
vat_reverse_charge tinyint DEFAULT 0 -- VAT reverse charge
|
||||
)ENGINE=innodb;
|
||||
|
|
|
|||
Loading…
Reference in a new issue