lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,603 Commits 43 Branches 150 Tags 886 MiB
4ff2ff779b
Commit Graph

24655 Commits

Author SHA1 Message Date
Laurent Destailleur
6bf8e425c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
 2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7 
fix php warning
 2021-06-15 22:08:37 +02:00
Laurent Destailleur
5ddf12b29c Fix set language 2021-06-15 22:06:26 +02:00
Laurent Destailleur
1c87420895 Fix #yogosha6411 2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
Laurent Destailleur
80760d7960 Fix permissions 2021-06-15 14:18:09 +02:00
Frédéric FRANCE
5ceb957059
fix php warning 2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php 2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning 2021-06-15 08:31:08 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
617338cccd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
 2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee Clean code 2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line 
FIX clone invoice with acount line
 2021-06-14 14:41:05 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0 
Fix create image thumbs on php 8.0
 2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php 2021-06-14 14:05:48 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Francis Appels
a019996bc8 Fix create image thumbs on php 8.0 2021-06-13 17:36:51 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7 
fix warnings
 2021-06-13 16:15:58 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning 2021-06-13 15:37:54 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
9ba0fe07f0 Fix phpcs 2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning 2021-06-12 18:40:00 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm 
New :  Missing hook for stock movements list
 2021-06-11 19:58:21 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts 
add more capabilities for zapier
 2021-06-11 19:51:01 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat 
Adding hooks on product stat in order to allow to expand stat on othe…
 2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php 2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php 2021-06-11 19:32:25 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice 
remove useless check on invoice line content when generating pdf
 2021-06-11 18:13:58 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12 
fix warning
 2021-06-11 18:02:54 +02:00
Laurent Destailleur
ffb879d152
Merge pull request #17880 from frederic34/patch-8 
fix warning
 2021-06-11 18:02:45 +02:00
Laurent Destailleur
fbe970c739
Merge pull request #17879 from frederic34/patch-7 
try to fix
 2021-06-11 18:02:29 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13 
fix warnings
 2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2 FIX #17649 2021-06-11 17:58:52 +02:00
Laurent Destailleur
92dc0d28ce Fix disallow reserved values for field name 2021-06-11 17:50:52 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e Clean code 2021-06-11 14:54:18 +02:00
John BOTELLA
99cada2d43 Fix missing hooks 2021-06-11 14:42:51 +02:00
Laurent Destailleur
e17ab1cca6 Clean code 2021-06-11 09:22:01 +02:00
Laurent Destailleur
b0b2bb4d86 Fix trans 2021-06-11 09:20:59 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php 2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings 2021-06-10 22:26:58 +02:00
Frédéric FRANCE
acc41adb8d
fix warning 2021-06-10 22:22:24 +02:00
Frédéric FRANCE
759472f5d1
fix warning 2021-06-10 20:58:56 +02:00
Frédéric FRANCE
3cb17d7535
fix warning 2021-06-10 20:40:10 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix 2021-06-10 20:32:45 +02:00
Laurent Destailleur
4e87a08282 Try fix for #17866 2021-06-10 19:02:53 +02:00
Alexis LAURIER
1a2434818d remove useless check on deposit line content when generating pdf 2021-06-10 18:00:49 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade 
FIX : childtablesoncascade doc
 2021-06-10 12:59:19 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning 
Fix php 7 warning : Only variables should be passed by reference
 2021-06-10 12:20:26 +02:00
Laurent Destailleur
32491dc668
Merge pull request #17868 from prolyfix/patch-1 
bug resolution: exception
 2021-06-10 12:09:20 +02:00
Laurent Destailleur
c4dcad5e6b Fix regression 2021-06-10 11:57:42 +02:00
Laurent Destailleur
ea0db5a574 Fix popup of invoice 2021-06-10 01:10:35 +02:00
Laurent Destailleur
c40bc085b2 Fix v14 2021-06-10 00:55:10 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
067f37e22e Clean code 2021-06-10 00:09:38 +02:00
prolyfix
e4d3fd4861
bug resolution: exception 
when a user test the send mail functionality, an exception is thrown: $object is null in the method_exists's function. and thus not allowed. 
Adding is_object resolve the problem
 2021-06-09 23:09:31 +02:00
Laurent Destailleur
f472ff4fd9 Add phpunit for dol_eval 2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659 NEW Reduce scope of dol_eval function. 2021-06-09 17:44:42 +02:00
lvessiller
c37c371392 FIX clone invoice with acount line 2021-06-09 17:18:01 +02:00
Laurent Destailleur
0b7b12685f Clean code 2021-06-09 16:41:43 +02:00
Laurent Destailleur
2681d58107 FIx CVE ID: CVE-2021-33816 2021-06-09 16:41:31 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d using strlen instead of count 2021-06-09 14:13:50 +02:00
Laurent Destailleur
c375668ab6 Clean code 2021-06-09 12:41:53 +02:00
Gauthier PC portable 024
4b6fb7dd47 FIX : auto rounding on "_FORMATED_" tags 2021-06-09 12:26:28 +02:00
MOREAU FRANCK
a141d722ad Adding hooks on product stat in order to allow to expand stat on other modules 
stickler-ci test corrections
 2021-06-09 08:39:06 +02:00
MOREAU FRANCK
4b8dfc1abe Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 18:11:59 +02:00
MOREAU FRANCK
2e66509245 Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 15:47:20 +02:00
Laurent Destailleur
1aeb91eb9a FIX entry menus that has been lost in v13 
Look and feel v14
 2021-06-08 13:44:11 +02:00
John BOTELLA
5131ab5199 Fix php 7 warning : Only variables should be passed by reference 2021-06-08 12:36:08 +02:00
MOREAU FRANCK
207dc1df55 Adding hooks on product stat in order to allow to expand stat on other modules 2021-06-08 12:34:26 +02:00
Laurent Destailleur
0144d6c0fd Inventory is now stable feature 2021-06-07 11:30:46 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
Laurent Destailleur
242f8b2544 Debug v14 2021-06-07 01:23:34 +02:00
Frédéric FRANCE
8401fa3ce7
add trigger member 2021-06-06 17:57:48 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts 2021-06-06 17:09:35 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da Debug v14 2021-06-06 15:29:49 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email 2021-06-06 10:32:04 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880 Fix typo 2021-06-05 15:28:41 +02:00
Laurent Destailleur
fb0d2cdddc Debug v14 2021-06-05 15:27:49 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
ddbfb5d734 Fix translation of note of product 2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836 Fix bad name of var 2021-06-05 11:07:38 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact 2021-06-05 09:37:38 +02:00
Laurent Destailleur
b6ba1de3b3 Fix remove use of captcha on backoffice for ticket creation 2021-06-05 02:18:45 +02:00
Laurent Destailleur
0147ffa737 Fix css 2021-06-04 14:38:22 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2 
Fix #17743 newpayement source membersubscription is member
 2021-06-04 13:04:17 +02:00
Laurent Destailleur
a94ef88549
Merge pull request #17748 from frederic34/patch-13 
Update pdf_canelle.modules.php
 2021-06-04 12:34:27 +02:00
Laurent Destailleur
f656214a66
Merge pull request #17746 from frederic34/patch-12 
doxygen
 2021-06-04 12:32:26 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19 
fix warning
 2021-06-04 11:54:26 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20 
fix warnings
 2021-06-04 11:52:53 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14 
fix warnings
 2021-06-04 11:51:01 +02:00
Laurent Destailleur
c3ed30345e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 11:45:24 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
 2021-06-04 11:04:18 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4 
New : add of a new param in selectGroupTicket
 2021-06-04 10:37:18 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note 
ADD note to supplier order refusal
 2021-06-04 10:10:17 +02:00
Laurent Destailleur
ce64ebc167
Merge pull request #17805 from frederic34/patch-22 
fix warning
 2021-06-04 08:58:53 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24 
fix warning
 2021-06-04 08:57:10 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
Frédéric FRANCE
ee55a5568f
fix warning 2021-06-03 15:14:31 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm 2021-06-03 14:36:47 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning 2021-06-03 08:33:44 +02:00
Christian Foellmann
68579f9cda fix html linebreak 2021-06-02 08:17:34 +02:00
Laurent Destailleur
0071d63fbb Fix for ro-md language 2021-05-31 13:35:03 +02:00
Christian Foellmann
55d48077a3 ADD note to supplier order refusal 2021-05-31 10:45:34 +02:00
lmarcouiller
301d6ecd57 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-05-31 09:31:58 +02:00
lmarcouiller
ab64f467f5 add of a new param in selectGroupTicket 2021-05-31 09:31:38 +02:00
Laurent Destailleur
ea21e1dbfb Fix color selection for ticket graph 2021-05-30 20:19:02 +02:00
Laurent Destailleur
d2bda7ad09 Set a maxlength on fields 2021-05-30 19:01:43 +02:00
Laurent Destailleur
4f6385338a Fix option CAT_HIGH_QUALITY_IMAGES 2021-05-28 18:15:26 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
Frédéric FRANCE
ca0654323f
fix warnings 2021-05-27 23:11:05 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning 2021-05-27 22:56:20 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings 2021-05-27 22:28:59 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member 
Fix #17743 newpayement source membersubscription is not valid anymore

@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
 2021-05-27 21:09:49 +02:00
Frédéric FRANCE
f1b32dce17
Update pdf_canelle.modules.php 2021-05-27 17:07:59 +02:00
Frédéric FRANCE
00d60aa65a
doxygen 2021-05-27 16:54:41 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF 2021-05-27 00:02:01 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php 2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php 2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018 lint(stickler) 2021-05-26 17:10:12 +02:00
Antonin MARCHAL
8dd2af42df fix(param) select_produits_fournisseur_list 2021-05-26 16:44:35 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5 
fix allowed preview
 2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php 2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php 2021-05-25 22:09:58 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note 
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
 2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php 2021-05-25 21:39:50 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1 
Compatibility phpv8
 2021-05-25 20:36:56 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier 
NEW translate supplier order menus and button
 2021-05-25 20:34:17 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm 
fix: formconfim if type radio must be :checked to get correct value
 2021-05-25 20:03:10 +02:00