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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-22 20:25:30 +02:00
commit 887a5a43d2
5 changed files with 81 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/don/class/don.class.php
View File

@ -6,7 +6,7 @@
* Copyright (C) 2015-2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2019 Thibault FOUCART <support@ptibogxiv.net>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.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
@ -62,7 +62,15 @@ class Don extends CommonObject
*/
public $picto = 'generic';
/**
* @var string Date of the donation
*/
public $date;
/**
* amount of donation
* @var double
*/
public $amount;
/**
@ -133,7 +141,7 @@ class Don extends CommonObject
/**
* Retourne le libelle du statut d'un don (brouillon, validee, abandonnee, payee)
* Returns the donation status label (draft, valid, abandoned, paid)
*
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
* @return string Libelle
@ -145,7 +153,7 @@ class Don extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Renvoi le libelle d'un statut donne
* Return the label of a given status
*
* @param int $statut Id statut
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto

15
htdocs/don/class/donstats.class.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/don/class/dontats.class.php
* \file htdocs/don/class/donstats.class.php
* \ingroup donations
* \brief File of class to manage donations statistics
*/
@ -39,11 +39,22 @@ class DonationStats extends Stats
*/
public $table_element;
public $socid;
public $socid;
public $userid;
/**
* @var string FROM
*/
public $from;
/**
* @var string field
*/
public $field;
/**
* @var string WHERE
*/
public $where;

30
htdocs/install/mysql/migration/10.0.0-11.0.0.sql
View File

@ -328,3 +328,33 @@ create table llx_fichinterdet_rec
ALTER TABLE llx_supplier_proposaldet ADD COLUMN date_start datetime DEFAULT NULL AFTER product_type;
ALTER TABLE llx_supplier_proposaldet ADD COLUMN date_end datetime DEFAULT NULL AFTER date_start;
--List of parcels details related to an expedition
create table llx_expedition_package
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_expedition integer NOT NULL,
description varchar(255), --Description of goods in the package (required by the custom)
value double(24,8) DEFAULT 0,--Value (Price of the content, for insurance & custom)
fk_parcel_type integer, -- Type or package, linked to llx_c_shipment_parcel_type (eg: 1=enveloppe, 2=package, 3=palette, 4=other)
height float, -- height
width float, -- width
size float, -- depth
size_units integer, -- unit of all sizes (height, width, depth)
weight float, -- weight
weight_units integer, -- unit of weight
dangerous_goods smallint DEFAULT 0, -- 0 = no dangerous goods or 1 = Explosives, 2 = Flammable Gases, 3 = Flammable Liquids, 4 = Flammable solids, 5 = Oxidizing, 6 = Toxic & Infectious, 7 = Radioactive, 8 = Corrosives, 9 = Miscellaneous (see https://en.wikipedia.org/wiki/Dangerous_goods). I'm not sure if just register 0 (no) or 1 (yes) is enough.
tail_lift smallint DEFAULT 0, -- 0 = no tail lift required to load/unload package(s), 1 = a tail lift is required to load/unload package(s). Sometime tail lift load can be different than tail lift delivery so maybe adding a new table line.
rang integer DEFAULT 0
)ENGINE=innodb;
--Dictionary of package type
create table llx_c_shipment_package_type
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
label varchar(50) NOT NULL, -- Short name
description varchar(255), -- Description
active integer DEFAULT 1 NOT NULL, -- Active or not
entity integer DEFAULT 1 NOT NULL -- Multi company id
)ENGINE=innodb;

9
htdocs/install/mysql/tables/llx_c_shipment_package_type Normal file
View File

@ -0,0 +1,9 @@
--Dictionary of package type
create table llx_c_shipment_package_type
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
label varchar(50) NOT NULL, -- Short name
description varchar(255), -- Description
active integer DEFAULT 1 NOT NULL, -- Active or not
entity integer DEFAULT 1 NOT NULL -- Multi company id
)ENGINE=innodb;

18
htdocs/install/mysql/tables/llx_expedition_package.sql Normal file
View File

@ -0,0 +1,18 @@
--List of parcels details related to an expedition
create table llx_expedition_package
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_expedition integer NOT NULL,
description varchar(255), --Description of goods in the package (required by the custom)
value double(24,8) DEFAULT 0,--Value (Price of the content, for insurance & custom)
fk_package_type integer, -- Type or package, linked to llx_c_shipment_parcel_type (eg: 1=enveloppe, 2=package, 3=palette, 4=other)
height float, -- height
width float, -- width
size float, -- depth
size_units integer, -- unit of all sizes (height, width, depth)
weight float, -- weight
weight_units integer, -- unit of weight
dangerous_goods smallint DEFAULT 0, -- 0 = no dangerous goods or 1 = Explosives, 2 = Flammable Gases, 3 = Flammable Liquids, 4 = Flammable solids, 5 = Oxidizing, 6 = Toxic & Infectious, 7 = Radioactive, 8 = Corrosives, 9 = Miscellaneous (see https://en.wikipedia.org/wiki/Dangerous_goods). I'm not sure if just register 0 (no) or 1 (yes) is enough.
tail_lift smallint DEFAULT 0, -- 0 = no tail lift required to load/unload package(s), 1 = a tail lift is required to load/unload package(s). Sometime tail lift load can be different than tail lift delivery so maybe adding a new table line.
rang integer DEFAULT 0
)ENGINE=innodb;