Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,088 Commits 36 Branches 189 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

27056 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
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
8ff0d1f366 Update functions.lib.php 2021-12-08 15:49:52 +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
597ab407f8 Merge pull request #19568 from Hystepik/develop#2 
Fix inventory scanning function
 2021-12-08 15:30:55 +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
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
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +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
Francis Appels
fe40668f43 Parameter 4 extrafieldsobjectkey seems to be required now. 2021-12-06 20:32:44 +01:00
Francis Appels
f1524372ad Fix extrafield showOutputField old syntax always hidden. 2021-12-06 16:34:50 +01:00
Yaacov Akiba Slama
04d4c06a43 Use intl extension when available 2021-12-06 15:34:20 +02:00
Yaacov Akiba Slama
8f91086e83 Add some missing characters 2021-12-06 15:33:51 +02: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
2b505ec9b8 Fix can read category if can run takepos. 2021-12-05 13:01:05 +01:00
ATM john
5dc620b728 Merge branch 'fix_missing_formsetup_elements' of github.com:atm-john/dolibarr into fix_missing_formsetup_elements 2021-12-04 14:00:12 +01:00
ATM john
f640a9fbad Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_missing_formsetup_elements 2021-12-04 13:59:27 +01:00
Laurent Destailleur
87e221d6dd Fix create new page 2021-12-04 00:24:59 +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
lmarcouiller
83ea868c9a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-12-03 10:19:28 +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
Laurent Destailleur
a3493d0132 Clean code 2021-12-02 11:33:51 +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
John BOTELLA
c0d00a859f use dol_escape_htmltag 2021-12-01 16:59:30 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
Laurent Destailleur
3cb07fd1ec Doc 2021-12-01 15:37:31 +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
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
5d7f8d3831 Fix fatal error 2021-11-30 15:54:28 +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
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
Ferran Marcet
ac975ecc61 Undo changes 2021-11-30 13:30:17 +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
stickler-ci
c807286f0b Fixing style errors. 2021-11-30 11:17:48 +00:00