lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99,615 Commits 43 Branches 150 Tags 886 MiB
38ef028310
Commit Graph

87897 Commits

Author SHA1 Message Date
Laurent Destailleur
90443e26ac
Merge pull request #17660 from gmilad/gmilad-fix-17608-b11 
Fix issue #17608 for branch 11
 2021-05-20 14:30:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1 
Compatibility phpv8
 2021-05-20 14:29:18 +02:00
Laurent Destailleur
30ab0b05b7
Update list.php 2021-05-20 14:28:43 +02:00
Laurent Destailleur
eec1fefaa5
Update list.php 2021-05-20 14:25:54 +02:00
Laurent Destailleur
2604b8f9b5
Update list.php 2021-05-20 14:18:00 +02:00
Laurent Destailleur
b71eb6b75e
Merge pull request #17668 from atm-john/13.0_fix_dirt 
FIX : Remove forgotten  echo
 2021-05-20 14:14:25 +02:00
Laurent Destailleur
a0dc991fb1
Merge pull request #17672 from dolibit-ut/patch-331 
Update llx_00_c_country.sql
 2021-05-20 14:13:58 +02:00
Laurent Destailleur
1414a24fdd
Merge pull request #17671 from dolibit-ut/patch-330 
Update llx_20_c_departements.sql
 2021-05-20 14:13:35 +02:00
Laurent Destailleur
854292b77e
Merge pull request #17665 from frederic34/patch-4 
Fix issue when loading external libs (pb with autoloader conflict and luracast)
 2021-05-20 14:06:27 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var 
fix: change societe by company varaible name in all file
 2021-05-20 13:54:01 +02:00
Laurent Destailleur
c80c261db5
Merge pull request #17684 from FHenry/dev_fix_inventorylink_into_stockmvt 
add inventory link into mvt stock list
 2021-05-20 13:52:54 +02:00
Laurent Destailleur
1ada0ddcb1
Merge pull request #17682 from frederic34/patch-5 
complete tooltip product
 2021-05-20 13:52:25 +02:00
Florian HENRY
5e6d6ccf67 same bug on invoie list 2021-05-20 13:45:52 +02:00
Florian HENRY
d83dbd1922 fix: on mass action confirm box tag filter must not make LEFT JOIN 2021-05-20 13:24:30 +02:00
Florian HENRY
7874be6e37 bad comment remove 2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7 fix: change societe by company varaible name in all file 2021-05-20 12:36:26 +02:00
Florian HENRY
1e6f3d0624 add inventory link into mvt stock list 2021-05-20 12:30:02 +02:00
Laurent Destailleur
a3c28edfbb Fix regenerate wrapper when rebuilding cache 2021-05-20 10:34:49 +02:00
Laurent Destailleur
1a8b10328f Fix title of rss file 2021-05-20 10:07:50 +02:00
Laurent Destailleur
dc3b5846fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 09:24:09 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
03c81acb42
Merge pull request #17676 from dolibit-ut/patch-332 
Update mo_agenda.php
 2021-05-20 09:18:16 +02:00
Laurent Destailleur
7390f4653a
Merge pull request #17674 from frederic34/phpcs_enable 
fix phpcs was disabled
 2021-05-20 09:18:00 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen 2021-05-20 08:50:15 +02:00
Frédéric FRANCE
0d8c75268e
Update card.php 2021-05-19 23:32:14 +02:00
Frédéric FRANCE
b214fcb5e0
complete tooltip product 2021-05-19 23:29:35 +02:00
Laurent Destailleur
20c3ebeb51 Make SimplePOS deprecated 2021-05-19 19:46:46 +02:00
Sylvain Legrand
70c85cfd72 Merge branch '13.0' of https://github.com/SylvainLegrand/dolibarr into 13.0 2021-05-19 19:09:27 +02:00
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +02:00
stickler-ci
b5ac78d9a0 Fixing style errors. 2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642 Update societe.class.php 2021-05-19 18:47:07 +02:00
UT from dolibit
50637ab76b
Update mo_agenda.php 2021-05-19 16:07:27 +02:00
Frédéric FRANCE
83521311dc
fix phpcs was disabled 2021-05-19 15:48:08 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7 css 2021-05-19 15:00:44 +02:00
Laurent Destailleur
fdf6dd2d9c css 2021-05-19 14:50:41 +02:00
Laurent Destailleur
3550fa2be4 Fix css 2021-05-19 14:48:30 +02:00
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
Laurent Destailleur
8f5c898dae CSS 2021-05-19 14:13:42 +02:00
Laurent Destailleur
173ef6e877 Look and feel v14 2021-05-19 14:04:01 +02:00
UT from dolibit
f9fb296ea6
Update llx_00_c_country.sql 
République Tchèque  ->  Czech Republic 
Danemark  ->  Denmark 
Djibouti = Djibouti 
Dominique  ->  Dominica 
République Dominicaine  ->  Dominican Republic
Equateur  ->  Republic of Ecuador 
Egypte  ->  Egypt 
Salvador  ->  El Salvador 
Guinée Equatoriale  ->  Equatorial Guinea 
Erythrée  ->  Eritrea
 2021-05-19 13:59:36 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
UT from dolibit
82e819d059
Update llx_20_c_departements.sql 
USA
 2021-05-19 13:43:13 +02:00
Laurent Destailleur
026cc1b35a Debug for smartphone 2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
e472d2d5d1 Fix bad permission position for external modules 2021-05-19 12:44:26 +02:00
Laurent Destailleur
059c286262 css 2021-05-19 12:19:18 +02:00
Laurent Destailleur
75f7ab41f0 css 2021-05-19 12:13:21 +02:00
Laurent Destailleur
90835eaab4 css 2021-05-19 12:08:17 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
Laurent Destailleur
7b4ed859eb css 2021-05-19 11:57:12 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
Laurent Destailleur
78cf2b59c8 Debug feature copy-paste on smarpthone 2021-05-19 11:47:58 +02:00
ATM john
5fd02992c0 Remove forgotten echo 2021-05-19 10:26:04 +02:00
Alexandre SPANGARO
f86e10b453 FIX wrong variable fk_code_ventilation register for addline 2021-05-19 06:37:02 +02:00
Frédéric FRANCE
dffb244776
Update AutoLoader.php 2021-05-18 21:04:43 +02:00
Laurent Destailleur
4d42235670 Complete experimental module knowledge management 2021-05-18 20:46:14 +02:00
Givriz
1cf7d0cee7 Compatibility phpv8 2021-05-18 20:13:26 +02:00
gmilad
4bb18db905
Fix issue #17608 for branch 11 
Fix issue #17608 for branch 11
 2021-05-18 19:53:35 +02:00
gmilad
57732d4265
Fix issue #17608 for branch 10 
Fix issue #17608 for branch 10
 2021-05-18 19:45:15 +02:00
Laurent Destailleur
8e39eff180 Look and feel v14 2021-05-18 18:18:00 +02:00
Florian Mortgat
6cccd77508 FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance) 2021-05-18 17:57:23 +02:00
Laurent Destailleur
f99b1b261a Fix phpcs 2021-05-18 17:25:31 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918 css 2021-05-18 17:00:20 +02:00
Laurent Destailleur
ba595d8b74 Minor fix 2021-05-18 16:56:57 +02:00
Laurent Destailleur
2974a23332 css 2021-05-18 16:54:31 +02:00
Laurent Destailleur
a829d8cedc css 2021-05-18 16:31:59 +02:00
Laurent Destailleur
f3803bab91 Responsive 2021-05-18 16:28:30 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
fbaba3b81b css 2021-05-18 14:13:08 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
7569275d28 Fix generation of invoice 2021-05-18 13:36:07 +02:00
Laurent Destailleur
74f35177ff Fix group by 2021-05-18 13:20:14 +02:00
Laurent Destailleur
303d60a0bd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c Fix sql error 2021-05-18 12:44:56 +02:00
Laurent Destailleur
40ed79aa06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-18 12:44:10 +02:00
Laurent Destailleur
5babd107a0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:43:52 +02:00
Laurent Destailleur
23514c957c
Merge pull request #17641 from WimpyMan/fix_sql_projects 
html.form.class.php: Fixed SQL error (projects)
 2021-05-18 12:36:18 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php 2021-05-18 12:35:30 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list 2021-05-18 12:27:30 +02:00
Laurent Destailleur
a34401aacb
Merge pull request #17646 from aspangaro/14b10 
FIX Social contrib. - Missing language file
 2021-05-18 12:16:14 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list 
Add popup thirdparty info in list
 2021-05-18 12:15:51 +02:00
Laurent Destailleur
7ececbb174
Merge pull request #17645 from aspangaro/14b9 
Fix Title salary
 2021-05-18 12:12:40 +02:00
Laurent Destailleur
6d34c34cb5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b FIx #17651 2021-05-18 11:58:49 +02:00
Laurent Destailleur
2771d50ffe code comment 2021-05-18 11:55:56 +02:00
Gauthier PC portable 024
078fc892a2 FIX : cast int 2021-05-18 09:01:55 +02:00
Alexandre SPANGARO
9b0988e7be FIX Social contrib. - Missing language file 2021-05-18 08:40:28 +02:00
Alexandre SPANGARO
90d7a851b4 Merge remote-tracking branch 'upstream/develop' into 14b9 2021-05-18 04:19:54 +02:00
Laurent Destailleur
f51e892a97 Fix phpcs 2021-05-18 02:06:35 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Anthony Berton
6fe9fe330d delete fetch 2021-05-17 23:54:31 +02:00
Laurent Destailleur
ba0e95a4ff FIX huntr CWE-79 2021-05-17 23:47:16 +02:00
Anthony Berton
58db723502 thirdparty info popup list 2021-05-17 23:27:33 +02:00
Alexandre SPANGARO
91b8b6a600 Fix Title salary info card 2021-05-17 22:41:00 +02:00
Alexandre SPANGARO
c3c760c269 Fix Title salary document card 2021-05-17 22:18:46 +02:00
Alexandre SPANGARO
4236471a6f Fix Title salary card 2021-05-17 22:12:01 +02:00
Laurent Destailleur
de6134965b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 19:50:19 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Laurent Destailleur
d3ece31969 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:29:03 +02:00
Laurent Destailleur
df2297bca3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72 Fix phpcs 2021-05-17 19:19:26 +02:00
Bastien Schils
1a38d075a6 html.form.class.php: Fixed SQL error (projects) 
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
 2021-05-17 18:35:50 +02:00
Anthony Berton
31cd71d8a3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list 2021-05-17 18:34:41 +02:00
Anthony Berton
9dcf2044a9 Update list.php 2021-05-17 18:33:27 +02:00
Anthony Berton
0b7f474dd3 look_feel user author in list 2021-05-17 18:04:21 +02:00
Laurent Destailleur
51a8ef8853
Merge pull request #17638 from bb2a/add_infos_user_popup 
Modif info in user popup info
 2021-05-17 16:30:41 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1 
Compatibility phpv8
 2021-05-17 16:29:49 +02:00
Laurent Destailleur
caea6f8d6c
Update listevents.php 2021-05-17 16:29:00 +02:00
Laurent Destailleur
caf1c625a3
Update listevents.php 2021-05-17 16:28:19 +02:00
Laurent Destailleur
c8758c53d2
Update listevents.php 2021-05-17 16:27:14 +02:00
Laurent Destailleur
68fe68b844
Update listevents.php 2021-05-17 16:25:25 +02:00
Laurent Destailleur
3c9d8bc931 Fix perms on API user 2021-05-17 16:17:03 +02:00
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +02:00
Anthony Berton
9bde70feba Update user.class.php 2021-05-17 16:08:48 +02:00
Laurent Destailleur
c0274e74ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 15:52:48 +02:00
Laurent Destailleur
bffdc8fa95
Merge pull request #17587 from FHenry/dev_fix_sale_top_menu_supplieronly 
fix: when only supplier module is Active top menu should be displayed
 2021-05-17 13:48:03 +02:00
Laurent Destailleur
4a488ad60a
Update eldy.lib.php 2021-05-17 13:47:48 +02:00
Laurent Destailleur
4e5a3a22c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995 Add missing property 2021-05-17 13:36:27 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception 
Fix: Add test to delete supplier order if reception exist
 2021-05-17 13:22:34 +02:00
stickler-ci
a3aba28c95 Fixing style errors. 2021-05-17 10:06:41 +00:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Dorian Vabre
547f1dd370 Fix: user rest api rights 2021-05-17 11:54:53 +02:00
Laurent Destailleur
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496 Fix colors 2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Laurent Destailleur
35c27b8eb8
Merge pull request #17588 from frederic34/completeTabHead 
add sample completeTabHead for template modulebuilder
 2021-05-17 10:29:51 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1 
Fix  #17475 : Add of List-Unsubscribe in mass emailing
 2021-05-17 10:23:21 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document 
Add phone and address in popup Thirdparty info
 2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php 2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php 2021-05-17 10:14:14 +02:00
Laurent Destailleur
296c1c2978
Merge pull request #17583 from AisukoWasTaken/develop 
Fix SQL error for Panama Provinces
 2021-05-17 10:09:15 +02:00
Laurent Destailleur
979b66177d
Merge pull request #17589 from dolibit-ut/patch-321 
Update llx_00_c_country.sql
 2021-05-17 10:07:23 +02:00
Laurent Destailleur
6217d83846
Merge pull request #17599 from fbagnol/develop 
Add soc in categories contacts list
 2021-05-17 09:54:26 +02:00
Laurent Destailleur
f95f0748e3
Update viewcat.php 2021-05-17 09:54:04 +02:00
Laurent Destailleur
fd6147578a
Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish 
Fix use supplier relative discount in replenish order creation
 2021-05-17 09:44:39 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f FIX #17602 2021-05-17 09:25:18 +02:00
Florian HENRY
6ffbc2744e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_sale_top_menu_supplieronly 2021-05-17 09:22:51 +02:00
Laurent Destailleur
c013a22008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 09:20:40 +02:00
Laurent Destailleur
88d1ce7e49 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 09:19:39 +02:00