Commit Graph

22788 Commits

Author SHA1 Message Date
Laurent Destailleur
4f2e7c51fc Fix #16129 autodetect language on public pages 2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6 FIX #16129 2021-02-10 03:12:19 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
667963094f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-10 02:17:14 +01:00
Laurent Destailleur
c875ad9a1c FIX #16240 2021-02-10 02:17:01 +01:00
Laurent Destailleur
2c30680157
Merge pull request #16244 from AlexisLaurier/13.0
fix regression of #16118 - entity not check on object in checkUserAccessToObject
2021-02-10 01:25:19 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
LAURIER Alexis
0ae0eb5758
fix regression of #16118 - entity not check
Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.
2021-02-09 20:13:13 +01:00
Frédéric FRANCE
71a2c20d4b
massaction validate invoice do not regenerate pdf 2021-02-09 14:32:04 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
2021-02-08 17:25:05 +01:00
Laurent Destailleur
25823d7b90
Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY
Add hidden conf to display supplier in object lines
2021-02-08 16:58:28 +01:00
Laurent Destailleur
fe9d23e90b Update functions.lib.php 2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05 Update functions.lib.php 2021-02-08 15:10:07 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Laurent Destailleur
8f4bd10a8d
Merge pull request #16190 from FHenry/13_fix_checkdeposit_pdf_folder
FIX: #16189, fix download/see check deposit PDF
2021-02-07 21:34:18 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems
Conflicts:
	htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Florian HENRY
fcb5b3900d FIX: #16189, fix download/see check deposit PDF 2021-02-06 12:39:40 +01:00
Laurent Destailleur
653fa38b06 Fix autoselect of category with 'auto' 2021-02-05 15:12:12 +01:00
Laurent Destailleur
ac83cea83a Fix avoid to run import twice by clicking on tab step6
Fix timeout for real import step
2021-02-05 14:34:04 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
a6b08b241f Doc 2021-02-04 17:13:00 +01:00
Laurent Destailleur
524b28d8c3 Fix missing tab info on holiday 2021-02-04 12:15:31 +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
atm-lena
c5f73ec12a Resolve ret 2021-02-04 10:42:42 +01:00
Laurent Destailleur
787e03a10d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-02-03 20:46:22 +01:00
Laurent Destailleur
4bba124c3f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
bd9eb4c949 FIX Assignement of actors on tasks 2021-02-02 15:36:54 +01:00
Laurent Destailleur
6b32fd33fd Fix export with excell 2021-02-02 13:33:44 +01:00
Laurent Destailleur
85357a34c8 Fix style of injected combo to select variant 2021-02-02 13:12:12 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
Laurent Destailleur
1fd2f12673 Fix responsive 2021-02-02 11:16:25 +01:00
Laurent Destailleur
218a76ee63 FIX SQL Error with postgres or mysql strict mode 2021-02-02 11:06:58 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
Laurent Destailleur
f5df3b1d69 Clean code to try to fix #16123 2021-02-02 01:30:23 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
3801dd34cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2021-01-31 19:02:57 +01:00
Laurent Destailleur
d023afb66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-31 18:55:11 +01:00
Regis Houssin
5217a38359 FIX use post instead get 2021-01-31 12:51:13 +01:00
Regis Houssin
74795b87e5 FIX avoid undefined url and missing token 2021-01-31 12:46:54 +01:00
Laurent Destailleur
ca7738c9b3 FIX #16107 2021-01-30 13:57:42 +01:00
Laurent Destailleur
1063b97c22 Close #16099 Close #16098 2021-01-30 12:55:38 +01:00
Anthony Berton
77b0075d71
Update pdf_azur.modules.php 2021-01-29 10:50:11 +01:00
Laurent Destailleur
cf4a12d715 FIX Missing language ico
Conflicts:
	htdocs/core/lib/functions.lib.php
2021-01-28 12:04:04 +01:00
Laurent Destailleur
9d0945bbe2 FIX #16077 2021-01-28 10:30:09 +01:00
Laurent Destailleur
f462e353e9 FIX #16079 2021-01-28 09:59:13 +01:00
Laurent Destailleur
b488bca020 FIX 16084 2021-01-28 08:53:13 +01:00
Florian Mortgat
8dfe39258b FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion 2021-01-27 23:46:09 +01:00
Laurent Destailleur
3e4a9b1bfc
Merge pull request #16070 from aspangaro/13p3
Fix: Fa-icon on stock movement
2021-01-27 19:24:31 +01:00
Laurent Destailleur
7b41e0d60c
Merge pull request #16069 from aspangaro/13p2
Fix language & translation
2021-01-27 19:23:40 +01:00
Laurent Destailleur
8f8349c671
Merge pull request #16066 from frederic34/patch-1
fix include
2021-01-27 19:21:12 +01:00
Laurent Destailleur
aa2d581b41 Fix rename of alias 2021-01-26 13:38:41 +01:00
Laurent Destailleur
977e4dde86 Fix regression 2021-01-26 12:08:54 +01:00
Laurent Destailleur
8db80ff44d Fix reponsive 2021-01-26 11:19:13 +01:00
Alexandre SPANGARO
0ef02880eb Fix: Fa-icon on movement 2021-01-26 08:54:21 +01:00
Alexandre SPANGARO
94d4f2da8e Missing language key & error translation 2021-01-26 05:14:01 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias
Conflicts:
	test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Frédéric FRANCE
22522f5aa2
fix include 2021-01-25 17:06:25 +01:00
Laurent Destailleur
c5cda97c19 FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:34:29 +01:00
Laurent Destailleur
d9908efdef Code comment 2021-01-24 13:29:38 +01:00
Laurent Destailleur
c5bbaffb50 Fix look and feel v13 2021-01-23 19:50:04 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
791f5f3f62 Fix css 2021-01-23 13:50:06 +01:00
Laurent Destailleur
7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
2021-01-21 18:34:55 +01:00
Laurent Destailleur
69479584ed Fix $ok is not used 2021-01-21 13:50:31 +01:00
BlackMirror
640cf50b7f [FM] Fix 12.0 - duplicate label, probably mistaken for ref 2021-01-20 15:20:50 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Laurent Destailleur
6d251e6a43
Merge pull request #15963 from FHenry/13.0
fix thirdparty list filter type_ent can be empty
2021-01-18 19:21:58 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0
extrafeild selllist can be use with string fk
2021-01-18 18:53:01 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend
FIX : missing GETPOST parameters on card_presend.tpl.php
2021-01-18 18:49:28 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Florian HENRY
58eeb7152b Merge branch '12.0' into 13.0 2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
1cd0f71c09 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Florian HENRY
014d3cc114 better fix 2021-01-18 09:08:54 +01:00
Florian HENRY
1eec6fbb8f Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-18 09:05:12 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php 2021-01-16 18:34:25 +01:00
Laurent Destailleur
506d809712 FIX #15991 2021-01-16 17:50:02 +01:00
Laurent Destailleur
f2488a399e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 17:13:54 +01:00
Laurent Destailleur
ab1e49ab20
Merge pull request #15986 from aspangaro/13a27
Optimize select_auxaccount
2021-01-16 16:59:20 +01:00
Laurent Destailleur
8c8ffa3daf Fix default limit 2021-01-16 16:56:49 +01:00
Laurent Destailleur
de6f6c9b5d Update functions.lib.php 2021-01-16 16:51:47 +01:00
zuiko
32b5aa7790 Update functions.lib.php
Fix #15820
function price2num
add underscore and - in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.

I don't know if other characters have to be added to this pattern.
2021-01-16 16:51:27 +01:00
Laurent Destailleur
892bd432e4 Fix crop of image on invoices. 2021-01-16 15:35:15 +01:00
Laurent Destailleur
b3d7783a29 Fix multicompany compatibility of preview of file in email form 2021-01-16 13:41:27 +01:00
Laurent Destailleur
d36c406074 Code comment 2021-01-15 19:24:53 +01:00
Laurent Destailleur
80ed651c5e Fix GETPOST 2021-01-15 19:23:56 +01:00
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +01:00
Laurent Destailleur
0e636031ba Add option
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:07:00 +01:00
kevin
fb14f7c0b8 Modify GETPOST parameters to match with v12 2021-01-15 14:40:55 +01:00
Alexandre SPANGARO
0904212c0b Better works 2021-01-15 14:19:41 +01:00
Florian HENRY
cd62c9ed6d Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-15 08:11:30 +01:00
Alexandre SPANGARO
e812c200c5 Optimize select_auxaccount 2021-01-15 03:37:17 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
zuiko
fd5948f716
Update functions.lib.php
Fix #15820
Fix #15820
function price2num
add underscore in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
it seems that some constantes use also "-" so I added it in the pattern.
I don't know if other characters have to be added to this pattern.
2021-01-14 15:00:53 +01:00
zuiko
727751e0c1
Update functions.lib.php
Fix #15820
function price2num
add underscore in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
I don't know if other characters have to be added to this pattern.
2021-01-14 14:44:32 +01:00
Laurent Destailleur
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Florian HENRY
1cc88794b5 merge from 12.0 because this bug comme from it 2021-01-12 21:48:34 +01:00
Florian HENRY
34b792e9a2 betterfix 2021-01-12 21:44:18 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Florian HENRY
f30b303269 Merge branch '12.0' into 13.0 2021-01-12 17:45:54 +01:00
Florian HENRY
5b21702508 extrafeild selllist can be use with string fk 2021-01-12 17:44:22 +01:00
Laurent Destailleur
2e9f3b803d Add some hooks to add new buttons (compensation of removal of tabs).
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
2021-01-12 13:59:20 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Laurent Destailleur
f6de607889 Fix warning 2021-01-11 16:07:02 +01:00
Laurent Destailleur
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
b3461161ec Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH 2021-01-09 02:28:50 +01:00
Laurent Destailleur
2794327e10 Update box_birthdays.php 2021-01-07 12:50:14 +01:00
Lars Wallenborn
1880e51d1c [FIX] sort order in birthday box
The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
2021-01-07 12:50:07 +01:00
Laurent Destailleur
a498f8dfe1 Fix sort by day 2021-01-07 12:49:54 +01:00
Laurent Destailleur
3399ab2c5d Fix phpcs 2021-01-07 10:20:41 +01:00
Maxime Kohlhaas
1b7d194e18 Finish fix on add form values 2021-01-07 09:03:25 +01:00
Laurent Destailleur
8918299364
Update commonfields_add.tpl.php 2021-01-06 21:24:37 +01:00
Maxime Kohlhaas
42e45d4a7a Fix date and datetime type in commonfield_add.tpl 2021-01-06 21:14:40 +01:00
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/societe/card.php
2021-01-06 20:51:44 +01:00
Laurent Destailleur
123bd81721 Trim no more required 2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b FIX #15892 #15017 2021-01-06 20:41:40 +01:00
Laurent Destailleur
679948e207
Merge pull request #15893 from atm-lena/FIX_issue_15629
FIX #15629
2021-01-06 20:34:31 +01:00
Laurent Destailleur
71278b173e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2021-01-06 20:27:46 +01:00
Laurent Destailleur
9e50a06f2b
Merge pull request #15894 from atm-john/11.0_fix_issue_14833
Fix #14833 A security mecanism generates data loss
2021-01-06 20:26:19 +01:00
Laurent Destailleur
a955df21bf
Merge pull request #15905 from atm-quentin/FIX/issue_14501
FIX useless tracking number displayed on pdf if empty issue #14501
2021-01-06 20:22:43 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
2021-01-06 20:20:37 +01:00
Laurent Destailleur
17306bc715 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_shipments.php
2021-01-06 20:12:09 +01:00
Laurent Destailleur
7372a18283
Update box_shipments.php 2021-01-06 19:56:49 +01:00
stickler-ci
ca557cfacd Fixing style errors. 2021-01-06 13:22:35 +00:00
quentin
e44b14364a FIX useless tracking number displayed on pdf if empty 2021-01-06 14:17:06 +01:00
ATM john
50b5226d10 FIX #15465 External user sees last 5 shipments to other customers in the dashboard 2021-01-06 12:40:38 +01:00
ATM john
92a4314779 Fix security mecanism generating data loss 2021-01-06 10:45:54 +01:00
atm-lena
6f15683709 FIX create ticket : thirdparty/contact notification #15629 2021-01-06 10:42:48 +01:00
Laurent Destailleur
4b45c5e723 Trans 2021-01-05 12:29:13 +01:00
Laurent Destailleur
40645ea24d Fix load lang 2021-01-05 10:39:53 +01:00
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Laurent Destailleur
e488f94af3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 15:39:48 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
4d09d3a576
Merge pull request #15860 from fappels/13_debug_shipments
Some debug on Shipments and reception.
2021-01-04 14:06:52 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
5c104e344c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Laurent Destailleur
66bd040d2c Fix regression 2021-01-04 12:08:14 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php 2021-01-04 12:02:41 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3 Fix dict contact type element list 2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Laurent Destailleur
f462f68056 Code comment 2021-01-03 15:10:33 +01:00
Francis Appels
ade0e008e9 Some debug on Shipments.
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
2021-01-02 17:42:33 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Laurent Destailleur
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae Fix warning 2020-12-28 12:30:59 +01:00
Laurent Destailleur
4ec78d029b Fix warning 2020-12-27 19:21:37 +01:00
Laurent Destailleur
a0440fbe88 Removed warnings 2020-12-24 03:06:52 +01:00
Laurent Destailleur
5ef3ffbdc6 Fix warning 2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Laurent Destailleur
3586da75a2 Fix warning 2020-12-24 02:52:49 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
1c73d38093 Fix api to download for shipments 2020-12-23 19:16:15 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
2020-12-23 15:45:33 +01:00
Laurent Destailleur
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications
simplify notications class
2020-12-21 18:14:04 +01:00
Laurent Destailleur
88837df442
Merge pull request #15790 from frederic34/fixphpcs_2020_12
fix phpcs
2020-12-21 18:10:01 +01:00
Laurent Destailleur
dfb632f2d5 Fix phpunit 2020-12-21 17:56:31 +01:00
Laurent Destailleur
4bc0b46556 css 2020-12-21 17:33:57 +01:00
Laurent Destailleur
14223d74bd Fix css 2020-12-21 15:00:29 +01:00
Laurent Destailleur
7d0e71165a Clean code 2020-12-21 14:40:27 +01:00
Laurent Destailleur
6937ab75fa Fix test 2020-12-21 02:31:19 +01:00
Laurent Destailleur
0a19f3cf5b css 2020-12-21 02:27:05 +01:00
Laurent Destailleur
5dc6f5b89f Prepare 13.0 2020-12-21 01:33:06 +01:00
Laurent Destailleur
0a1387e673 Debug v13 2020-12-20 18:41:54 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Laurent Destailleur
361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Frédéric FRANCE
b7b35f4cd4
simplify notications class 2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab Fix buttond not working 2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d Fix API to get country 2020-12-19 22:34:33 +01:00
Laurent Destailleur
ef4a816c56 CSS 2020-12-19 15:56:21 +01:00
Laurent Destailleur
b6bb08ec2e Fix management of hreflang 2020-12-19 13:44:15 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00