Commit Graph

93914 Commits

Author SHA1 Message Date
Laurent Destailleur
cab0e0ee05 Prepare 13.0.2 2021-03-12 12:45:45 +01:00
Laurent Destailleur
9956373a14 Backport the log to detect module that claim a new token. 2021-03-12 12:42:26 +01:00
Laurent Destailleur
9a13ebfdb8 Fix look and feel v13 2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
Laurent Destailleur
28f54eeb75 Fix translation 2021-03-09 19:55:47 +01:00
Laurent Destailleur
67f5837072 Fix permission to create a holiday when advanced permissions are set 2021-03-09 19:51:11 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
2021-03-08 19:27:34 +01:00
Laurent Destailleur
bada3afebb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-08 19:18:26 +01:00
Laurent Destailleur
28c04a684f Fix position of field 2021-03-08 19:09:02 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation
FIX : Add "Now" link on social charges creation card
2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating
FIX : Rounding amount on social charges card updating
2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Laurent Destailleur
5c7685c1b8
Merge pull request #16581 from frederic34/patch-7
Do not return specimen if searching empty string value
2021-03-08 16:29:04 +01:00
Laurent Destailleur
870e0e77de
Merge pull request #16579 from ptibogxiv/patch-417
Fix get thirdparties by barcode or email
2021-03-08 16:23:38 +01:00
Laurent Destailleur
3b9f38caa1
Update api_thirdparties.class.php 2021-03-08 16:22:26 +01:00
Laurent Destailleur
77b60d4d1c
Update api_thirdparties.class.php 2021-03-08 16:20:15 +01:00
Laurent Destailleur
263605a11f
Merge pull request #16578 from frederic34/patch-4
fix usage of else if
2021-03-08 16:04:37 +01:00
Laurent Destailleur
fe7fa49b37
Merge pull request #16583 from ksar-ksar/13.0
FIX : #16341 : Fetch the Product ExtraFields in Shippment lines
2021-03-08 16:03:40 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
ksar
ec8baa6bff Update commondocgenerator.class.php
#16341
2021-03-08 10:00:19 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Laurent Destailleur
142f878633 Fix look and feel v13 2021-03-07 18:56:16 +01:00
Laurent Destailleur
b28a757530 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-07 18:41:24 +01:00
Laurent Destailleur
4666c7f090 Fix responsive 2021-03-07 18:41:07 +01:00
ptibogxiv
4834f5fdf4
Fix get thirdparties by barcode or email 2021-03-07 17:32:43 +01:00
Frédéric FRANCE
fee5bbf65b
fix usage of else if 2021-03-07 09:12:46 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0
fix: set class attribute at right place
2021-03-06 11:18:02 +01:00
Laurent Destailleur
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5
Fix #16544
2021-03-06 11:09:58 +01:00
Laurent Destailleur
3ce8d09053
Merge pull request #16564 from frederic34/patch-7
fix typo
2021-03-06 10:41:05 +01:00
Frédéric FRANCE
7e5330496b
fis tyo 2021-03-05 22:50:28 +01:00
Laurent Destailleur
f328e08bd9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-03-05 18:30:19 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Laurent Destailleur
3cfcad284b Fix unsubscribe to MLs 2021-03-05 17:48:55 +01:00
Laurent Destailleur
1cd822bd75 Fix DOS attack on emailings wrappers 2021-03-05 14:54:17 +01:00
Frédéric FRANCE
7543b63a6e
Fix #16544 2021-03-05 08:49:56 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0
avoid warning into modulebuilder
2021-03-04 16:52:47 +01:00
Laurent Destailleur
672a07fdac
Merge pull request #16535 from atm-greg/Fix_attach_files_when_models_are_available
Fix : if mailmodels exist in database attached files are always cleared
2021-03-04 16:45:00 +01:00
Laurent Destailleur
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Laurent Destailleur
98eb0fc969 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
Laurent Destailleur
5553bae3a1 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:44:01 +01:00