lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

93038 Commits

Author SHA1 Message Date
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
e47e3b9797 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-08 18:09:55 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Laurent Destailleur
af6e21910d FIX #19536 2021-12-08 16:47:46 +01:00
habot-it
6501bb7cbf
Update pdf.lib.php 2021-12-08 16:43:11 +01:00
Laurent Destailleur
449cbcdf46
Merge pull request #19546 from javieralapps4up/develop 
FIX When you pay an invoice, you can send the payment multiple times.
 2021-12-08 16:31:40 +01:00
Laurent Destailleur
e6a82ed9a5
Merge pull request #19539 from hregis/fix_compatibility_with_multicompany 
FIX compatibility with multicompany
 2021-12-08 16:28:33 +01:00
Laurent Destailleur
3baa9688b9
Merge pull request #19544 from FHenry/dev_error_return_hrm 
fix: HRM new module skills
 2021-12-08 16:17:45 +01:00
Laurent Destailleur
ea03019b54
Merge pull request #19549 from grandoc/new_branch_04_12_2021 
update code : use loadlangs function
 2021-12-08 16:16:32 +01:00
Laurent Destailleur
e887e44c25
Merge pull request #19528 from atm-greg/FIX_Uniformize_printFieldListHaving_hook 
add printFieldListHaving hook
 2021-12-08 16:10:36 +01:00
atm-florian
74ecb07925 FIX: printFieldListWhere called twice (at different locations) for the same SQL query, can result in syntax errors 2021-12-08 16:03:21 +01:00
Laurent Destailleur
990882e264
Merge branch 'develop' into Debug_15 2021-12-08 15:53:33 +01:00
Laurent Destailleur
0fa82fbb4e
Merge pull request #19559 from fappels/debug_15_part2 
Extrafield showOutputField parameter 4 'extrafieldsobjectkey' is now required
 2021-12-08 15:43:01 +01:00
Laurent Destailleur
460627e777
Merge pull request #19563 from marc-dll/develop_FIX_thirdparty_ajax 
FIX: thirparty ajax selector: no name or highlighting if at least ref and/or address displayed
 2021-12-08 15:35:50 +01:00
Laurent Destailleur
bfc4eb059f
Merge pull request #19567 from vincentjdc/expense-report-line-file-multi-company-fix 
Fixes https://github.com/Dolibarr/dolibarr/issues/19541
 2021-12-08 15:34:31 +01:00
Laurent Destailleur
597ab407f8
Merge pull request #19568 from Hystepik/develop#2 
Fix inventory scanning function
 2021-12-08 15:30:55 +01:00
Laurent Destailleur
9b65bb2085
Update list.php 2021-12-08 15:29:16 +01:00
Laurent Destailleur
5007282d7a Fix missing info popup on product 2021-12-08 15:16:06 +01:00
Laurent Destailleur
6b3cd703c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 15:08:18 +01:00
Laurent Destailleur
8de8dacaa3 Fix php warning 2021-12-08 15:07:55 +01:00
atm-gregr
01893caa61 bad default value 2021-12-08 14:40:46 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5 
Fix php8.0 warnings
 2021-12-08 14:36:42 +01:00
Laurent Destailleur
b4de28f1db
Update index.php 2021-12-08 14:36:34 +01:00
atm-gregr
386771cffc fix display contat line on list 2021-12-08 14:21:42 +01:00
Florian HENRY
6f22827ff2 fix stuff 2021-12-08 09:33:42 +01:00
Laurent Destailleur
20f4b5389b Fix the experimental feature to manage session in database 2021-12-07 17:39:46 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +01:00
Laurent Destailleur
b238419020 Clean code 2021-12-07 13:39:06 +01:00
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
Vincent Dieltiens
5f5c284af7 Fixes https://github.com/Dolibarr/dolibarr/issues/19541 2021-12-07 09:37:47 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Laurent Destailleur
5efa31204b FIX ECM module was mixing contributions and vat and not showing salaries 2021-12-07 02:00:34 +01:00
Laurent Destailleur
ba507e7735 css 2021-12-06 20:53:01 +01:00
Francis Appels
fe40668f43 Parameter 4 extrafieldsobjectkey seems to be required now. 2021-12-06 20:32:44 +01:00
Marc de Lima Lucio
bfc8bb85a3 FIX: thirparty ajax selector: no name or highlighting if at least ref and/or address displayed 2021-12-06 18:23:47 +01:00
Laurent Destailleur
1caaa335d1 Fix missing section with files on social contribution page 2021-12-06 18:18:31 +01:00
Marc de Lima Lucio
6af2626f08 FIX: contact card: bad colspan value for separator extrafield in creation/modification form 2021-12-06 16:55:51 +01:00
lmarcouiller
f37d9787cd error management and addproduct 2021-12-06 16:47:56 +01:00
Francis Appels
f1524372ad Fix extrafield showOutputField old syntax always hidden. 2021-12-06 16:34:50 +01:00
Yaacov Akiba Slama
990081ce21 Remove illegal characters in SEPA XML 2021-12-06 16:54:08 +02:00
Francis Appels
5803060caf Fix shipment delete 2021-12-06 14:43:11 +01:00
Laurent Destailleur
39c7d55c1d Fix php syntax 2021-12-06 12:17:07 +01:00
Laurent Destailleur
8b914172df Fix rename and protect a test page 2021-12-06 12:16:12 +01:00
Laurent Destailleur
1977cac44a Fix error message 2021-12-06 12:12:04 +01:00
Laurent Destailleur
dd60720299 Add tool to help debug 2021-12-06 12:07:13 +01:00
stickler-ci
39117e8089 Fixing style errors. 2021-12-06 11:06:50 +00:00
habot-it
9ee3903fc4
Update pdf.lib.php 2021-12-06 12:06:32 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
habot-it
2ad9761040
Add hookmanager in function pdf_pagefoot of pdf.lib.php 
Customize PDF footers with HTML.
(Only on the last page with free text)
 2021-12-06 07:47:24 +01:00
Laurent Destailleur
259b7dfe5a NEW: Add massaction to switch status on sale / on purchase of a product. 2021-12-06 02:48:34 +01:00
Laurent Destailleur
eb60e3c16d Fix click on "C" on pad, reset correctly pad edition. 2021-12-06 02:13:15 +01:00
Laurent Destailleur
d62b3cafe4 Trans 2021-12-05 19:38:21 +01:00
Laurent Destailleur
9bad92f395 Trans 2021-12-05 19:25:15 +01:00
Laurent Destailleur
38c13a8713 Fix missing seconds 2021-12-05 16:59:02 +01:00
Laurent Destailleur
d910699f53 Fix hack 2021-12-05 16:57:39 +01:00
Laurent Destailleur
b11d31fea0 Fix: Quick hack to show missing datelastresult field in list of cronjob 2021-12-05 16:51:51 +01:00
Laurent Destailleur
49e3344a58 Fix link 2021-12-05 15:11:10 +01:00
Laurent Destailleur
305d8af76a Fix use a standard link insted of js to open a window. 2021-12-05 14:58:07 +01:00
Laurent Destailleur
2b505ec9b8 Fix can read category if can run takepos. 2021-12-05 13:01:05 +01:00
Laurent Destailleur
f3b38c82ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-05 13:00:41 +01:00
Laurent Destailleur
131c00ffb6 css 2021-12-05 13:00:23 +01:00
Philippe Grand
6d89e4b199
Update mymodulewidget1.php 2021-12-04 15:23:21 +01:00
stickler-ci
9465fc17e6 Fixing style errors. 2021-12-04 14:20:38 +00:00
Philippe GRAND
30505cc564 update code : use loadlangs function 2021-12-04 15:19:45 +01:00
Laurent Destailleur
7219100174 css 2021-12-04 00:54:31 +01:00
Laurent Destailleur
87e221d6dd Fix create new page 2021-12-04 00:24:59 +01:00
Laurent Destailleur
acf7aa6489 CSS 2021-12-04 00:05:30 +01:00
Laurent Destailleur
80c9442780 css 2021-12-04 00:05:15 +01:00
lmarcouiller
325ad45bca update scan inventory error gestion 2021-12-03 16:04:23 +01:00
Laurent Destailleur
212001ffa7 Trans 2021-12-03 15:15:08 +01:00
Laurent Destailleur
53ab2dd109 Trans 2021-12-03 15:13:20 +01:00
javieralapps4up
b024bf20ed
Update html.form.class.php 
When you pay an invoice, you can send the payment multiple times.
 2021-12-03 13:57:34 +01:00
Florian HENRY
2f4fe2b898 error message 2021-12-03 10:59:47 +01:00
lmarcouiller
093191aeeb FIx php8.0 warnings 2021-12-03 10:37:48 +01:00
lmarcouiller
83ea868c9a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-12-03 10:19:28 +01:00
Laurent Destailleur
1db52532ff FIX: do not update holiday for closed users 2021-12-03 01:50:17 +01:00
Laurent Destailleur
d9aa471370 Fix color status 2021-12-03 01:39:16 +01:00
andreubisquerra
2b5bcda8d8
FIX Avoid move line to the same place in TakePOS 2021-12-02 23:08:22 +01:00
andreubisquerra
c23914f367
FIX load css file 2021-12-02 23:05:18 +01:00
Laurent Destailleur
ac17378972 revert 2021-12-02 20:41:13 +01:00
Laurent Destailleur
2300f17101 test 2021-12-02 20:40:41 +01:00
Laurent Destailleur
9c083071b8 Better test 2021-12-02 20:39:53 +01:00
Laurent Destailleur
7e835ec915 Fix css 2021-12-02 19:06:44 +01:00
Laurent Destailleur
075faded47 FIX list of categories in stats of supplier invoices 
Conflicts:
	htdocs/compta/facture/stats/index.php
 2021-12-02 18:48:15 +01:00
Laurent Destailleur
39ad96c230 css 2021-12-02 17:47:03 +01:00
Laurent Destailleur
c171ba3a45 Fix regression in cron jobs 2021-12-02 16:07:33 +01:00
lmarcouiller
b732d80ca5 Fix php 8.0 warnings 2021-12-02 15:56:34 +01:00
Regis Houssin
202b123aaa FIX compatibility with multicompany 2021-12-02 15:10:29 +01:00
Laurent Destailleur
a3493d0132 Clean code 2021-12-02 11:33:51 +01:00
Laurent Destailleur
bd0208b595 css 2021-12-02 11:30:56 +01:00
Laurent Destailleur
ca6f222662 Fix notification (pb static var unknown) 2021-12-02 11:19:44 +01:00
Laurent Destailleur
10e126eb69 Clean code on pdf templates 2021-12-02 10:43:44 +01:00
Laurent Destailleur
bacf569e0b Fix phpcs 2021-12-01 17:33:26 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
lmarcouiller
171ecaa81d fix php8.0 warnings 2021-12-01 15:40:53 +01:00
Laurent Destailleur
3cb07fd1ec Doc 2021-12-01 15:37:31 +01:00
Laurent Destailleur
c6a071622a Avoid a useless select 2021-12-01 15:26:53 +01:00
lmarcouiller
4c92af9aca fix php8.0 warnings 2021-12-01 15:24:25 +01:00
Laurent Destailleur
f8a55362f6 Typo 2021-12-01 14:46:48 +01:00
lainwir3d
50d422cdf6 CLOSE #19531 Product REST API: allow list / search method to retrieve stock data. 
See feature request #19531
 2021-12-01 16:33:47 +04:00
lmarcouiller
7512305b44 add porduct inventory but qty_view bug 2021-12-01 12:10:57 +01:00
Laurent Destailleur
259418d1dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-12-01 12:10:14 +01:00
Laurent Destailleur
4575bbae82 Clean code for browser notifications 2021-12-01 12:00:19 +01:00
Regis Houssin
efda10333c FIX missing default value for more comprehensive 2021-12-01 10:40:10 +01:00
Jay Yeo
63c7ab0302 Fix typo 'usercanreceived' -> 'usercanreceive' in 'card.php' 2021-12-01 14:29:24 +07:00
Lucas Marcouiller
1c4a7a00cb fix php8.0 warning 2021-11-30 16:35:46 +01:00
atm-greg
db06de0ac2 add printFieldListHaving hook 2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
 2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-30 15:57:14 +01:00
Laurent Destailleur
d84d09556c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-11-30 15:55:57 +01:00
Laurent Destailleur
feabb34a42 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-30 15:54:46 +01:00
Laurent Destailleur
5d7f8d3831 Fix fatal error 2021-11-30 15:54:28 +01:00
Lucas Marcouiller
f39dd30a7f fix precommit 2021-11-30 15:38:48 +01:00
Lucas Marcouiller
ae56619253 add productadd function but error on tabproduct 2021-11-30 15:38:27 +01:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5 
Fix: php 8.0 warning commercial part
 2021-11-30 15:31:51 +01:00
Laurent Destailleur
31393802ff
Update card.php 2021-11-30 15:29:19 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
7937a798b7
Merge pull request #18331 from marc-dll/12.0_FIX_invoice_multicurrency_discount 
FIX: multicurrency: fields in discount unitialized when creating deposit
 2021-11-30 14:23:37 +01:00
Laurent Destailleur
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4 
Fix: php 8.0 warnings project
 2021-11-30 14:18:23 +01:00
Laurent Destailleur
07506b523f Clean code 2021-11-30 14:09:46 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3 
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
 2021-11-30 14:04:10 +01:00
Laurent Destailleur
40491ca04e
Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary 
NEW : for developpers allow translation label in select_dictionnary
 2021-11-30 12:38:18 +01:00
Laurent Destailleur
31842ddb1e
Merge pull request #19427 from mrtnnbr/develop 
Fix check for non-custom modules
 2021-11-30 12:28:23 +01:00
Laurent Destailleur
0b4409a087
Merge pull request #19442 from andreubisquerra/14.0 
TakePOS Direct Payment (Cash) Button doesn't work
 2021-11-30 12:25:21 +01:00
Laurent Destailleur
429c4406c4
Merge pull request #19441 from andreubisquerra/develop 
TakePOS Direct Payment (Cash) Button doesn't work
 2021-11-30 12:24:58 +01:00
Laurent Destailleur
f43fb18287
Merge pull request #19452 from bomuux/patch-3 
FIX contact/note.php always restricted for external users
 2021-11-30 12:21:34 +01:00
Laurent Destailleur
5e55bb20e3
Update note.php 2021-11-30 12:21:21 +01:00
stickler-ci
c807286f0b Fixing style errors. 2021-11-30 11:17:48 +00:00
fr69400
19fc862a7e Merge branch 'patch3' of https://github.com/fr69400/dolibarr into patch3 2021-11-30 12:17:21 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion 
keep info on latest activation version of module
 2021-11-30 12:16:39 +01:00
fr69400
078a040078 Update pdf.lib.php 2021-11-30 12:13:21 +01:00
Laurent Destailleur
dffc3eaefb
Merge pull request #19447 from inovea-conseil/NEW_return_url_sendpassword 
New return url sendpassword
 2021-11-30 12:07:17 +01:00
Laurent Destailleur
cf165835bf
Merge pull request #19462 from KlaasOl/patch-5 
Update main.lang
 2021-11-30 12:00:35 +01:00
Laurent Destailleur
06cda2ce35
Merge pull request #19453 from aspangaro/14p27 
FIX Accountancy - SQL error on subledger account search in journal
 2021-11-30 11:59:07 +01:00
Laurent Destailleur
aa677ec290
Merge pull request #19460 from frederic34/patch-4 
fix undefined variable $result
 2021-11-30 11:57:36 +01:00
Laurent Destailleur
f9b347c61c
Merge pull request #19481 from ksar-ksar/patch-11 
FIX #19476
 2021-11-30 11:56:12 +01:00
Laurent Destailleur
2b1fab2181 Clean code 2021-11-30 11:50:27 +01:00
Laurent Destailleur
db4871846e
Merge pull request #19463 from code-chicken/patch-13 
Better wording
 2021-11-30 11:46:51 +01:00
Laurent Destailleur
e65ab75ddf
Merge pull request #19466 from st31ny/sumup_holidays 
NEW: Show sum of holidays in holiday list
 2021-11-30 11:44:32 +01:00
Laurent Destailleur
5b2e48ba9e
Merge pull request #19469 from frederic34/testclass 
enable societe.class.php in coding test
 2021-11-30 11:42:03 +01:00
Laurent Destailleur
cf4beafb68
Merge pull request #19484 from aspangaro/12p23 
FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
 2021-11-30 11:39:44 +01:00
Laurent Destailleur
c6fb026b75
Merge pull request #19504 from fappels/14_fix_fatal_eval 
FIX 14.0.4 fatal error on cron list.
 2021-11-30 11:31:02 +01:00
Laurent Destailleur
4fd6f9955a
Merge pull request #19503 from KlaasOl/patch-6 
Update main.lang
 2021-11-30 11:21:49 +01:00
Laurent Destailleur
d84ce2e901
Merge pull request #19507 from ptibogxiv/patch-455 
Fix ExpenseReport define template
 2021-11-30 11:21:12 +01:00
Laurent Destailleur
ecdae02062
Merge pull request #19510 from frederic34/contractdirectprint 
add direct print for contracts
 2021-11-30 11:20:51 +01:00
Laurent Destailleur
efe4b2363a
Merge pull request #19514 from atm-greg/FIX_Uniformize_printFieldListFrom_hook 
uniformize hooks behaviour
 2021-11-30 11:20:22 +01:00
Laurent Destailleur
3178065a9c
Merge pull request #19512 from atm-john/fix_duplicateur_code 
FIX : Duplicated code
 2021-11-30 11:16:44 +01:00
Laurent Destailleur
8b15741840 Fix button to close as paid 2021-11-29 19:46:43 +01:00