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 2016-02-20 02:45:43 +01:00
commit f15e06f623
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal/class/propal.class.php
View File

@ -1413,8 +1413,8 @@ class Propal extends CommonObject
$line->fk_product_type = $objp->fk_product_type; $line->fk_product_type = $objp->fk_product_type;
$line->fk_unit = $objp->fk_unit; $line->fk_unit = $objp->fk_unit;
$line->date_start = $objp->date_start; $line->date_start = $this->db->jdate($objp->date_start);
$line->date_end = $objp->date_end; $line->date_end = $this->db->jdate($objp->date_end);
// Multicurrency // Multicurrency

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

@ -21,7 +21,7 @@
-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
ALTER TABLE llx_product ADD COLUMN model_pdf varchar(255) default '';
CREATE TABLE llx_categorie_user CREATE TABLE llx_categorie_user
( (

1
htdocs/install/mysql/tables/llx_product.sql
View File

@ -81,6 +81,7 @@ create table llx_product
finished tinyint DEFAULT NULL, -- 1=manufactured product, 0=matiere premiere finished tinyint DEFAULT NULL, -- 1=manufactured product, 0=matiere premiere
hidden tinyint DEFAULT 0, -- Not used. Deprecated. hidden tinyint DEFAULT 0, -- Not used. Deprecated.
import_key varchar(14), -- Import key import_key varchar(14), -- Import key
model_pdf varchar(255), -- model save dodument used
fk_price_expression integer, -- Link to the rule for dynamic price calculation fk_price_expression integer, -- Link to the rule for dynamic price calculation
desiredstock integer DEFAULT 0, desiredstock integer DEFAULT 0,
fk_unit integer DEFAULT NULL, fk_unit integer DEFAULT NULL,