lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,928 Commits 43 Branches 150 Tags 886 MiB
13.0.2
Commit Graph

82696 Commits

Author SHA1 Message Date
Laurent Destailleur
d80f23589d Fix missing entry 2021-02-10 02:39:58 +01:00
Laurent Destailleur
29100a4766 FIX #16221 2021-02-10 02:28:22 +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
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Laurent Destailleur
afeeb40e2e Fix show property "enabled" of extrafields 2021-02-10 00:18:00 +01:00
Laurent Destailleur
92a1235066 Fix summary of report 2021-02-09 23:34:42 +01:00
Laurent Destailleur
6ceaa02abe Fix total in summary section was empty for income. 2021-02-09 23:08:59 +01:00
Laurent Destailleur
3a9cf8eb7a FIX: ODT generation very slow 2021-02-09 22:02:48 +01:00
Laurent Destailleur
032503f397 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/main.inc.php
 2021-02-09 21:13:54 +01:00
Laurent Destailleur
9c535d6d7e Fix comment in js must be a js comment 2021-02-09 21:09:46 +01:00
Laurent Destailleur
0e2c27d795 Fix javascript error 2021-02-09 21:06:11 +01:00
Laurent Destailleur
e1af57f540 FIX status late on purchase orders 2021-02-09 20:46:17 +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
ptibogxiv
e5f6a64846
FIX update order by api 
fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)
 2021-02-09 19:24:36 +01:00
Laurent Destailleur
eae232da50 Fix sql error 2021-02-09 19:16:26 +01:00
Laurent Destailleur
fdc2a88fc0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-09 18:30:47 +01:00
Laurent Destailleur
e2d1813451 Fix column title wrapped 2021-02-09 18:30:34 +01:00
Laurent Destailleur
1f441deb5d
Merge pull request #16237 from AlexisLaurier/13.0 
13.0 - Fix db begin() not closed into commande.class.php
 2021-02-09 18:06:36 +01:00
Frédéric FRANCE
07668167f6
Update card.php 2021-02-09 15:18:07 +01:00
Frédéric FRANCE
8d13e9231f
remove debug 2021-02-09 15:05:32 +01:00
Frédéric FRANCE
71a2c20d4b
massaction validate invoice do not regenerate pdf 2021-02-09 14:32:04 +01:00
LAURIER Alexis
abf2875eba
commande.class.php - move db->begin() into cloture 
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
 2021-02-09 14:25:45 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES 
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
 2021-02-09 13:39:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement 
12 fix error assignement
 2021-02-09 13:22:57 +01:00
Laurent Destailleur
8acc5e1486 Fix calculation of profit 2021-02-08 23:37:32 +01:00
Laurent Destailleur
9453caa5be Avoid message when not required 2021-02-08 22:12:12 +01:00
Florian HENRY
6bcb63c53d fix indent 2021-02-08 20:46:59 +01:00
Florian HENRY
ff6b5c768d fix indent 2021-02-08 20:46:21 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Laurent Destailleur
6df6286688 Fix IMAP_FORCE_NORSH and option for imap without ssl 2021-02-08 19:21:32 +01:00
Laurent Destailleur
6e6b5973b8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-08 17:35:44 +01:00
Laurent Destailleur
8b3c872f2a Fix warning 2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning 
FIX: warning when adding a line if $remise_percent is an empty string
 2021-02-08 17:34:29 +01:00
Laurent Destailleur
d073e809e7 FIX removed no more used proc update_modified_column_date_m on pgsql 2021-02-08 17:32:36 +01:00
Laurent Destailleur
9a9686ed6c
Merge pull request #16222 from WascarDev/13.0 
FIX #16143
 2021-02-08 17:31:27 +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
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
78052e3239 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:24 +01:00
Laurent Destailleur
a143635f53 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:17 +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
Adrien Jussak
ee1a4ee54f FIX #16143 
Remove the function update_modified_column_date_m is required because old triggers can throw errors during PDF generation
 2021-02-08 16:47:46 +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
lmarcouiller
a140625a8a Fix search by statut in list of holiday module 2021-02-08 15:03:58 +01:00
Laurent Destailleur
b04c342939 FIX #16215 2021-02-08 15:00:57 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +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
21d3519d42 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-07 20:13:38 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems 
Conflicts:
	htdocs/core/lib/company.lib.php
 2021-02-07 19:47:33 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Laurent Destailleur
536ddd4832 Fix look and feel v13 2021-02-07 17:54:20 +01:00
Laurent Destailleur
f62b4c15e8 Fix bad html 2021-02-07 17:32:54 +01:00
Florian HENRY
fcb5b3900d FIX: #16189, fix download/see check deposit PDF 2021-02-06 12:39:40 +01:00
Laurent Destailleur
4411497112 FIX #16156 2021-02-06 12:27:27 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
d8a33b46de Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-06 01:08:46 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
d8c262691b
Merge pull request #16175 from nicolas-eoxia/12_fix_missing_hook 
fix: add missing hook addMoreActionsButtons in viewcat.php
 2021-02-06 00:43:52 +01:00
Laurent Destailleur
bee0849290 Fix when nothing found, we should show message nothing found 2021-02-06 00:42:53 +01:00
Laurent Destailleur
c15deff817 FIX #16185 2021-02-06 00:30:44 +01:00
werewolf7160
83f24e6fd2 call to createCommon() return int and not bool 
with generated Object, the post request call to createCommon() in it and taht function return a int (id or -1 if error).
but the test on the returned value is a '!', that don't return false on "-1".
a post request with an sql error for example(foreign key error for my test), will always return 200 instead of 500 with the error
 2021-02-06 00:21:53 +01:00
Laurent Destailleur
f823ee019a
Merge pull request #16181 from ptibogxiv/patch-411 
FIX takepos : load date function
 2021-02-06 00:19:38 +01:00
Laurent Destailleur
7b35192476 Fix bad label 2021-02-06 00:15:07 +01:00
ptibogxiv
4477578766
FIX takepos : load date function 
fix loading dol_get_first_hour()
 2021-02-05 17:30:41 +01:00
Laurent Destailleur
9843e79bac Trans 2021-02-05 15:43:03 +01:00
Laurent Destailleur
653fa38b06 Fix autoselect of category with 'auto' 2021-02-05 15:12:12 +01:00
Laurent Destailleur
dbfeba661d Fix value show 0 if empty 2021-02-05 14:53:57 +01:00
Laurent Destailleur
e9fa5a647d Fix import 2021-02-05 14:35:10 +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
Nicolas
cdd2c165ef add missing hook addMoreActionsButtons in viewcat.php 2021-02-05 11:36:12 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Francis Appels
1b55935577 Add critical price patch from 12 to 11. 2021-02-05 10:39:46 +01:00
Laurent Destailleur
3006cf770c FIX Timeout during import 2021-02-05 01:06:59 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
8cbd9fc0d8 CSS 2021-02-04 19:48:57 +01:00
Laurent Destailleur
95c75f8ba8 Fix css 2021-02-04 19:17:57 +01:00
Laurent Destailleur
a6b08b241f Doc 2021-02-04 17:13:00 +01:00
Laurent Destailleur
f92dcf71ac Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-04 13:04:57 +01:00
Laurent Destailleur
b58b3a4932 FIX link to create event when task is in a project with a thirdparty 2021-02-04 13:03:05 +01:00
Laurent Destailleur
524b28d8c3 Fix missing tab info on holiday 2021-02-04 12:15:31 +01:00
Laurent Destailleur
284042af7a FIX User creation of expense report not visible 2021-02-04 12:05:28 +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
c3b409df31 Fix do not use CURDATE() 2021-02-03 23:18:44 +01:00
Laurent Destailleur
e89cc08ffa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-03 23:04:50 +01:00
Laurent Destailleur
91c594a66a Fix syntax error 2021-02-03 23:03:47 +01:00
Laurent Destailleur
d608a46c95 Fix dates 2021-02-03 22:47:35 +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
041decaf93 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:39 +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
3c3294c07c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-03 20:42:58 +01:00
Laurent Destailleur
9ac2dc1a6e Fix phpcs 2021-02-03 20:42:30 +01:00
Laurent Destailleur
2576973dc3
Merge pull request #16140 from OPEN-DSI/v11-fix-model-mail-selected 
FIX select default mail template
 2021-02-03 20:26:40 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn 
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
 2021-02-03 20:24:44 +01:00
Laurent Destailleur
c16ed62ada
Merge pull request #16149 from ptibogxiv/patch-410 
FIX cash fence for takepos with multientity
 2021-02-03 19:57:21 +01:00
Laurent Destailleur
3798892fd3 FIX Hide/Unhide external ICSS calendars 2021-02-03 19:53:28 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
c9e232f2ff Try to fix import/export timeout by dynamic increase 2021-02-03 18:00:27 +01:00
Laurent Destailleur
92942870dc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-02-03 17:12:44 +01:00
Laurent Destailleur
8b6de8fe26 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 17:09:56 +01:00
Laurent Destailleur
6ab723e85c Fix bad path of include 2021-02-03 17:09:26 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
Laurent Destailleur
bf2defbef4 More complete log 2021-02-03 12:04:28 +01:00
ptibogxiv
3132877349
FIX cash fence for takepos with multientity 2021-02-02 23:09:23 +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
3021c22198 Clean files 2021-02-02 13:49:03 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +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
7ff5cd50c3 Fix responsive 2021-02-02 11:41:32 +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
kamel
506ba822e9 FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql 2021-02-02 11:06:01 +01:00
Laurent Destailleur
95e255747f Fix accent on graph of expense report 2021-02-02 10:53:59 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
Laurent Destailleur
2f6a8c85c2 Doc 2021-02-02 10:25:57 +01:00
Laurent Destailleur
f4f9a7c461 Clean page of info tools 2021-02-02 09:44:51 +01:00
Laurent Destailleur
01b7b7692d Prepare 13.0.1 2021-02-02 03:22:54 +01:00
Laurent Destailleur
9a057386aa Fix look and feel 2021-02-02 02:38:02 +01:00
Laurent Destailleur
53014486d3 Fix default fields 2021-02-02 02:24:21 +01:00
Laurent Destailleur
f5df3b1d69 Clean code to try to fix #16123 2021-02-02 01:30:23 +01:00
Laurent Destailleur
a19eec7791 FIX #16135 2021-02-02 00:41:44 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
7ffa9c6d99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-01-31 19:11:34 +01:00
Laurent Destailleur
99ccfee9ed
Merge pull request #16120 from pvma/12.0 
Fix/FIX: Show missing notification in Event in user dashboard if assigned by others
 2021-01-31 19:07:59 +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
Laurent Destailleur
188ed6984f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-01-31 18:54:32 +01:00
Laurent Destailleur
08aa3eac00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 18:54:19 +01:00
Laurent Destailleur
9ef5f26624
Merge pull request #14022 from OPEN-DSI/fix_supplier_order_dispatching 
FIX: Fix detect dispatched product and set to received completely when the supplier order have services
 2021-01-31 18:51:57 +01:00
Paul Vincent M. Ancajas
d80709a7b9 Fix/FIX: making sure the return agenda is only specific to user 2021-02-01 01:41:19 +08:00
Laurent Destailleur
758d91b4a3
Merge pull request #16087 from ATM-Consulting/fix/11.0_required_extrafields_of_type_sellist_not_properly_checked 
FIX 11.0 - mandatory extrafields of type sellist
 2021-01-31 18:18:05 +01:00
Laurent Destailleur
f461bccc02 Fix var not defined 2021-01-31 17:06:42 +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
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
stickler-ci
726e0ceff0 Fixing style errors. 2021-01-31 08:16:59 +00:00
Paul Vincent M. Ancajas
80714d8d6d Fix/FIX: Show notification in Event box of user in his dashboard if assigned by others 2021-01-31 16:09:35 +08:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
58dec39f94 Fix start and end month for turnover report. 2021-01-30 17:07:13 +01:00
Laurent Destailleur
215752a93c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 14:04:14 +01:00
Laurent Destailleur
aa4956caef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 13:57:53 +01:00
Laurent Destailleur
ca7738c9b3 FIX #16107 2021-01-30 13:57:42 +01:00
Laurent Destailleur
2b59a20ce1
Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe 
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
 2021-01-30 13:22:00 +01:00
Laurent Destailleur
96aa0b946d
Merge pull request #16106 from fappels/13_fix_create_mo 
FIX: 13 create MO, Column 'tms' cannot be null
 2021-01-30 12:59:07 +01:00
Laurent Destailleur
1063b97c22 Close #16099 Close #16098 2021-01-30 12:55:38 +01:00
Laurent Destailleur
6db7a840bc
Merge pull request #16103 from bb2a/patch-1 
Bug Photo in propal
 2021-01-30 12:50:56 +01:00
Francis Appels
2436e7c5b2 FIX: 13 create MO, Column 'tms' cannot be null 2021-01-29 19:39:50 +01:00
atm-lena
cfca26a727 Fix fix 2021-01-29 16:20:43 +01:00
Laurent Destailleur
215e36bb2e Fix typo 2021-01-29 11:19:33 +01:00
Anthony Berton
77b0075d71
Update pdf_azur.modules.php 2021-01-29 10:50:11 +01:00
Alexandre SPANGARO
413fc95f9a FIX: Accountancy - label_operation is used instead of label_compte 2021-01-28 23:40:15 +01:00
Laurent Destailleur
086b23f66c Fix responsive 2021-01-28 23:29:49 +01:00
Laurent Destailleur
83dc1e8cd0 Fix responsive 2021-01-28 23:27:29 +01:00
Laurent Destailleur
6ed3a1c227 Fix idempotencey make stripe payment fails 2021-01-28 23:18:10 +01:00
Laurent Destailleur
62622a2065 Fix: It was no more possible to create paymentintent for offline payment 2021-01-28 23:16:24 +01:00
Laurent Destailleur
848b4db509 Fix regression: It was not more possible to create payment offline 2021-01-28 23:13:43 +01:00
Laurent Destailleur
1a52eb5ffa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 19:52:17 +01:00
Laurent Destailleur
099fcd7e4e Fix test email 
Conflicts:
	htdocs/admin/mails.php
 2021-01-28 19:51:54 +01:00
Laurent Destailleur
1764d3528b Fix test email 2021-01-28 19:45:52 +01:00
Laurent Destailleur
4c3dc6be1b Fix can't use the link button twice. 2021-01-28 19:38:06 +01:00
Laurent Destailleur
32c33b72d6 FIX Sql error in group by with postgresql 2021-01-28 16:10:13 +01:00
Laurent Destailleur
745e2be678 FIX encoding status in graph of vendor proposals 2021-01-28 16:00:22 +01:00
Laurent Destailleur
f3c33be871 Fix css 2021-01-28 15:47:32 +01:00
Laurent Destailleur
d3c94a0edb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2021-01-28 14:21:48 +01:00
Laurent Destailleur
33964c659e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 14:14:14 +01:00
Laurent Destailleur
d637bbd7e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 14:14:03 +01:00
Laurent Destailleur
c63a124d1c More complete fix 2021-01-28 14:13:29 +01:00
Juanjo Menent
2f98d8035c Fix: Bad supplier price updater 2021-01-28 13:37:43 +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
0b393676e6 Fix group by 2021-01-28 09:30:01 +01:00
Laurent Destailleur
ba3e902292 FIX #16080 2021-01-28 09:25:58 +01:00
Laurent Destailleur
3fe8be5dab Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-28 09:09:08 +01:00
Laurent Destailleur
b488bca020 FIX 16084 2021-01-28 08:53:13 +01:00
Laurent Destailleur
79c68c6132 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/commande/stats/index.php
 2021-01-28 00:23:44 +01:00
Laurent Destailleur
19a5caf212 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2021-01-28 00:18:35 +01:00
Laurent Destailleur
2be157c91f Trans 2021-01-28 00:18:11 +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
6097e3a14f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-27 21:05:53 +01:00
Laurent Destailleur
77c2753051 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-27 21:05:45 +01:00
Laurent Destailleur
76fb64e8fe Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-27 21:05:17 +01:00
Laurent Destailleur
dd70bee773 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-27 21:05:09 +01:00
Laurent Destailleur
b50728d4fb FIX #16076 2021-01-27 21:04:48 +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
8bc639fe02 Fix too many logs 2021-01-26 16:10:27 +01:00
Laurent Destailleur
b3d2d50a0c Fix delete aliases 2021-01-26 13:57:56 +01:00
Laurent Destailleur
c0426b866f Fix loop 2021-01-26 13:40:38 +01:00
Laurent Destailleur
aa2d581b41 Fix rename of alias 2021-01-26 13:38:41 +01:00
Laurent Destailleur
26c22e1b28 Fix warning 2021-01-26 13:22:20 +01:00
Laurent Destailleur
a1147319d2 Fix countAll 2021-01-26 13:11:10 +01:00
Laurent Destailleur
02098bf37b Fix default 2021-01-26 12:43:23 +01:00
Florian Mortgat
35448e3307 FIX 11.0: when a new intervention is created from an object, a new $extrafields object is instantiated but not initialized 
Because of this, missing mandatory extrafields are not checked and no extrafields are inserted
 2021-01-26 12:42:04 +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
Alexandre SPANGARO
7670a4f76c Missing file language & uniformize 2021-01-26 04:46:09 +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
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
Laurent Destailleur
8bbf6ce577
Merge pull request #16045 from aspangaro/13a30 
FIX: Accountancy - Search_not_reconciled
 2021-01-24 15:20:58 +01:00
Laurent Destailleur
97aba6d767
Merge pull request #16052 from ptibogxiv/patch-405 
Fix stripe Payment method delete
 2021-01-24 15:20:04 +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
0203965fbf Fix typo 2021-01-24 13:29:26 +01:00
Laurent Destailleur
c5bbaffb50 Fix look and feel v13 2021-01-23 19:50:04 +01:00
ptibogxiv
ae2b61d5ef
Fix stripe off_session set/unset 2021-01-23 18:49:11 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
f7e637a552 Trans 2021-01-23 17:40:14 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Laurent Destailleur
791f5f3f62 Fix css 2021-01-23 13:50:06 +01:00
ptibogxiv
89219a37a6
Fix stripe Payment method delete 2021-01-23 13:24:00 +01:00
Laurent Destailleur
9b6b1e055c Fix trans 2021-01-23 12:20:18 +01:00
Laurent Destailleur
86e853f27d Look and feel v12 2021-01-23 12:18:07 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Alexandre SPANGARO
77a43c51f9 FIX: Accountancy - Search_not_reconciled 2021-01-22 15:10:23 +01:00
Laurent Destailleur
7e8d06e8b8 Fix update default contact type 2021-01-22 14:10:08 +01:00
Laurent Destailleur
93ca27d808 FIX #16041 2021-01-22 13:17:27 +01:00
Laurent Destailleur
ad2f5ea7c1 Update website template 2021-01-22 12:39:59 +01:00
Laurent Destailleur
242a0a54be Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-22 10:52:07 +01:00
Laurent Destailleur
cf11f356e8 Fix load of data are not complete 2021-01-22 10:51:47 +01:00
Laurent Destailleur
641e2d9906
Merge pull request #16042 from aspangaro/13a29 
Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero
 2021-01-22 02:20:16 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
b25f65c995 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/info.php
 2021-01-22 01:09:35 +01:00
Laurent Destailleur
5aba1f9ccd FIX missing socid into link to create event from project agenda tab 2021-01-22 01:07:45 +01:00
Alexandre SPANGARO
0598656be7 FIX: Accountancy - Search_not_reconciled 2021-01-21 21:23:31 +01:00
Alexandre SPANGARO
939f27deed Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero 2021-01-21 20:55:46 +01:00
Laurent Destailleur
8076d47b8a FIX #15980 2021-01-21 19:08:03 +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
0e684abceb
Merge pull request #16039 from ATM-Consulting/fix/12.0_ticket_extrafields_of_type_date_are_not_saved 
FIX 12.0 - ticket extrafields of type 'date' are not saved
 2021-01-21 18:27:36 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
BlackMirror
a55d23f363 [FM] FIX - ticket extrafields of type 'date' are not saved 2021-01-21 15:55:52 +01:00
Laurent Destailleur
039cb0685b Fix default filter 2021-01-21 14:43:57 +01:00
Laurent Destailleur
c3ad443200 Fix var not defined 2021-01-21 13:52:23 +01:00
Laurent Destailleur
69479584ed Fix $ok is not used 2021-01-21 13:50:31 +01:00
Laurent Destailleur
d1af419d02 More log to debug payment errors 2021-01-21 11:50:15 +01:00
BlackMirror
640cf50b7f [FM] Fix 12.0 - duplicate label, probably mistaken for ref 2021-01-20 15:20:50 +01:00
Laurent Destailleur
79308b332b Trans 2021-01-20 11:41:17 +01:00
Laurent Destailleur
803ae91136 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-19 16:20:19 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
560d401cff Code comment 2021-01-19 15:54:24 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
 2021-01-19 10:59:42 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Florian HENRY
3194bea832 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-18 19:24:43 +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
lmarcouiller
21141f0788 Fix #16010 update fournisseur.product.class.php 2021-01-18 19:18:10 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Florian HENRY
6b61545189 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fix_autofill_date_payment 2021-01-18 19:07:30 +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
a109dd8948 Fix removed unexpected values in stats graph 
Conflicts:
	htdocs/projet/graph_opportunities.inc.php
 2021-01-18 13:55:11 +01:00
Laurent Destailleur
b46d1fa6a1 Fix removed unexpected values in stats graph 2021-01-18 13:51:35 +01:00
Laurent Destailleur
512745920a css 2021-01-18 13:47:29 +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
Frederick Jost Zweig
267caf7ac8 Added 'US-BASE' and 'CA-ENG-BASE' to models list 
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
 2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500 Removed 'pcg_subtype' column 
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
 2021-01-18 02:22:16 +01:00
Laurent Destailleur
350d4638da Prepare v13 2021-01-17 18:50:50 +01:00
Laurent Destailleur
47b90ab400 Fix duplicate log 2021-01-17 12:49:37 +01:00
Laurent Destailleur
cdab7041c4 Fix duplicate log 2021-01-17 12:49:01 +01:00
Laurent Destailleur
e3335b5b2c Fix bad class 2021-01-17 12:21:27 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
10ee98c452 Fix tooltip 2021-01-17 12:02:15 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
314cc45c81 Fix message 2021-01-17 11:24:24 +01:00
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/card.php
 2021-01-16 19:09:46 +01:00
Laurent Destailleur
440f923b01
Merge pull request #15983 from zuiko/patch-2 
Fix #15820 Bug: Unable to edit the pricing in Sales Order
 2021-01-16 18:34:41 +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
1d5182adf0
Merge pull request #15973 from frederic34/patch-10 
missing default value
 2021-01-16 17:27:33 +01:00
Laurent Destailleur
9426512eaf Fix for #15988 2021-01-16 17:21:52 +01:00
Frédéric FRANCE
3c2bf5d9e9 fix trans 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-01-16 17:18:58 +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
992645c13d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 16:35:13 +01:00