Commit Graph

2410 Commits

Author SHA1 Message Date
Laurent Destailleur
a18995d3dc Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-08-22 10:47:47 +02:00
Laurent Destailleur
f694939fc7 Fix migration with pgsql 2017-06-19 19:39:37 +02:00
Laurent Destailleur
5439390461 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42 Fix migration opensurvey 2017-06-19 02:55:33 +02:00
Laurent Destailleur
0cad938e09 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/install/upgrade.php
2016-01-02 12:19:49 +01:00
Laurent Destailleur
b46aec8e7e Fix to allow phpunit of migration process for 3.5 to 3.6 2016-01-02 12:18:26 +01:00
Laurent Destailleur
35ce670bf2 Fix to allow phpunit of migration process for 3.4 to 3.5 2016-01-02 12:18:12 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Florian HENRY
bb0de1dcad FIX : update2.php test res befre assign it 2015-09-29 15:00:11 +02:00
josemariagomezroncero
e146af3118 Update llx_c_type_resource.sql
Error create table, missing incremet type element
2015-08-11 22:38:21 +02:00
Laurent Destailleur
f4da53c300 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/product/liste.php
	htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Marcos García de La Fuente
0335892521 FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 2015-06-12 18:31:49 +02:00
Regis Houssin
de0dd5da60 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:14:46 +02:00
Laurent Destailleur
b57f0a0e5f Fix option to use old path for product is for compatibility if user come
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
2015-06-05 18:32:49 +02:00
Regis Houssin
e78dba809b Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
2015-06-05 09:42:21 +02:00
Laurent Destailleur
19694710b2 Keep this constant visible 2015-05-31 12:24:23 +02:00
Juanjo Menent
d65721bb20 Insert option to use old system storage photos only if the first
installation was done with a version < 3.7.0
2015-05-13 20:34:57 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old
instances
-Update changelog for 3.7.1
2015-04-27 20:22:03 +02:00
Laurent Destailleur
d47b9a759a FIX migration error 2015-04-24 00:33:02 +02:00
Maxime Kohlhaas
7223495ac2 Fix : date_delivery was not a datetime 2015-04-18 04:21:16 +02:00
Laurent Destailleur
74a4bca42c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok.
Works for canada and ivory cost.
2015-04-11 22:51:53 +02:00
Laurent Destailleur
10f967e07a FIX #2519 2015-04-02 11:11:03 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Laurent Destailleur
87da1d734e mysql 5.5.41 is still bugged returning "lost connexion" during migration
but there is no more data loss so we can allow this version. A database
upgrade to 5.6 will be required if this occurs.
2015-03-22 12:13:26 +01:00
Laurent Destailleur
eeb09b83a1 The test on db version must not lock the phpunit 2015-03-20 20:50:46 +01:00
Laurent Destailleur
0784e9638a The test on db version must not lock the phpunit 2015-03-20 17:57:40 +01:00
Laurent Destailleur
b0e928c213 Disable migration with bugged versions 2015-03-20 15:26:00 +01:00
Laurent Destailleur
37c216cfe4 Fix limit for very slow os. 2015-03-17 15:43:11 +01:00
Laurent Destailleur
60c72e13b3 Some fixes into export and translation 2015-03-15 23:39:53 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +01:00
Laurent Destailleur
9842e816d0 Fix bad sql type
Fix no input outside tr-td
2015-02-24 11:24:15 +01:00
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-02-18 23:15:40 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Laurent Destailleur
118ae7e8f8 Backport fix done into dev. 2015-02-16 17:55:53 +01:00
Laurent Destailleur
2045fb22e9 Lock 5.5.40 2015-02-15 23:39:30 +01:00
Laurent Destailleur
7cf115cc87 Introduce a protection to avoid migration if database has critical bugs
making data lost.
2015-02-14 12:26:39 +01:00
Laurent Destailleur
c596fa1475 Introduce a protection to avoid migration if database has critical bugs
making data lost.
2015-02-14 12:24:16 +01:00
Gauthier
be56f76743 FIX : Display error on dispatched quantity when we have several times same product in a supplier order 2015-02-12 12:56:21 +01:00
Juanjo Menent
2389e332db Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:28:27 +01:00
Juanjo Menent
2fd38f310a Increase size of localtaxX (10 is not enough in some cases) 2015-02-02 21:06:21 +01:00
Laurent Destailleur
720caf8e31 Missing XPF currency 2015-01-31 12:19:06 +01:00
Laurent Destailleur
da9f13bca9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration.
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
19dbf7e2c6 Merge pull request #2185 from marcosgdf/bug-1765
Fix: [ bug #1765 ] Unable to create a contract
2015-01-18 12:39:25 +01:00