Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 07:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Frédéric FRANCE
e049eb960d add trigger user create 2020-10-29 20:53:28 +01:00
Frédéric FRANCE
0507e71586 phpcs 2020-10-29 18:44:15 +01:00
Frédéric FRANCE
317ffc65c9 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-29 18:41:22 +01:00
Laurent Destailleur
8c646cdf4f Merge pull request #15207 from frederic34/patch-11 
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
 2020-10-29 17:49:16 +01:00
Laurent Destailleur
391224d221 Merge pull request #15214 from hregis/fix_date_not_recover_in_edit_mode 
FIX extrafield date not recover in create/edit mode
 2020-10-29 17:42:13 +01:00
Laurent Destailleur
45477aba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:50 +01:00
Laurent Destailleur
c187b41714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
 2020-10-29 13:10:10 +01:00
Laurent Destailleur
d7225327e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-29 11:13:29 +01:00
Regis Houssin
032813fa19 FIX extrafield date not recover in create/edit mode 2020-10-29 11:05:45 +01:00
Laurent Destailleur
980cb095da Fix sort order use last sortorder if several fields. 2020-10-29 11:05:43 +01:00
Florian Mortgat
5e2962ef38 FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document 2020-10-29 10:50:13 +01:00
Frédéric FRANCE
5d0ac98c34 work on zapier 2020-10-29 00:34:41 +01:00
Frédéric FRANCE
4d716e74bd Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER 2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Laurent Destailleur
f760b20bde Fix double semi colon 2020-10-28 17:48:20 +01:00
Florian HENRY
c202108359 Merge branch 'dev_new_add_desc_when_select_product' of github.com:FHenry/dolibarr into dev_new_add_desc_when_select_product 2020-10-28 17:18:32 +01:00
Florian HENRY
4b7707cc7c Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-28 17:17:52 +01:00
Laurent Destailleur
4cf32824bf Merge pull request #15187 from frederic34/patch-6 
Make MAIN_ALL_TO_UPPER utf8 compliant
 2020-10-28 17:17:18 +01:00
Laurent Destailleur
77dfda1a2d Merge pull request #15194 from ptibogxiv/patch-391 
FIX display variants card
 2020-10-28 17:10:34 +01:00
Laurent Destailleur
e3f848238d Merge pull request #15195 from frederic34/cachecompanylib 
add cache
 2020-10-28 17:09:27 +01:00
Florian Mortgat
a4af2e94a9 FIX 10.0 - make formConfirm an addreplace-type hook 2020-10-28 17:08:09 +01:00
stickler-ci
88b570926f Fixing style errors. 2020-10-28 15:38:31 +00:00
Florian HENRY
d77a0b40a8 tested and approuve feaure #15036 2020-10-28 16:37:41 +01:00
Marc de Lima Lucio
ca2ed2ef74 NEW: ref in product customer price: look for products with customer ref 2020-10-28 11:04:15 +01:00
Florian HENRY
a3073be8e4 Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-28 08:52:29 +01:00
Frédéric FRANCE
0d65ab0c96 add cache 2020-10-28 00:34:59 +01:00
ptibogxiv
6fd996381e FIX display variant card 2020-10-27 23:07:05 +01:00
Frédéric FRANCE
7a7a6f8018 fix phpcs 2020-10-27 21:28:26 +01:00
Frédéric FRANCE
991273bd10 Update functions.lib.php 2020-10-27 20:44:17 +01:00
Frédéric FRANCE
7d30a11a26 Update functions.lib.php 2020-10-27 20:06:49 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Laurent Destailleur
f7de9333bb Doxygen 2020-10-27 19:29:42 +01:00
Laurent Destailleur
7d291d075e Merge pull request #15184 from frederic34/formcolor 
formcolor parameter is deprecated
 2020-10-27 19:03:29 +01:00
Laurent Destailleur
1b939ab8f4 Merge pull request #15183 from frederic34/dol_fiche_end 
end of dol_fiche_end
 2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36 Fix scrutinizer 2020-10-27 18:55:55 +01:00
Laurent Destailleur
e099507594 Fix regression 2020-10-27 18:53:03 +01:00
Frédéric FRANCE
900452a47d formcolor parameter is deprecated 2020-10-27 18:46:42 +01:00
Laurent Destailleur
e10033143a Fix bad var 2020-10-27 18:40:44 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1 More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 15:06:16 +01:00
Laurent Destailleur
92f3137c3e Merge pull request #15179 from frederic34/boxmembers 
add small photo in box members
 2020-10-27 11:55:32 +01:00
Laurent Destailleur
4adaf67d47 Hide setup we don't need if email are disabled globally 
CSS
 2020-10-27 11:40:30 +01:00
Laurent Destailleur
fe357e17e8 Fix for ja 2020-10-27 11:00:50 +01:00
Florian HENRY
2c772cd8bb try to make it work for experimental PRODUIT_CUSTOMER_PRICES_BY_QTY option 2020-10-27 09:52:04 +01:00