Commit Graph

22250 Commits

Author SHA1 Message Date
Laurent Destailleur
2b267cf8e4 Fix warnings 2020-12-04 20:06:55 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Laurent Destailleur
e0b737b622
Merge pull request #15650 from atm-lena/12.0_FIX_PriceToNum_ConvertNegativToPositiv
pricetonum() - preg-replace() delete "-" negativ number
2020-12-04 18:19:22 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +01:00
Laurent Destailleur
f0dec80dae css 2020-12-04 15:39:30 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +01:00
Laurent Destailleur
040d22ef0a Fix phpcs 2020-12-04 01:59:47 +01:00
Frédéric FRANCE
e3037c7e1a
doxygen 2020-12-03 17:33:22 +01:00
Laurent Destailleur
f06d920460 FIX #15583 2020-12-03 16:22:03 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
2020-12-03 11:26:53 +01:00
Laurent Destailleur
af4f473c93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_produits.php
2020-12-03 11:22:34 +01:00
Laurent Destailleur
0ad6ee209a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-03 11:21:08 +01:00
Laurent Destailleur
dd54d28dc6 Debug v13 2020-12-03 10:13:13 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
Laurent Destailleur
d88173d7ba Fix bad column 2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
Laurent Destailleur
ea1c55cf1e Fix widgets that has disappeared 2020-12-02 15:16:20 +01:00
Laurent Destailleur
409b73fe2c FIX #15582 2020-12-02 15:16:04 +01:00
Laurent Destailleur
25bedc3497 Fix warning 2020-12-02 14:09:03 +01:00
Laurent Destailleur
49be354c3e Fix warning 2020-12-02 14:05:17 +01:00
Laurent Destailleur
c8274f13eb
Merge pull request #15582 from Hystepik/develop
Close #15307 New Widget : Encours dépassé
2020-12-02 14:01:50 +01:00
Laurent Destailleur
c5ff32c2d2 Fix accept <u> and <i> into translation strings 2020-12-01 17:01:35 +01:00
Laurent Destailleur
c0c03f5270 Fix allow tag <center> into translation strings 2020-12-01 15:59:54 +01:00
Laurent Destailleur
3b3f9acdbb Remove warning 2020-12-01 11:36:58 +01:00
stickler-ci
7d966d7a49 Fixing style errors. 2020-12-01 01:42:18 +00:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e CSS 2020-11-30 20:31:22 +01:00
Laurent Destailleur
2707c0b89b Look and feel v13 2020-11-30 20:13:42 +01:00
Laurent Destailleur
de718837e4 Fix warnings 2020-11-30 19:43:43 +01:00
Laurent Destailleur
cf2dd28a21 Fix warning when setup not complete. 2020-11-30 19:40:53 +01:00
Laurent Destailleur
fc91e70e47
Update modFacture.class.php 2020-11-30 18:37:07 +01:00
Laurent Destailleur
c0baf483dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-30 18:28:24 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
lmarcouiller
ff30021d35 Close #15307 Encours dpassé with eldy suggestions 2020-11-30 16:50:12 +01:00
Laurent Destailleur
dc56c2bc3c
Merge pull request #15584 from frederic34/getpostint
introduce GETPOSTINT which returns only int
2020-11-30 16:08:20 +01:00
Frédéric FRANCE
765df41918
introduce GETPOSTINT 2020-11-30 15:44:29 +01:00
Laurent Destailleur
6f0d49d68d
Merge pull request #15578 from Tim-Otte/fix-product-supplier-price-extrafield
FIX for product supplier price extrafields
2020-11-30 15:44:04 +01:00
Laurent Destailleur
93a337b819
Merge pull request #15581 from frederic34/patch-8
remove syntax error
2020-11-30 15:41:26 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
lmarcouiller
cee1b3cee4 Close : Encours dépassé #15307 2020-11-30 14:52:27 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
lmarcouiller
595bb893be Close : Encours dépassé #15307 2020-11-30 14:01:56 +01:00
lmarcouiller
6e9a3c05f4 Close : Encours dépassé #15307 2020-11-30 13:52:02 +01:00
Frédéric FRANCE
ffcce1a4b4
remove syntax error 2020-11-30 13:02:05 +01:00
lmarcouiller
00dca7ff9b NEW : Encours dépassé #15307 2020-11-30 13:01:45 +01:00
Laurent Destailleur
73ea6e40bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-30 12:55:11 +01:00
Laurent Destailleur
bd5dc6399b Fix deprecated code 2020-11-30 12:35:05 +01:00