Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
7540b705
Commit
7540b705
authored
13 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: add entity field in product price
parent
c3e245d2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
+1
-0
1 addition, 0 deletions
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
htdocs/install/mysql/tables/llx_product_price.sql
+18
-16
18 additions, 16 deletions
htdocs/install/mysql/tables/llx_product_price.sql
with
19 additions
and
16 deletions
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
+
1
−
0
View file @
7540b705
...
...
@@ -183,6 +183,7 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
insert
into
llx_c_chargesociales
(
id
,
libelle
,
deductible
,
active
,
code
,
fk_pays
)
values
(
13
,
'Cotisation sur la valeur ajoutée des entreprises'
,
0
,
1
,
'TAXCVAE'
,
'1'
);
ALTER
TABLE
llx_paiement
ADD
COLUMN
entity
integer
DEFAULT
1
NOT
NULL
AFTER
rowid
;
ALTER
TABLE
llx_product_price
ADD
COLUMN
entity
integer
DEFAULT
1
NOT
NULL
AFTER
rowid
;
-- Restore foreign key (on llx_expedition_methode before) on correct table (llx_c_shipment_mode)
ALTER
TABLE
llx_expedition
DROP
FOREIGN
KEY
fk_expedition_fk_expedition_methode
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/install/mysql/tables/llx_product_price.sql
+
18
−
16
View file @
7540b705
-- ============================================================================
-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
...
...
@@ -19,21 +20,22 @@
create
table
llx_product_price
(
rowid
integer
AUTO_INCREMENT
PRIMARY
KEY
,
tms
timestamp
,
fk_product
integer
NOT
NULL
,
date_price
datetime
NOT
NULL
,
price_level
smallint
NULL
DEFAULT
1
,
price
double
(
24
,
8
)
DEFAULT
NULL
,
price_ttc
double
(
24
,
8
)
DEFAULT
NULL
,
price_min
double
(
24
,
8
)
default
NULL
,
price_min_ttc
double
(
24
,
8
)
default
NULL
,
price_base_type
varchar
(
3
)
DEFAULT
'HT'
,
tva_tx
double
(
6
,
3
)
NOT
NULL
,
recuperableonly
integer
NOT
NULL
DEFAULT
'0'
,
localtax1_tx
double
(
6
,
3
)
DEFAULT
0
,
localtax2_tx
double
(
6
,
3
)
DEFAULT
0
,
fk_user_author
integer
,
tosell
tinyint
DEFAULT
1
rowid
integer
AUTO_INCREMENT
PRIMARY
KEY
,
entity
integer
DEFAULT
1
NOT
NULL
,
-- Multi company id
tms
timestamp
,
fk_product
integer
NOT
NULL
,
date_price
datetime
NOT
NULL
,
price_level
smallint
NULL
DEFAULT
1
,
price
double
(
24
,
8
)
DEFAULT
NULL
,
price_ttc
double
(
24
,
8
)
DEFAULT
NULL
,
price_min
double
(
24
,
8
)
default
NULL
,
price_min_ttc
double
(
24
,
8
)
default
NULL
,
price_base_type
varchar
(
3
)
DEFAULT
'HT'
,
tva_tx
double
(
6
,
3
)
NOT
NULL
,
recuperableonly
integer
NOT
NULL
DEFAULT
'0'
,
localtax1_tx
double
(
6
,
3
)
DEFAULT
0
,
localtax2_tx
double
(
6
,
3
)
DEFAULT
0
,
fk_user_author
integer
,
tosell
tinyint
DEFAULT
1
)
ENGINE
=
innodb
;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment