Laurent Destailleur
|
409b73fe2c
|
FIX #15582
|
2020-12-02 15:16:04 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
de98ef1718
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2020-11-29 20:57:43 +01:00 |
|
Laurent Destailleur
|
d45fe6c17f
|
FIx #15551
|
2020-11-29 20:39:39 +01:00 |
|
Laurent Destailleur
|
fab9b3d50c
|
Fix warning
|
2020-11-28 18:34:13 +01:00 |
|
Laurent Destailleur
|
e1a6e8f2fc
|
CSS
Security: Add param to fight against Clickjacking attacks
|
2020-11-26 11:29:16 +01:00 |
|
Florian HENRY
|
12ef03f06d
|
fix banck tranfert supplier
|
2020-11-25 10:58:34 +01:00 |
|
Laurent Destailleur
|
47cfdb4ef2
|
Prepare database to be ready for a future fix on sessions
|
2020-11-24 11:38:05 +01:00 |
|
Laurent Destailleur
|
9004be1df2
|
Debug feature to send remind by email
|
2020-11-21 17:42:07 +01:00 |
|
Laurent Destailleur
|
32ae1bf350
|
Sync transifex
|
2020-11-18 15:56:06 +01:00 |
|
Laurent Destailleur
|
b71cd0edea
|
Merge pull request #15378 from orebd/debug_ticket
Fix some tickets issue
|
2020-11-13 09:58:57 +01:00 |
|
Laurent Destailleur
|
6d4d3c618d
|
FIX #15369 and standardize permission "readall"
|
2020-11-13 09:55:53 +01:00 |
|
Aurélien
|
d9d32524f7
|
Fix #14460
|
2020-11-13 00:36:25 +01:00 |
|
Laurent Destailleur
|
7be3a2267e
|
Add missing vat rates
|
2020-11-12 22:23:21 +01:00 |
|
Laurent Destailleur
|
42ea51be49
|
Fix migration
|
2020-11-11 07:43:45 +01:00 |
|
Laurent Destailleur
|
19b82047f0
|
Fix sql
|
2020-10-27 10:00:35 +01:00 |
|
Laurent Destailleur
|
07729ec431
|
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery
fix migration livraison to delivery
|
2020-10-26 19:28:59 +01:00 |
|
Laurent Destailleur
|
0abce469e9
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-26 19:09:08 +01:00 |
|
Laurent Destailleur
|
f18a13b2d4
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/product/class/productcustomerprice.class.php
|
2020-10-26 19:08:11 +01:00 |
|
Laurent Destailleur
|
3ee618d736
|
FIX Clean orphan records in llx_ecm_files into repair script.
|
2020-10-26 18:31:12 +01:00 |
|
Florian HENRY
|
949be12e19
|
fix migration livraison to delivery
|
2020-10-25 17:26:15 +01:00 |
|
Laurent Destailleur
|
8578a7cd7c
|
Fix regressions
|
2020-10-25 17:02:25 +01:00 |
|
Laurent Destailleur
|
cd4d738a56
|
Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
|
2020-10-25 16:01:18 +01:00 |
|
Laurent Destailleur
|
64b1a31e45
|
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
NEW : Nature of product is now a dictionay
|
2020-10-15 21:07:42 +02:00 |
|
Florian HENRY
|
a0d1e96bfd
|
fix table creation for intracom and change reserved name column name
|
2020-10-15 11:37:44 +02:00 |
|
Florian HENRY
|
0597768ea8
|
fix review
|
2020-10-15 08:28:38 +02:00 |
|
Florian HENRY
|
940d478aec
|
UI and db OK
|
2020-10-14 15:54:48 +02:00 |
|
Florian HENRY
|
77de8c242c
|
commit add table
|
2020-10-14 12:24:35 +02:00 |
|
Laurent Destailleur
|
035325152f
|
Fix migration
|
2020-10-13 15:02:05 +02:00 |
|
Laurent Destailleur
|
726fd1b631
|
Merge pull request #11227 from aspangaro/10.0_intracommreport
NEW module Intracomm report
|
2020-10-12 13:35:58 +02:00 |
|
Laurent Destailleur
|
45e2a6409e
|
Missing field
|
2020-10-12 11:30:53 +02:00 |
|
Laurent Destailleur
|
b36b9170b2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-10 15:45:22 +02:00 |
|
Laurent Destailleur
|
437eead694
|
Fix bad permission
|
2020-10-10 15:45:04 +02:00 |
|
Alexandre SPANGARO
|
8876457b54
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-10-10 06:47:05 +02:00 |
|
Francis Appels
|
4fb83a0dd6
|
Fix migration
|
2020-10-09 15:35:09 +02:00 |
|
Alexandre SPANGARO
|
ca7ad35342
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-10-09 06:39:42 +02:00 |
|
Aurélien
|
3daf530a92
|
Revert "update dependencies migration12->13.sql #14697"
This reverts commit 5fa481422a.
|
2020-10-08 18:52:17 +02:00 |
|
Aurélien
|
b6283c1a5d
|
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
|
2020-10-08 16:19:10 +02:00 |
|
Aurélien
|
5fa481422a
|
update dependencies migration12->13.sql #14697
|
2020-10-08 15:56:44 +02:00 |
|
Regis Houssin
|
111f73bd86
|
FIX add default value of timestamp for avoid error
|
2020-10-08 12:29:01 +02:00 |
|
Laurent Destailleur
|
4674eda45a
|
Standardize columns comment
|
2020-10-08 10:13:44 +02:00 |
|
Aurélien
|
9c02390066
|
fix migration12->13.sql #14697
fix drop constraint
fix error on update extrafields
|
2020-10-07 21:50:54 +02:00 |
|
Aurélien
|
16e076d182
|
fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697
|
2020-10-07 20:54:56 +02:00 |
|
AurelienBinard
|
39d538befc
|
Merge branch 'develop' into translateModLivraison2ModDelivery
|
2020-10-06 16:20:25 +02:00 |
|
Aurélien
|
d103a9aede
|
rename table on migration #14697
|
2020-10-06 14:35:27 +02:00 |
|
Aurélien
|
140200213e
|
change table into DB and ref #14697
|
2020-10-06 11:04:31 +02:00 |
|
Alexandre SPANGARO
|
d83d9895e0
|
NEW Vat report - Invert constant to show by default zero vat in reports
|
2020-10-05 20:52:31 +02:00 |
|
Laurent Destailleur
|
1c34868028
|
Fix field must be null because there is no numbering ref module yet
|
2020-10-03 11:16:31 +02:00 |
|
Laurent Destailleur
|
c2fed95dc4
|
FIX #14877
|
2020-10-02 19:54:06 +02:00 |
|
Frédéric FRANCE
|
7afb62c55d
|
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
|
2020-10-02 00:24:48 +02:00 |
|