Laurent Destailleur
|
0dbb8224fb
|
Fix logo
|
2020-05-25 12:50:54 +02:00 |
|
Laurent Destailleur
|
9e77dc0a26
|
CSS
|
2020-05-25 12:50:29 +02:00 |
|
laurantines
|
962d795740
|
Update list.php
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
|
2020-05-25 12:26:05 +02:00 |
|
Laurent Destailleur
|
384e1e31ad
|
Fix Popup
|
2020-05-25 11:30:57 +02:00 |
|
Laurent Destailleur
|
c67eeeaf6c
|
CSS
|
2020-05-25 11:30:52 +02:00 |
|
Laurent Destailleur
|
a44f0d24eb
|
Fix Popup
|
2020-05-25 11:06:16 +02:00 |
|
Laurent Destailleur
|
61545703d1
|
CSS
|
2020-05-25 10:58:18 +02:00 |
|
Laurent Destailleur
|
2595f571c7
|
Fix exclude credit note when searching situation invoice to use for next
|
2020-05-25 00:21:09 +02:00 |
|
Laurent Destailleur
|
47465f4108
|
Fix for situation invoice (exclude credit not when searching last
invoice to use)
|
2020-05-25 00:20:00 +02:00 |
|
Laurent Destailleur
|
0041bca82f
|
Fix ambiguous param
|
2020-05-24 23:49:33 +02:00 |
|
Laurent Destailleur
|
6158e41822
|
CSS
|
2020-05-24 23:44:04 +02:00 |
|
Laurent Destailleur
|
aee6fce9f8
|
Fix remove bad use
|
2020-05-24 20:04:26 +02:00 |
|
andreubisquerra
|
d60bcb871f
|
Fix travis
|
2020-05-24 18:24:41 +02:00 |
|
Laurent Destailleur
|
84ec747109
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-24 18:04:26 +02:00 |
|
andreubisquerra
|
957c40e072
|
Fix travis
|
2020-05-24 18:03:07 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
andreubisquerra
|
3632111705
|
Fix travis
|
2020-05-24 17:29:35 +02:00 |
|
andreubisquerra
|
c80989d74f
|
phone.php improvements
|
2020-05-24 16:31:22 +02:00 |
|
andreubisquerra
|
221e8d8ce1
|
invoice.php improvements
|
2020-05-24 16:30:42 +02:00 |
|
andreubisquerra
|
26ee0d1949
|
genimg improvements
|
2020-05-24 16:29:42 +02:00 |
|
Laurent Destailleur
|
65708ec360
|
Fix responsive
|
2020-05-24 15:07:57 +02:00 |
|
Laurent Destailleur
|
dacb326c15
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-24 01:10:41 +02:00 |
|
Laurent Destailleur
|
509ce9f571
|
CSS
|
2020-05-24 01:09:45 +02:00 |
|
Laurent Destailleur
|
fd61214b97
|
Merge
|
2020-05-24 01:06:45 +02:00 |
|
Laurent Destailleur
|
4cb0ffeb1f
|
Fix css
|
2020-05-24 01:04:56 +02:00 |
|
Laurent Destailleur
|
6056ed2755
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-24 01:02:08 +02:00 |
|
Laurent Destailleur
|
ef17ed2f87
|
Look and feel v12
|
2020-05-24 00:01:52 +02:00 |
|
Laurent Destailleur
|
2b963479a8
|
Sync transifex
|
2020-05-23 23:50:00 +02:00 |
|
Laurent Destailleur
|
c843da5272
|
Sync transifex
|
2020-05-23 22:29:45 +02:00 |
|
Frédéric FRANCE
|
67b8ab13c9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 21:45:18 +02:00 |
|
Frédéric FRANCE
|
a7e0fe24ff
|
Merge remote-tracking branch 'upstream/develop' into free_email
|
2020-05-23 21:44:14 +02:00 |
|
Frédéric FRANCE
|
5c78eca68a
|
prepare new rule
|
2020-05-23 21:14:44 +02:00 |
|
Frédéric FRANCE
|
174ddc5fd4
|
prepare new rule
|
2020-05-23 21:07:47 +02:00 |
|
Laurent Destailleur
|
024e62a582
|
Fix navigation
|
2020-05-23 20:27:25 +02:00 |
|
Laurent Destailleur
|
7bfbf3c88b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:20:53 +02:00 |
|
Laurent Destailleur
|
fe6453194e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-05-23 20:18:17 +02:00 |
|
Laurent Destailleur
|
45ddde6940
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:18:10 +02:00 |
|
Laurent Destailleur
|
9fdd718c22
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 20:11:20 +02:00 |
|
Laurent Destailleur
|
40777cbcd9
|
Fix phpcs
|
2020-05-23 20:11:10 +02:00 |
|
Laurent Destailleur
|
97a4c32870
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-05-23 20:09:41 +02:00 |
|
Laurent Destailleur
|
127534ef55
|
Fix common var name seems to be $objref for subdir of doc
|
2020-05-23 20:09:31 +02:00 |
|
Laurent Destailleur
|
28bd962559
|
Merge pull request #13703 from frederic34/entrepotlibelle
remove deprecated libelle to fix phpunit
|
2020-05-23 19:25:04 +02:00 |
|
Laurent Destailleur
|
be641c3d09
|
Merge pull request #13914 from aspangaro/12.0_a27
NEW Add employee in expense report binding page
|
2020-05-23 19:23:20 +02:00 |
|
Laurent Destailleur
|
d6470519eb
|
Update list.php
|
2020-05-23 19:21:03 +02:00 |
|
Laurent Destailleur
|
1ed3b385fa
|
Update lines.php
|
2020-05-23 19:19:28 +02:00 |
|
Laurent Destailleur
|
558a441b41
|
Update lines.php
|
2020-05-23 19:18:13 +02:00 |
|
Laurent Destailleur
|
e086cdcf2a
|
Update lines.php
|
2020-05-23 19:17:09 +02:00 |
|
Laurent Destailleur
|
2ccd6c1e9a
|
Update lines.php
|
2020-05-23 19:16:37 +02:00 |
|
Laurent Destailleur
|
6c3a238981
|
Update lines.php
|
2020-05-23 19:14:33 +02:00 |
|
Laurent Destailleur
|
173662e98c
|
Update lines.php
|
2020-05-23 19:14:05 +02:00 |
|
Laurent Destailleur
|
b10976562f
|
Merge pull request #13958 from fappels/12_ref_int_deprication
Fix ref_int deprecation.
|
2020-05-23 19:12:21 +02:00 |
|
Frédéric FRANCE
|
6522bb70fd
|
fix merge
|
2020-05-23 19:06:01 +02:00 |
|
Frédéric FRANCE
|
48f12c8307
|
Merge remote-tracking branch 'origin/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:58:18 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
stickler-ci
|
66637ba0b6
|
Fixing style errors.
|
2020-05-23 16:39:06 +00:00 |
|
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
|
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 |
|
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 |
|
Frédéric FRANCE
|
3a93dcf2c4
|
Update paymentloan.class.php
same picto in loan
|
2020-05-23 14:18:47 +02:00 |
|
Laurent Destailleur
|
e2cdbf6cec
|
Merge pull request #13935 from frederic34/patch-6
Update paymentloan.class.php
|
2020-05-23 14:18:08 +02:00 |
|
Laurent Destailleur
|
1979647650
|
Merge pull request #13954 from fappels/12_fix_batch
Fix migration, missing batch update to varchar(128)
|
2020-05-23 13:54:12 +02:00 |
|
Laurent Destailleur
|
3a15688f17
|
FIX #13951
|
2020-05-23 13:53:47 +02:00 |
|
Laurent Destailleur
|
a9b5feb680
|
Merge branch 'develop' into keep_child_label_if_modified
|
2020-05-23 13:51:13 +02:00 |
|
Laurent Destailleur
|
726f86e73d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 13:49:22 +02:00 |
|
Laurent Destailleur
|
acaab1fd45
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 13:49:15 +02:00 |
|
Laurent Destailleur
|
83ecbef9bc
|
FIX #13911 #13940
|
2020-05-23 13:46:37 +02:00 |
|
Laurent Destailleur
|
493becde8b
|
Update list.php
|
2020-05-23 13:39:06 +02:00 |
|
Laurent Destailleur
|
15de6194c4
|
Update list.php
|
2020-05-23 13:38:59 +02:00 |
|
gael.langlais
|
af5de05a31
|
Change some curly braces #13929
|
2020-05-23 13:38:50 +02:00 |
|
Laurent Destailleur
|
4884dcd62e
|
Merge pull request #13950 from Langlais115/fix_some_curly_braces
Change some curly braces #13929
|
2020-05-23 13:37:56 +02:00 |
|
Laurent Destailleur
|
9e95342e2f
|
Update list.php
|
2020-05-23 13:36:39 +02:00 |
|
Laurent Destailleur
|
072d8c6222
|
Update list.php
|
2020-05-23 13:36:02 +02:00 |
|
Laurent Destailleur
|
b4fa56d07e
|
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices
FIX not working default values for payment on new invoices
|
2020-05-23 13:33:01 +02:00 |
|
Laurent Destailleur
|
d4b1485c97
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 13:11:30 +02:00 |
|
Laurent Destailleur
|
755c47f900
|
Fix save of wrapper missing
|
2020-05-23 13:10:33 +02:00 |
|
Laurent Destailleur
|
333ae9d496
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 12:58:18 +02:00 |
|
Laurent Destailleur
|
aff2872fc1
|
Fix RSS
|
2020-05-23 12:57:58 +02:00 |
|
Laurent Destailleur
|
50d063256e
|
NEW Povide a RSS Feed for blogposts
|
2020-05-23 12:54:06 +02:00 |
|
Laurent Destailleur
|
e947ddba10
|
Fix RSS feed
|
2020-05-23 12:51:44 +02:00 |
|
Laurent Destailleur
|
f2c02f5559
|
FIX Language for RSS
|
2020-05-23 12:41:06 +02:00 |
|
Francis Appels
|
875230ed13
|
Fix missing batch update to varchar(128)
|
2020-05-23 10:23:26 +02:00 |
|
stickler-ci
|
74662d3ecd
|
Fixing style errors.
|
2020-05-23 08:18:41 +00:00 |
|
Philippe Grand
|
e7c2bd830a
|
fix merge issue
|
2020-05-23 10:17:48 +02:00 |
|
Philippe Grand
|
b137775046
|
fix merge issue
|
2020-05-23 10:12:14 +02:00 |
|
Laurent Destailleur
|
c460cff01c
|
Fix calculation and add tooltip to understand it.
|
2020-05-23 01:17:01 +02:00 |
|
gael.langlais
|
dce93197d7
|
FIX #13908 keep child label if modified by user
|
2020-05-22 17:58:24 +02:00 |
|
gael.langlais
|
e349b9323f
|
Change some curly braces #13929
|
2020-05-22 17:42:06 +02:00 |
|
Frédéric FRANCE
|
70995d3499
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-22 15:03:09 +02:00 |
|
Laurent Destailleur
|
2f8b364454
|
Code comment
|
2020-05-22 13:18:47 +02:00 |
|
Frédéric FRANCE
|
0f4f727d18
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-22 08:27:12 +02:00 |
|
stickler-ci
|
2873f4dacf
|
Fixing style errors.
|
2020-05-22 06:08:12 +00:00 |
|
Tobias Sekan
|
53080be245
|
fix not working default values for payment
|
2020-05-22 08:01:29 +02:00 |
|
Tobias Sekan
|
d9a2d2b982
|
fix not working default values for payment
|
2020-05-22 08:00:26 +02:00 |
|
Laurent Destailleur
|
38c8ebd627
|
Add link into toolbar to create website tags
|
2020-05-22 01:01:27 +02:00 |
|
Laurent Destailleur
|
60f865fbb8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-22 00:58:27 +02:00 |
|
Laurent Destailleur
|
43103f40a5
|
Fix make page of categories of web site working
|
2020-05-22 00:55:34 +02:00 |
|
Laurent Destailleur
|
e81e4032f7
|
Fix make page of categories of web site working
|
2020-05-22 00:54:53 +02:00 |
|
Maxime Kohlhaas
|
6b1eef9827
|
Fix board exepense report to approve
|
2020-05-22 00:50:13 +02:00 |
|
Laurent Destailleur
|
5d78f6dac5
|
NEW Add link to edit property from search result of website pages
|
2020-05-22 00:38:01 +02:00 |
|
Maxime Kohlhaas
|
fb0f31c142
|
Fix board filters for expense report and holiday
|
2020-05-22 00:33:30 +02:00 |
|
Maxime Kohlhaas
|
6434f255c3
|
Fix load_state_board doesn't take parameters
|
2020-05-22 00:32:55 +02:00 |
|
Laurent Destailleur
|
76823d3e39
|
Clean CSS, clean code
|
2020-05-21 20:59:02 +02:00 |
|
Laurent Destailleur
|
9e295d44f0
|
Code comment
|
2020-05-21 17:14:42 +02:00 |
|
Frédéric FRANCE
|
726d7817c4
|
add new rule
|
2020-05-21 16:13:46 +02:00 |
|
Frédéric FRANCE
|
37202a54e9
|
add new rule
|
2020-05-21 16:04:52 +02:00 |
|