Laurent Destailleur
|
ff8d22a80d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:57:01 +02:00 |
|
Laurent Destailleur
|
82a8c42441
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-05-18 15:54:47 +02:00 |
|
Laurent Destailleur
|
9336828710
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
|
2020-05-18 15:54:39 +02:00 |
|
Laurent Destailleur
|
6d62e92e12
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-05-18 15:50:42 +02:00 |
|
Laurent Destailleur
|
45345440a4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:50:36 +02:00 |
|
Laurent Destailleur
|
756c1fd73d
|
Fix tooltip message
|
2020-05-18 15:26:04 +02:00 |
|
Laurent Destailleur
|
e29f4083e5
|
Merge pull request #13904 from atm-maxime/fix_merge_contactrole
Fix third merge issue with contact roles
|
2020-05-18 15:11:10 +02:00 |
|
Laurent Destailleur
|
40565cdf06
|
Merge pull request #13907 from ptibogxiv/patch-341
FIX php error if multicompany disabled
|
2020-05-18 15:07:55 +02:00 |
|
Laurent Destailleur
|
ca14f9a0fa
|
Merge pull request #13901 from atm-maxime/fix_cron_globals
Fix cron globals reload, missing mysoc and langs
|
2020-05-18 15:02:00 +02:00 |
|
Laurent Destailleur
|
18a19dafe5
|
Update cron_run_jobs.php
|
2020-05-18 15:01:29 +02:00 |
|
Laurent Destailleur
|
3d385dd378
|
Merge pull request #13903 from atm-maxime/fix_actioncomm_fetch_entity
Fix : entity was missing in actioncomm fetch
|
2020-05-18 14:59:10 +02:00 |
|
Laurent Destailleur
|
2d1f151fb2
|
Merge pull request #13905 from atm-maxime/fix_expedition_fetch_entity
Fix : entity was missing in expedition fetch
|
2020-05-18 14:58:57 +02:00 |
|
Laurent Destailleur
|
d3ac33ce20
|
Fix json-ld file
|
2020-05-18 14:53:35 +02:00 |
|
ptibogxiv
|
a9d1519f96
|
FIX php error if multicompany disabled
|
2020-05-18 14:52:33 +02:00 |
|
Laurent Destailleur
|
729cc4fd6f
|
Fix do not show full path
|
2020-05-18 13:26:33 +02:00 |
|
Maxime Kohlhaas
|
3d9d5d0ad5
|
Fix : entity was missing in expedition fetch
|
2020-05-18 11:03:32 +02:00 |
|
Maxime Kohlhaas
|
baa502a224
|
Fix third merge issue with contact roles
|
2020-05-18 10:54:25 +02:00 |
|
Maxime Kohlhaas
|
cf96383bf9
|
Fix : entity was missing in actioncomm fetch
|
2020-05-18 10:44:55 +02:00 |
|
Laurent Destailleur
|
02d4ecb21c
|
Fix url for youtube
|
2020-05-17 20:08:01 +02:00 |
|
Laurent Destailleur
|
9370f71d01
|
Fix hardcoded value
|
2020-05-17 20:03:56 +02:00 |
|
Laurent Destailleur
|
8a6ae84fb0
|
Fix getStructuredData for organization
|
2020-05-17 20:02:01 +02:00 |
|
Laurent Destailleur
|
6be60efaba
|
Fix bad link in json-ld
|
2020-05-17 19:09:22 +02:00 |
|
Laurent Destailleur
|
608d3ce32f
|
Responsive
|
2020-05-17 16:10:29 +02:00 |
|
Laurent Destailleur
|
106fe7bde6
|
Clean conflict between direct debit and direct credit orders.
|
2020-05-17 15:06:09 +02:00 |
|
Laurent Destailleur
|
af46108cc4
|
Look and feel v12
|
2020-05-17 13:34:16 +02:00 |
|
Maxime Kohlhaas
|
54af917afb
|
Fix cron globals reload, missing mysoc and langs
|
2020-05-16 20:13:47 +02:00 |
|
Laurent Destailleur
|
783b71a9da
|
Fix language set
|
2020-05-16 16:27:23 +02:00 |
|
Laurent Destailleur
|
ce0d00a0ae
|
CSS
|
2020-05-16 15:50:46 +02:00 |
|
Laurent Destailleur
|
bd4251237b
|
css
|
2020-05-16 15:16:40 +02:00 |
|
Laurent Destailleur
|
c85233e779
|
Fix CSS
|
2020-05-16 15:12:28 +02:00 |
|
Laurent Destailleur
|
0781e9e227
|
CSS
|
2020-05-16 14:47:12 +02:00 |
|
Laurent Destailleur
|
75ac377352
|
Fix tar command
|
2020-05-16 04:26:43 +02:00 |
|
Laurent Destailleur
|
24f4a0be1f
|
exclude other log files
|
2020-05-16 04:24:23 +02:00 |
|
Laurent Destailleur
|
791c4b48b6
|
Fix
|
2020-05-15 20:08:35 +02:00 |
|
Laurent Destailleur
|
8b79b7f074
|
Update changelog
|
2020-05-15 20:00:59 +02:00 |
|
Laurent Destailleur
|
ff84fd8118
|
Fix default language of user. Must separate weblangs and pagelangs.
|
2020-05-15 19:01:12 +02:00 |
|
Laurent Destailleur
|
a73eccf70d
|
FIX env of browser not loaded in website
|
2020-05-15 18:41:46 +02:00 |
|
Laurent Destailleur
|
762ca96203
|
FIX #13841
|
2020-05-15 18:28:15 +02:00 |
|
Laurent Destailleur
|
4a9960797b
|
responsive
|
2020-05-15 17:27:12 +02:00 |
|
Laurent Destailleur
|
9fb1766266
|
CSS
|
2020-05-15 17:14:28 +02:00 |
|
Laurent Destailleur
|
bfbe0037b6
|
Fix responsive
|
2020-05-15 16:29:18 +02:00 |
|
Laurent Destailleur
|
c43813ccbb
|
Fix responsive of edition of thirdparties
|
2020-05-15 16:23:24 +02:00 |
|
Laurent Destailleur
|
5fe9c45fb2
|
Fix look and feel v12
|
2020-05-15 16:07:39 +02:00 |
|
Laurent Destailleur
|
86ff60f161
|
Fix break line and set of opportunity fields
|
2020-05-15 15:50:50 +02:00 |
|
Laurent Destailleur
|
38059ab861
|
Fix trans
|
2020-05-15 15:17:37 +02:00 |
|
Laurent Destailleur
|
99db3a2991
|
Fix field for opportunities must be visible only if we use opportinities
|
2020-05-15 15:15:07 +02:00 |
|
Laurent Destailleur
|
895833effc
|
FIX #13864
|
2020-05-15 15:00:58 +02:00 |
|
Laurent Destailleur
|
b150edd6d0
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/societe/checkvat/checkVatPopup.php
|
2020-05-15 14:10:53 +02:00 |
|
Laurent Destailleur
|
ddf3f8b244
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-05-15 14:09:36 +02:00 |
|
Laurent Destailleur
|
d430b2896e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-05-15 14:09:26 +02:00 |
|