Frédéric FRANCE
|
2085ac73e7
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:34:58 +02:00 |
|
Laurent Destailleur
|
8e113888d8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 17:02:27 +02:00 |
|
Laurent Destailleur
|
64f72daa7e
|
Fix hreflang if canonical page
|
2020-05-23 17:01:22 +02:00 |
|
Francis Appels
|
efa4ffa326
|
Fix ref_int deprecation.
Add to changelog and allow to use ref_ext for shipments.
|
2020-05-23 16:46:42 +02:00 |
|
Laurent Destailleur
|
051e009c47
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 15:50:25 +02:00 |
|
Laurent Destailleur
|
748a120b71
|
Show button for categories if module is enabled
|
2020-05-23 15:50:15 +02:00 |
|
Laurent Destailleur
|
bf0327952b
|
Merge pull request #13875 from ptibogxiv/patch-339
NEW Date shipment from order accepts hours
|
2020-05-23 15:42:24 +02:00 |
|
Laurent Destailleur
|
9b54ed766b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 15:37:08 +02:00 |
|
Laurent Destailleur
|
aec5200a98
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/variants/class/ProductCombination.class.php
|
2020-05-23 15:37:00 +02:00 |
|
Laurent Destailleur
|
7c92bb218e
|
Fix no hreflang if not a canonical page
|
2020-05-23 15:33:04 +02:00 |
|
Laurent Destailleur
|
4913d10724
|
Merge branch 'develop' into patch-339
|
2020-05-23 15:14:06 +02:00 |
|
Laurent Destailleur
|
d8d5907aff
|
Merge pull request #13939 from grandoc/develop
Fix : some comment and translation
|
2020-05-23 15:11:32 +02:00 |
|
Laurent Destailleur
|
697d4d684e
|
Merge pull request #13899 from andreubisquerra/master
TakePOS Auto Order improvements
|
2020-05-23 15:11:01 +02:00 |
|
Laurent Destailleur
|
394ea5075f
|
Merge pull request #13823 from aspangaro/12.0_a25
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
|
2020-05-23 15:07:27 +02:00 |
|
Laurent Destailleur
|
c2b2e17b58
|
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl
NEW conf to allow show full arbo in warehouse getnomurl
|
2020-05-23 15:05:08 +02:00 |
|
Laurent Destailleur
|
5bbbabf653
|
Update stocks.lang
|
2020-05-23 15:04:59 +02:00 |
|
Laurent Destailleur
|
abe7472ee5
|
Update stocks.lang
|
2020-05-23 15:03:57 +02:00 |
|
Philippe Grand
|
af17781b2b
|
fix : personnal font file within tcpdf
|
2020-05-23 15:01:40 +02:00 |
|
Philippe Grand
|
6c15ff2ac1
|
fix : personnal font file within tcpdf
|
2020-05-23 15:01:25 +02:00 |
|
Philippe Grand
|
d80afa7536
|
fix : personnal font file within tcpdf
|
2020-05-23 15:01:08 +02:00 |
|
Philippe Grand
|
f49374c72d
|
fix : personnal font file within tcpdf
|
2020-05-23 15:00:48 +02:00 |
|
Philippe Grand
|
20898d783a
|
fix : personnal font file within tcpdf
|
2020-05-23 15:00:30 +02:00 |
|
Philippe Grand
|
b1e7085857
|
fix : personnal font file within tcpdf
|
2020-05-23 15:00:11 +02:00 |
|
Laurent Destailleur
|
b4ceb2e97e
|
Update entrepot.class.php
|
2020-05-23 15:00:06 +02:00 |
|
Philippe Grand
|
462b043efc
|
fix : personnal font file within tcpdf
|
2020-05-23 14:59:52 +02:00 |
|
Philippe Grand
|
c9c5dc4ebe
|
fix : personnal font file within tcpdf
|
2020-05-23 14:59:30 +02:00 |
|
Philippe Grand
|
60f1bcfb70
|
fix : personnal font file within tcpdf
|
2020-05-23 14:59:06 +02:00 |
|
Laurent Destailleur
|
263bfda8bd
|
Merge pull request #13916 from altatof/tracking
NEW : add tracking number in list and search_all items
|
2020-05-23 14:58:45 +02:00 |
|
Laurent Destailleur
|
4004aeb257
|
Merge pull request #13915 from atm-quentin/Fix_missing_getnomurl_warehouse_hook
FIX missing GetNomURL Hook in warehouse class
|
2020-05-23 14:57:28 +02:00 |
|
Laurent Destailleur
|
7d8323b0a7
|
Merge pull request #13920 from altatof/dispatch
NEW : edit or delete dispatched lines
|
2020-05-23 14:56:04 +02:00 |
|
Philippe Grand
|
19598bad8a
|
fix : personnal font file within tcpdf
|
2020-05-23 14:41:30 +02:00 |
|
Philippe Grand
|
471d86ff39
|
fix : personnal font file within tcpdf
|
2020-05-23 14:41:08 +02:00 |
|
Philippe Grand
|
76e32781a3
|
fix : personnal font file within tcpdf
|
2020-05-23 14:40:45 +02:00 |
|
Philippe Grand
|
51db2be3f4
|
fix : personnal font file within tcpdf
|
2020-05-23 14:39:56 +02:00 |
|
Philippe Grand
|
fdea4db671
|
fix : personnal font file within tcpdf
|
2020-05-23 14:39:18 +02:00 |
|
Laurent Destailleur
|
5f3a82423f
|
Fix regression in look and feel v12
|
2020-05-23 14:38:37 +02:00 |
|
Philippe Grand
|
0becc47b30
|
fix : personnal font file within tcpdf
|
2020-05-23 14:38:26 +02:00 |
|
Laurent Destailleur
|
fe1fcfbbae
|
Merge pull request #13945 from atm-maxime/fix_board_expensereport_toapprove
Fix board expense report to approve
|
2020-05-23 14:33:04 +02:00 |
|
Laurent Destailleur
|
b4223dbdec
|
Merge branch '12.0' into fix_board_expensereport_toapprove
|
2020-05-23 14:32:12 +02:00 |
|
Laurent Destailleur
|
4e3fbb9d05
|
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent
NEW mass-actions for the event list view
|
2020-05-23 14:26:51 +02:00 |
|
Laurent Destailleur
|
7397806ae7
|
Update actioncomm.class.php
|
2020-05-23 14:26:28 +02:00 |
|
Laurent Destailleur
|
b7fbda8d08
|
Merge pull request #13924 from atm-lena/11.0_AddHook_Massstockmove
Add Hook "Massstockmove"
|
2020-05-23 14:25:12 +02:00 |
|
Laurent Destailleur
|
1e6cc80438
|
Merge pull request #13923 from atm-gauthier/11.0_rename_bank_releve
FIX : We must only rename current bank receipt
|
2020-05-23 14:24:51 +02:00 |
|
Laurent Destailleur
|
e29d2588cf
|
Merge pull request #13931 from altatof/fixdispatch
FIX missing rollbacks on trigger bad return
|
2020-05-23 14:24:15 +02:00 |
|
Tobias Sekan
|
babcdfc99a
|
Fix not working default value (re...)
|
2020-05-23 14:22:40 +02:00 |
|
Tobias Sekan
|
58e32aa2ff
|
Fix not wokring default values for date (re...)
|
2020-05-23 14:22:30 +02:00 |
|
Laurent Destailleur
|
7463eb2bd0
|
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
FIX not working default date values for new invoices
|
2020-05-23 14:21:50 +02:00 |
|
Laurent Destailleur
|
475abbe24b
|
Merge pull request #13944 from atm-maxime/fix_board_expensereport
Fix board expensereport and holiday
|
2020-05-23 14:20:28 +02:00 |
|
Frédéric FRANCE
|
8b4dcbaa64
|
Update datapolicycron.class.php
|
2020-05-23 14:19:28 +02:00 |
|
Laurent Destailleur
|
d8250fdc75
|
Merge pull request #13934 from frederic34/patch-4
Update datapolicycron.class.php
|
2020-05-23 14:19:12 +02:00 |
|