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

88737 Commits

Author SHA1 Message Date
Frédéric FRANCE
cd615b1717
fix php warning 2021-06-15 08:31:08 +02:00
Laurent Destailleur
a1e6236df0 Fix regression sql error 2021-06-15 02:15:45 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
UT from dolibit
41549af751
Update llx_00_c_country.sql 
Iles Salomon  ->  Solomon Islands 
Somalie  ->  Somalia 
South Africa 
Iles Géorgie du Sud et Sandwich du Sud  ->  South Georgia and the South Sandwich Islands 
Sri Lanka = Sri Lanka 
Soudan  ->  Sudan 
Suriname = Suriname 
Iles Svalbard et Jan Mayen  ->  Svalbard and Jan Mayen 
Swaziland = Swaziland     & new also:   Eswatini 
Syrie  ->  Syria
 2021-06-14 21:45:11 +02:00
Laurent Destailleur
7e7800c110 Fix phpcs 2021-06-14 20:37:21 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
Laurent Destailleur
165d0d76d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 19:29:03 +02:00
Laurent Destailleur
8b0c2d997c Clean code 2021-06-14 19:28:38 +02:00
stickler-ci
745ad8b403 Fixing style errors. 2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347 FIX : same thing on supplier orders 2021-06-14 17:01:59 +02:00
Laurent Destailleur
5fade1148d
Merge pull request #17829 from aspangaro/14b12 
NEW Add field date start/end from/to in expense report list
 2021-06-14 16:11:13 +02:00
Laurent Destailleur
dd27d38d5e
Merge pull request #17869 from aspangaro/14b13 
NEW Add field date from/to in supplier invoice list
 2021-06-14 16:02:50 +02:00
Laurent Destailleur
4b7292e405
Merge pull request #17928 from dolibit-ut/patch-349 
Update card.php
 2021-06-14 15:47:44 +02:00
Laurent Destailleur
b64f54c86f
Merge pull request #17927 from dolibit-ut/patch-348 
Update card.php
 2021-06-14 15:46:49 +02:00
stickler-ci
afa1e117c5 Fixing style errors. 2021-06-14 13:37:39 +00: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
d04fe12ce9 # WARNING: head commit changed in the meantime 
Clean code
 2021-06-14 15:05:54 +02:00
Laurent Destailleur
261bc88545 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:50:26 +02: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
9a820ba974
Merge pull request #17925 from dolibit-ut/patch-347 
Update agenda.php
 2021-06-14 14:27:56 +02:00
Laurent Destailleur
094315d708
Merge pull request #17926 from daraelmin/daraelmin-patch-1 
Clean code (use Adh constant and precise comment)
 2021-06-14 14:27:40 +02:00
Laurent Destailleur
3cacad795f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:26:07 +02:00
UT from dolibit
d2a19b530f
Update card.php 2021-06-14 14:24:21 +02:00
Laurent Destailleur
988dbd25b3 Fix sql syntax error 2021-06-14 14:24:18 +02:00
Laurent Destailleur
d0b033548c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
 2021-06-14 14:21:53 +02:00
Laurent Destailleur
46752186fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:15:53 +02:00
Laurent Destailleur
f988f4c352 Fix contact 2021-06-14 14:15:32 +02:00
UT from dolibit
45e0f8a7ee
Update card.php 2021-06-14 14:11:21 +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
91933dda4e
Merge pull request #17924 from dolibit-ut/patch-346 
Update bom_agenda.php
 2021-06-14 14:03:24 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
daraelmin
023453e73b
Update geo.php 2021-06-14 12:45:13 +02:00
daraelmin
8423ad823b
Update list.php 2021-06-14 12:41:32 +02:00
daraelmin
80f4278c42
Clean code 2021-06-14 12:24:58 +02:00
daraelmin
f5ec96bfce
Clean code (use Adh constant and precise comment) 2021-06-14 12:19:24 +02:00
UT from dolibit
2143395d70
Update agenda.php 2021-06-14 11:02:43 +02:00
UT from dolibit
ba4f7a66d3
Update bom_agenda.php 2021-06-14 10:55:29 +02:00
Adrien Raze
0f91c4cfa2 FIX : Allow to set bookmarks on list filtered by multiselect fields 2021-06-14 10:02:44 +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
Laurent Destailleur
aceeb9558f css 2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
465ee6e643 Fix security check on public pages 2021-06-13 20:37:53 +02:00
Laurent Destailleur
3eea92c6e6 Clean code 2021-06-13 20:36:12 +02:00
Laurent Destailleur
6f97a551ef Clean code 2021-06-13 20:32:11 +02:00
Laurent Destailleur
67e00e5cf5 Fix regression. Missing rollback. 2021-06-13 19:05:48 +02:00
Laurent Destailleur
95ee0f630d Fix phpcs 2021-06-13 18:10:04 +02:00
Francis Appels
a019996bc8 Fix create image thumbs on php 8.0 2021-06-13 17:36:51 +02:00
Laurent Destailleur
a72f66b456 Fix: dictionnaries are edited per entity 2021-06-13 16:32:06 +02:00
Laurent Destailleur
e0abbb2525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-13 16:24:21 +02:00
Laurent Destailleur
0cbcba7bc4
Merge pull request #17916 from frederic34/patch-16 
fix warnings
 2021-06-13 16:21:44 +02:00
Laurent Destailleur
205a6fac98
Merge pull request #17910 from frederic34/patch-11 
fix PDF BACKGROUND not found
 2021-06-13 16:21:05 +02:00
Laurent Destailleur
e9dc9b87b2
Merge pull request #17911 from frederic34/patch-12 
Update pdf_standard_recruitmentjobposition.modules.php
 2021-06-13 16:20:34 +02:00
Laurent Destailleur
48b604e4d5
Merge pull request #17905 from aspangaro/14a26 
Accountancy - Maxi debug of new functionnality date validation
 2021-06-13 16:19:44 +02:00
Laurent Destailleur
bc00a1a0f3
Merge pull request #17903 from dolibit-ut/patch-342 
Update llx_c_chargesociales.sql
 2021-06-13 16:17:04 +02:00
Laurent Destailleur
6708800d54
Merge pull request #17902 from frederic34/patch-9 
fix warnings
 2021-06-13 16:16:21 +02:00
Laurent Destailleur
172f1b5260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-13 16:16:17 +02:00
Laurent Destailleur
1c7f141f06
Merge pull request #17901 from frederic34/patch-8 
fix warning
 2021-06-13 16:16:06 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7 
fix warnings
 2021-06-13 16:15:58 +02:00
Laurent Destailleur
ec87115177
Merge pull request #17915 from frederic34/patch-15 
fix warning
 2021-06-13 16:15:51 +02:00
Laurent Destailleur
56a943b2ea
Merge pull request #17914 from frederic34/patch-14 
fix warnings
 2021-06-13 16:15:44 +02:00
Laurent Destailleur
c4cba43bad FIX Broken Access Control reported by Ahsan Aziz. 2021-06-13 16:15:05 +02:00
Frédéric FRANCE
20f6a34249
Update list.php 2021-06-13 16:12:46 +02:00
Frédéric FRANCE
d774e19afe
fix warnings 2021-06-13 16:10:45 +02:00
Frédéric FRANCE
791e4ab056
fix warning 2021-06-13 15:59:22 +02:00
Frédéric FRANCE
519d7f1d0f
fix warnings 2021-06-13 15:47:42 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning 2021-06-13 15:37:54 +02:00
Laurent Destailleur
497e9edbb2 Trans 2021-06-13 15:17:47 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Frédéric FRANCE
8a6517efb5
Merge remote-tracking branch 'upstream/develop' into patch-9 2021-06-13 08:54:57 +02:00
Frédéric FRANCE
e9913fa9d0
Merge remote-tracking branch 'upstream/develop' into patch-8 2021-06-13 08:53:44 +02:00
Alexandre SPANGARO
cf723d5120 Look a feel v14 CSS Amount 2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab Fix some date problems 2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
94850cd25b Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-13 06:06:33 +02:00
Laurent Destailleur
bb48da988b css 2021-06-13 01:32:14 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Frédéric FRANCE
6ff97ca2c6
Update pdf_standard_recruitmentjobposition.modules.php 2021-06-12 19:28:58 +02:00
Frédéric FRANCE
74e06353e9
fix PDF BACKGROUND not found 2021-06-12 19:25:47 +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
7cb647e5b5 Complete log 2021-06-12 17:02:24 +02:00
Laurent Destailleur
a8401ca30d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376 Fix merge 2021-06-12 15:44:03 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412 Update notified 2021-06-12 14:18:44 +02:00
UT from dolibit
c3a27b5ab9
Update llx_c_chargesociales.sql 2021-06-12 10:32:42 +02:00
Frédéric FRANCE
4138353d7f
fix warnings 2021-06-12 09:11:12 +02:00
Frédéric FRANCE
3ca8de8fab
fix warning 2021-06-12 07:20:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings 2021-06-12 07:12:45 +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
306b7779ff
Merge branch 'develop' into 11p1 2021-06-11 19:55:37 +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
d3815cbb93 css 2021-06-11 19:42:36 +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
c4d0086b8a Fix hook context names 2021-06-11 19:24:26 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod 
Fix jointure cabyprod
 2021-06-11 19:12:29 +02:00
Laurent Destailleur
663cf28eba Fix lost code during previous merge 2021-06-11 19:05:33 +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
cfbf051fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-11 18:47:09 +02:00
Laurent Destailleur
4fd9d36eb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-06-11 18:46:51 +02:00
Laurent Destailleur
65f8405ca4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-11 18:44:45 +02:00
Laurent Destailleur
6bf9a72dab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-11 18:44:37 +02:00
Laurent Destailleur
eefc6ddf83 Fix phpcs 2021-06-11 18:44:01 +02:00
Laurent Destailleur
06201fa9bb
Merge pull request #17848 from atm-greg/FIX_update_only_vat_on_multiprice 
verify vat change to update multiprice
 2021-06-11 18:22:40 +02:00
Laurent Destailleur
4e66e134bd
Update price.php 2021-06-11 18:21:00 +02:00
Laurent Destailleur
4cde4f6162
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card 
NEW do actions hook on bank card
 2021-06-11 18:18:06 +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
a8f11fec31
Update perweek.php 2021-06-11 18:12:39 +02:00
Laurent Destailleur
057d91698f
Update perday.php 2021-06-11 18:11:55 +02:00
Laurent Destailleur
0315f45198
Update permonth.php 2021-06-11 18:10:57 +02:00
Laurent Destailleur
bdded2af17
Update movement_list.php 2021-06-11 18:09:17 +02:00
Laurent Destailleur
c1745c6fc3
Merge pull request #17881 from frederic34/patch-9 
fix warnings
 2021-06-11 18:03:54 +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
ac965bf49a FIX #16551 2021-06-11 17:40:04 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
c2b910f6ed Clean code 2021-06-11 15:08:54 +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
52f0de00f6 Fix missing fields 2021-06-11 13:17:22 +02:00
Laurent Destailleur
a88efc9065 Fix permission on produce and consume 
Missing API to produce
 2021-06-11 09:58:03 +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
Marc de Lima Lucio
3f72f9b544 FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment 2021-06-10 23:29:37 +02:00
Marc de Lima Lucio
96656ff148 FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment 2021-06-10 23:26:33 +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
86eea2c4fc
Update list.php 2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings 2021-06-10 20:53:29 +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
77efbda148 Fix responsive 2021-06-10 20:04:21 +02:00
Laurent Destailleur
4e87a08282 Try fix for #17866 2021-06-10 19:02:53 +02:00
Laurent Destailleur
e938d875fb FIX #17855 2021-06-10 18:34:43 +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
8065283f28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-10 16:53:27 +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
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction 
bugfix/supplierBankTransfertWrongCodeCheckMassAction
 2021-06-10 16:44:32 +02:00
Laurent Destailleur
693ac3eab6 Code comment 2021-06-10 16:38:09 +02:00
Laurent Destailleur
1950e50c89 Fix test 2021-06-10 16:31:28 +02:00
Laurent Destailleur
548e11d3d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-10 16:30:46 +02:00
Alexis LAURIER
03cd88d145 bugfix/supplierBankTransfertWrongCodeCheckMassAction 2021-06-10 16:29:56 +02:00
Laurent Destailleur
c8c9fb7700 FIX #17847 2021-06-10 16:29:30 +02:00
lvessiller
ed53301cec NEW do actions hook on bank card 2021-06-10 16:18:20 +02:00
Laurent Destailleur
1798707cce
Merge pull request #17703 from tuxgasy/Fix_new_honorific_title_label 
No try to translate label field in dictionary for new
 2021-06-10 15:38:55 +02:00
Laurent Destailleur
5d6735f364
Merge pull request #17826 from ptibogxiv/patch-428 
Fix date_start of last subscription
 2021-06-10 13:01:07 +02:00
Laurent Destailleur
8cfe957962
Merge branch 'develop' into patch-7 2021-06-10 13:00:16 +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
b7ba9df6b4
Update societe.class.php 2021-06-10 12:59:04 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
c013b397a7
Merge pull request #17833 from frederic34/patch-8 
fix warning
 2021-06-10 12:53:24 +02:00
Laurent Destailleur
4fb568e5aa
Merge pull request #17838 from dolibit-ut/patch-340 
Update llx_c_chargesociales.sql
 2021-06-10 12:52:24 +02:00
Laurent Destailleur
5a6a3561b3
Merge pull request #17834 from frederic34/knowledge 
clean code
 2021-06-10 12:52:00 +02:00
Laurent Destailleur
0c6f3a2616
Merge pull request #17862 from atm-gauthier/fix_rounding_on_formatted_tags 
FIX : auto rounding on "_FORMATED_" tags
 2021-06-10 12:50:50 +02:00
Laurent Destailleur
d3c4cf50ca
Merge pull request #17846 from frederic34/patch-9 
avoid fatal error
 2021-06-10 12:22:36 +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
95bea52984
Merge pull request #17854 from frederic34/patch-11 
add warning if outstanding limit is exceeded
 2021-06-10 12:19:50 +02:00
Laurent Destailleur
f5be9b6244
Merge pull request #17859 from aspangaro/12p14 
FIX Missing link to language file
 2021-06-10 12:19:19 +02:00
Laurent Destailleur
85a8a66545
Merge pull request #17856 from FHenry/dev_fix_imagnethumbnail_project_files 
fix: #17827
 2021-06-10 12:18:21 +02:00
Laurent Destailleur
9ed7a3a5c5
Merge pull request #17863 from marc-dll/11.0_FIX_holiday_massaction_delete_right 
FIX: holiday list: bad right for mass deletion
 2021-06-10 12:13:10 +02:00
Laurent Destailleur
729c12a8e4
Merge pull request #17864 from DorianVabre/FIX_11.0_CSMSFile_count 
Fix: using strlen() instead of count() to measure a message length on CSMSFile
 2021-06-10 12:12:43 +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
c0c773dd1d css 2021-06-10 11:32:09 +02:00
Alexandre SPANGARO
08186fdff1 Fix warning - search_societe is already present 2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60 FIX Customer invoice list - Pagination lost search_date_xxx information 2021-06-10 06:22:03 +02:00
stickler-ci
17bdd0b5bc Fixing style errors. 2021-06-10 04:03:51 +00:00
Alexandre SPANGARO
3d26ad4cf8 NEW Add field date from/to in supplier invoice list 2021-06-10 05:59:29 +02:00
Laurent Destailleur
53af424a3d Fix total tva 2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b Fix total -> total_ht 2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5 Fix missing user creation/modif of template invoice 2021-06-10 01:56:20 +02:00
Laurent Destailleur
4c89a1146c Fix popup 2021-06-10 01:13:50 +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
3cc478b133 Fix use of get url 2021-06-10 00:13:23 +02:00
Laurent Destailleur
067f37e22e Clean code 2021-06-10 00:09:38 +02:00
Laurent Destailleur
7b31ef0ff3 Fix warnings 2021-06-10 00:00:49 +02:00
Laurent Destailleur
9b7795dc44 Debug v14 2021-06-09 23:55:56 +02:00
Laurent Destailleur
f3d54aada5 Clean code 2021-06-09 23:48:28 +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
c00bef83a8 Fix php unit 2021-06-09 18:05:56 +02:00
Laurent Destailleur
16f1210e8a Fix phpcs 2021-06-09 17:51:22 +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
d4ca6bf42a Clean code 2021-06-09 13:56:03 +02:00
Laurent Destailleur
e915e3403c Trans 2021-06-09 13:36:37 +02:00
Laurent Destailleur
458ef9f8da Fix security test 2021-06-09 13:31:00 +02:00
Laurent Destailleur
997674aebc Fix trans 2021-06-09 13:15:47 +02:00
Laurent Destailleur
a78d29bb71 Fix trans 2021-06-09 13:05:32 +02:00
Laurent Destailleur
14e3d04e25 Add more info on security page 2021-06-09 13:02:17 +02:00
Laurent Destailleur
c375668ab6 Clean code 2021-06-09 12:41:53 +02:00
Marc de Lima Lucio
5d9aa40065 FIX: holiday list: bad right for mass deletion 2021-06-09 12:40:34 +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
Alexandre SPANGARO
a4f3792cec FIX Missing link to language file 2021-06-09 07:42:05 +02:00
Laurent Destailleur
cfa268e0d3 Fix we must add total vat on cash fence receipts (Ticket Z) 2021-06-09 04:13:57 +02:00
Laurent Destailleur
f17e7a6979 Add more info 2021-06-09 03:54:19 +02:00
Laurent Destailleur
27f803cab0 Fix receipt of cash fence must contains more legal information 2021-06-09 03:35:22 +02:00
Florian HENRY
71dbb8733d fix: #17827 2021-06-08 20:18:31 +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
Frédéric FRANCE
af6bbe23ca
add warning if outstanding limit is exceeded 2021-06-08 17:39:13 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
facf594b2d FIX Date of invoice generated from membership must be current date 2021-06-08 16:01:26 +02:00
Laurent Destailleur
6eab0f5661 Fix css 2021-06-08 15:49:26 +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
Frédéric FRANCE
4e530c2486
Update card.php 2021-06-08 12:05:45 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php 2021-06-08 12:01:05 +02:00
Laurent Destailleur
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00
atm-greg
37433ffee7 verify vat change to update multiprice 2021-06-08 11:39:04 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error 2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3 FIX : need to add payment sum to getlibstatus function in object linked block 2021-06-08 10:27:33 +02:00
Laurent Destailleur
cac63ddd3f Add missing translation 2021-06-07 12:16:11 +02:00
Laurent Destailleur
0144d6c0fd Inventory is now stable feature 2021-06-07 11:30:46 +02:00
Quentin VIAL-GOUTEYRON
2a4f6882c5 Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod 2021-06-07 10:11:19 +02:00
Quentin VIAL-GOUTEYRON
af913cd29f remove and 2021-06-07 10:10:42 +02:00
stickler-ci
98aa374185 Fixing style errors. 2021-06-07 08:10:05 +00:00
Laurent Destailleur
4f6a5cf5f7 Debug v14 2021-06-07 10:08:31 +02:00
Quentin VIAL-GOUTEYRON
80af5e2216 keep where but remove join 2021-06-07 10:05:24 +02:00
UT from dolibit
2dbf9537b3
Update llx_c_chargesociales.sql 2021-06-07 08:59:47 +02:00
Laurent Destailleur
beca3c8ad3 Debug v14 2021-06-07 01:51:56 +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
a06fb441d3
clean code 2021-06-06 21:40:47 +02:00
Alexandre SPANGARO
86331c1b7e Merge branch '11.0' into 11p1 2021-06-06 21:36:30 +02:00
Frédéric FRANCE
a586afd8b3
clean code 2021-06-06 21:35:39 +02:00
Alexandre SPANGARO
ffb1b232d4 Fix Withdraw - link is missing in llx_bank_url when the debit is rejected 2021-06-06 21:27:48 +02:00
Frédéric FRANCE
f3a3ce90e1
Update partnership_card.php 2021-06-06 21:18:23 +02:00
Frédéric FRANCE
d54d4da8cd
Update setup.php 2021-06-06 19:18:02 +02:00
Frédéric FRANCE
a47df82468
fix warning 2021-06-06 19:14:42 +02:00
Frédéric FRANCE
8401fa3ce7
add trigger member 2021-06-06 17:57:48 +02:00
Frédéric FRANCE
8a359c9009
Update partnership.class.php 2021-06-06 17:34:03 +02:00
Frédéric FRANCE
ccc35326a5
Update partnershiputils.class.php 2021-06-06 17:25:44 +02:00
Frédéric FRANCE
594cd90c4b
Update partnershipindex.php 2021-06-06 17:22:20 +02:00
Frédéric FRANCE
b1ff123155
Update partnership_note.php 2021-06-06 17:19:20 +02:00
Frédéric FRANCE
0eb61a6063
Update partnership_list.php 2021-06-06 17:17:50 +02:00
Frédéric FRANCE
4ac3576a74
Update partnership_document.php 2021-06-06 17:16:27 +02:00
Frédéric FRANCE
5fecaa2a5b
Update partnership_contact.php 2021-06-06 17:15:36 +02:00
Frédéric FRANCE
83cd127f0b
Update partnership_card.php 2021-06-06 17:14:02 +02:00
Frédéric FRANCE
cc24013d42
Update partnership_agenda.php 2021-06-06 17:13:18 +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
46a06f8e95 Fix phpcs 2021-06-06 16:37:45 +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
Alexandre SPANGARO
51bce78e6e NEW Add field date start/end from/to in expense report list 2021-06-06 06:05:47 +02:00
Laurent Destailleur
92b6425ce0 Debug v14 2021-06-05 18:20:07 +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
ptibogxiv
36accba5c9
Fix date_start of last subscription 2021-06-05 14:43:40 +02:00
Laurent Destailleur
4695bbbd60 Trans 2021-06-05 12:59:19 +02:00
Laurent Destailleur
be97d66f5b Look and feel v14 2021-06-05 12:58:14 +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
865bf3b849 CSS 2021-06-05 02:42:49 +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
b77f2be2e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-05 02:14:16 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks 
New Hooks to rename Supplier Orders statuses
 2021-06-05 02:11:29 +02:00
Laurent Destailleur
39adaec7eb Fix var not found 2021-06-05 01:29:24 +02:00
Laurent Destailleur
3e53ab5bfe Fix scrutinizer 2021-06-05 01:17:16 +02:00
Laurent Destailleur
5d063ab880 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php 2021-06-05 01:04:09 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php 2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php 2021-06-05 00:53:07 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription 
#Fix #17743 - token was hashed with membersubscription

for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
 2021-06-04 23:14:31 +02:00
TuxGasy
56bb2bbd14 On dict, test $obj->code if empty before translation 2021-06-04 17:10:26 +02:00
Laurent Destailleur
0147ffa737 Fix css 2021-06-04 14:38:22 +02:00
Laurent Destailleur
e8aec4824b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 14:37:05 +02:00
Laurent Destailleur
2182e7fd54 Look and feel v14 2021-06-04 14:36:52 +02:00