Laurent Destailleur
|
eee49b9132
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/delais.php
|
2021-02-04 13:50:07 +01:00 |
|
Laurent Destailleur
|
eca010937f
|
FIX Trigger on expense report was not fired
FIX Bad dates on info tabs
|
2021-02-04 11:56:53 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
3b8b0d59ba
|
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
|
2021-02-03 20:24:44 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +01:00 |
|
kamel
|
506ba822e9
|
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
|
2021-02-02 11:06:01 +01:00 |
|
Laurent Destailleur
|
2e9656a5b2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
|
2021-02-02 03:26:20 +01:00 |
|
Laurent Destailleur
|
a19eec7791
|
FIX #16135
|
2021-02-02 00:41:44 +01:00 |
|
Laurent Destailleur
|
b24aac1e6b
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
|
2021-01-31 12:03:39 +01:00 |
|
atm-lena
|
cfca26a727
|
Fix fix
|
2021-01-29 16:20:43 +01:00 |
|
atm-lena
|
e2696d7718
|
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
|
2021-01-15 09:58:04 +01:00 |
|
Frédéric FRANCE
|
8ad9c3dbe9
|
fix migration for icstransfert
|
2021-01-02 09:07:16 +01:00 |
|
Laurent Destailleur
|
b88ee6eff4
|
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
|
2021-01-01 21:36:15 +01:00 |
|
Laurent Destailleur
|
71e4a672f5
|
Merge branch 'develop' into develop_patch-1
|
2021-01-01 20:52:43 +01:00 |
|
Florian HENRY
|
806b40662f
|
merge develop
|
2020-12-28 21:15:25 +01:00 |
|
Laurent Destailleur
|
f8b179a1be
|
Merge pull request #15351 from frederic34/patch-13
separate ref and rowid in members
|
2020-12-27 15:18:55 +01:00 |
|
Laurent Destailleur
|
4c9a597c8a
|
Update 12.0.0-13.0.0.sql
|
2020-12-27 15:13:20 +01:00 |
|
Laurent Destailleur
|
1546805b9e
|
Merge pull request #15500 from frederic34/patch-10
NEW add db fields note_public note_private for ecm
|
2020-12-27 15:07:51 +01:00 |
|
Florian HENRY
|
5ae5f3e7ac
|
let societe project acctioncomme website accounr
|
2020-12-24 00:32:54 +01:00 |
|
Laurent Destailleur
|
0195c11437
|
Add missing field required for real funnel of prospection.
|
2020-12-21 12:58:03 +01:00 |
|
Frédéric FRANCE
|
1b75ac9ffe
|
add github
|
2020-12-12 21:17:18 +01:00 |
|
Laurent Destailleur
|
bfa8383bed
|
Fix migration script
|
2020-12-12 12:30:13 +01:00 |
|
Laurent Destailleur
|
33bb1919f0
|
Merge branch 'develop' into develop#3
|
2020-12-12 12:23:33 +01:00 |
|
Laurent Destailleur
|
4fa1248d15
|
Fix avoid duplicate rows after double migration
|
2020-12-11 16:53:03 +01:00 |
|
lmarcouiller
|
a5cf177025
|
Close #15729 : first push
|
2020-12-11 15:22:29 +01:00 |
|
Laurent Destailleur
|
0f2a8d0262
|
Fix timestamp field
|
2020-12-08 17:20:45 +01:00 |
|
Hystepik
|
2ac98d06f5
|
Merge branch 'develop' into develop#3
|
2020-12-07 09:03:59 +01:00 |
|
Frédéric FRANCE
|
a2eab824c1
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-12-04 20:42:22 +01:00 |
|
Frédéric FRANCE
|
914d2ae7f7
|
Merge remote-tracking branch 'upstream/develop' into patch-13
|
2020-12-04 20:40:35 +01:00 |
|
Laurent Destailleur
|
4ba31ae52e
|
Debug missing column packaging
|
2020-12-04 19:40:56 +01:00 |
|
Laurent Destailleur
|
210ccc4b43
|
FIX Missing very important performance indexes
|
2020-12-03 18:34:32 +01:00 |
|
lmarcouiller
|
e08f6aeb2b
|
Fix #15383
|
2020-12-03 11:00:29 +01:00 |
|
Hystepik
|
7fc050e3ce
|
Merge branch 'develop' into develop#3
|
2020-12-03 10:39:25 +01:00 |
|
Laurent Destailleur
|
56d5cd0402
|
Fix missing .php into name of boxes added into llx_boxes_def
|
2020-12-03 10:22:53 +01:00 |
|
Hystepik
|
ecb5a3b028
|
Merge branch 'develop' into develop#3
|
2020-12-03 10:12:19 +01:00 |
|
lmarcouiller
|
032116b235
|
changes to not diplay won and lost and add on migration
|
2020-12-03 10:11:16 +01:00 |
|
Laurent Destailleur
|
409b73fe2c
|
FIX #15582
|
2020-12-02 15:16:04 +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 |
|
Frédéric FRANCE
|
1704de39bb
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-11-27 11:18:04 +01:00 |
|
Frédéric FRANCE
|
9a2f945807
|
Merge remote-tracking branch 'upstream/develop' into patch-13
|
2020-11-27 11:15:10 +01:00 |
|
Laurent Destailleur
|
e1a6e8f2fc
|
CSS
Security: Add param to fight against Clickjacking attacks
|
2020-11-26 11:29:16 +01:00 |
|
Frédéric FRANCE
|
c09a6d1435
|
Merge remote-tracking branch 'upstream/develop' into patch-10
|
2020-11-25 12:59:32 +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 |
|
Frédéric FRANCE
|
2225ff0ba4
|
Update 12.0.0-13.0.0.sql
|
2020-11-23 23:59:37 +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 |
|