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
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance 
fix: export balance with double quote
 2021-05-25 19:36:57 +02:00
Laurent Destailleur
40a6159bb8
Merge pull request #17714 from Hystepik/develop#3 
Fix #11882 : fix of module opensurvey for datesurvey
 2021-05-25 19:32:20 +02:00
lmarcouiller
263f1c8101 Fix #11882 : fix of module opensurvey for datesurvey 2021-05-25 17:26:56 +02:00
Laurent Destailleur
b9de8561a9 Fix regression 2021-05-25 15:59:36 +02:00
Laurent Destailleur
d18fc6ca3c Fix init 2021-05-25 15:38:12 +02:00
Laurent Destailleur
a840afa72a Fix missing entry into table 2021-05-25 15:24:28 +02:00
Laurent Destailleur
71b35ef0e5 Fix regression - can't reset parent company 2021-05-25 12:11:06 +02:00
Laurent Destailleur
fb6aea72b8 Fix syntax error 2021-05-25 12:06:29 +02:00
Laurent Destailleur
857be16e12 Log 2021-05-25 12:03:38 +02:00
Laurent Destailleur
fedf7645b1 Fix regression, can't reset parent company. 2021-05-25 12:02:33 +02:00
Laurent Destailleur
97154f8267 Fix timezone into widgets 2021-05-25 00:29:32 +02:00
Laurent Destailleur
dd48c3ee9d Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__) 2021-05-25 00:08:06 +02:00
Laurent Destailleur
bb64a25638 Fix CWE-269 - huntr - Fix set of email without edit user permission 2021-05-24 22:11:24 +02:00
Laurent Destailleur
31af74f852 FIX CWE-269 - huntr - Can download files of an agenda event 2021-05-24 20:07:04 +02:00
Laurent Destailleur
d4310f49c4 FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES 2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group 
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
 2021-05-24 18:01:27 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
r3dge
647997af28 fixing error on date 2021-05-23 18:15:00 +02:00
r3dge
f81136231a fixing PUT request for donation update 2021-05-23 18:09:10 +02:00
jove@bisquerra.com
83245d321b FIX Search bug when hide product images 2021-05-23 09:55:01 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php 
Fix #16100
End French Forum : 

https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
 2021-05-22 21:28:45 +02:00
TuxGasy
2fdd8486c9 No try to translate label field in dictionary for new 2021-05-22 06:13:16 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Laurent Destailleur
4df70dc3f4 Fix CWE-269 huntr 2021-05-21 16:22:45 +02:00
Dorian Vabre
12d10adc17 Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-05-21 16:02:22 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
r3dge
67cab8c1f2 bug fix : replacing orders by donations and setting required field to allow post action in rest API for url donations. See issue #17700 2021-05-21 16:01:04 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Florian HENRY
609d405685 fix: formconfim if type radio must be :checked to get correct value 2021-05-21 15:38:03 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Laurent Destailleur
b5af3b17d5 Update doc 2021-05-21 14:03:52 +02:00
UT from dolibit
a5001899eb
Update llx_00_c_country.sql 
Nouvelle-Calédonie  ->  New Caledonia 
Nouvelle-Zélande  ->  New Zealand 
Nicaragua = Nicaragua 
Niger = Niger 
Nigeria = Nigeria 
Nioué  ->  Niue 
Ile Norfolk  ->  Norfolk Island 
Mariannes du Nord  ->  Northern Mariana Islands 
Norvège  ->  Norway 
Oman = Oman 
Pakistan = Pakistan 
Palaos  ->  Palau 
Territoire Palestinien Occupé  ->  Palestinian territories 
Panama = Panama 
Papouasie-Nouvelle-Guinée  ->  Papua New Guinea 
Paraguay = Paraguay 
Peru = Peru 
Philippines = Philippines 
Iles Pitcairn  ->  Pitcairn Islands 
Pologne  ->  Poland 
Porto Rico  ->  Puerto Rico 
Qatar = Qatar
 2021-05-21 13:32:09 +02:00
Laurent Destailleur
fbe491c4da FIX CWE-79 huntr 2021-05-21 12:17:56 +02:00
Alexandre SPANGARO
ac9d9e9314 NEW Add hook on balance list 2021-05-21 07:04:58 +02:00
Laurent Destailleur
cfd035e1de css 2021-05-20 21:25:36 +02:00
Laurent Destailleur
7833ac8fb0 Code comment 2021-05-20 17:53:28 +02:00
stickler-ci
6f050fc23a Fixing style errors. 2021-05-20 15:48:04 +00:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Dorian Vabre
bbce806cb5 typo 2021-05-20 17:32:48 +02:00
Dorian Vabre
83555da795 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Laurent Destailleur
c561669edf Code comment 2021-05-20 17:02:22 +02:00
Dorian Vabre
ab4ae85eb8 fix: getpost exportagenda apha to alpha 2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622 wip 2021-05-20 16:30:49 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
eb0f4d9765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:26:26 +02:00
Laurent Destailleur
93501a1147 Fix phpcs 2021-05-20 15:25:56 +02:00
Laurent Destailleur
3359ae93d8
Merge pull request #17654 from atm-adrien/FIX_missing_hooks 
FIX : Missing hook in cibles.php (for mailing)
 2021-05-20 15:24:12 +02:00
Laurent Destailleur
5191a419d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 14:58:50 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Laurent Destailleur
7a24d6399b
Merge pull request #17680 from SylvainLegrand/13.0 
avoid an infinite loop between a parent company and a branch when updating customer rates
 2021-05-20 14:54:28 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php 2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf Fixing style errors. 2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php 2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php 2021-05-20 14:38:24 +02:00
Laurent Destailleur
5eeb7d474c
Merge pull request #17655 from ATM-Consulting/FIX_13.0_wrong_error_message_MAIN_DISABLE_ALL_MAILS 
FIX 13.0 - wrong error message for mail sending failure
 2021-05-20 14:33:40 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1 
FIX wrong variable fk_code_ventilation register for addline
 2021-05-20 14:31:52 +02:00
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
Damien BENOIT
38a5dfb263
Update listevents.php 
Added $optioncss
 2021-05-18 15:26:55 +02:00
Damien BENOIT
e7ac39fe35
Update modules.php 
Added $param
 2021-05-18 15:23:29 +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
Givriz
6bbd6db84b Compatibility phpv8 2021-05-17 18:39:08 +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
Florian HENRY
6f3d19b7b6 dol_concatdesc better than concat operator 2021-05-17 15:12:25 +02:00
Antonin MARCHAL
779c868eae fix mistake and removed hookmanager unused 2021-05-17 13:48:21 +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
Antonin MARCHAL
c6aa078892 renamed LibStatut hook + removed useless hook 2021-05-17 13:46:01 +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
Florian HENRY
f95bd2f439 fixw that 2021-05-17 11:40:36 +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
Laurent Destailleur
af2f40cc18 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Laurent Destailleur
592cfb5e93
Merge pull request #17602 from fmarcet/11.0 
FIX: Impossible to add multiple localtax2
 2021-05-17 09:13:58 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426 
NEW report contact/adresses on credit note from invoice
 2021-05-17 09:12:12 +02:00
Laurent Destailleur
6a9fa11539
Merge branch 'develop' into 11.0-fix-LDAPposixAccount 2021-05-17 09:07:30 +02:00
Laurent Destailleur
8dc6241aee Clean dead code 2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7 Clean comment 2021-05-17 08:48:02 +02:00
Laurent Destailleur
242db33311
Merge pull request #17620 from atm-maxime/fix/hrm 
Fix quick create dropdown + translations
 2021-05-17 08:31:54 +02:00
stickler-ci
67fc5bce5f Fixing style errors. 2021-05-17 06:30:30 +00:00
Laurent Destailleur
6308c17c5f
Update main.inc.php 2021-05-17 08:30:12 +02:00
Laurent Destailleur
77bcd7ecff
Merge pull request #17628 from atm-maxime/fix/ticket3 
Fix missing substitutionarray on ticket presend
 2021-05-17 08:01:21 +02:00
Laurent Destailleur
d4162f3076
Update card.php 2021-05-17 08:00:33 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
stickler-ci
bdf876ead4 Fixing style errors. 2021-05-17 05:38:46 +00:00
Laurent Destailleur
dd88f9cd76
Update card.php 2021-05-17 07:37:01 +02:00
Laurent Destailleur
c36f231f41
Update card.php 2021-05-17 07:34:56 +02:00
Laurent Destailleur
ea78462167 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 07:33:37 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
6236721067
Merge pull request #17607 from fappels/14_selectwarehouses 
fix implode on string for formproduct loadwarehouse
 2021-05-17 07:20:15 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2 
Update box_dolibarr_state_board.php
 2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId 
Fix: properly set gid for Group LDAP synchro
 2021-05-17 07:14:25 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3 
avoid sql error with sql_mode=only_full_group_by
 2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php 2021-05-17 07:11:41 +02:00
Laurent Destailleur
3428c1f165
Merge pull request #17619 from atm-maxime/fix/usergroup_entity 
Fix entity was set to 0 on group creation (HOT FIX)
 2021-05-17 07:09:11 +02:00
Laurent Destailleur
7d0fa95d81
Update card.php 2021-05-17 07:08:45 +02:00
Laurent Destailleur
0cc519a26d
Merge pull request #17622 from atm-maxime/fix/expense_id 
Fix id of expense report must be before object fetch (HOT FIX)
 2021-05-17 07:01:25 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket 
Fix ticket when module societe not enabled
 2021-05-17 06:59:32 +02:00
Laurent Destailleur
c7fff29c54
Merge pull request #17623 from atm-maxime/fix/hrm_homepage 
Fix HRM homepage
 2021-05-17 06:58:57 +02:00
Laurent Destailleur
ea5d374f23
Update index.php 2021-05-17 06:57:21 +02:00
Laurent Destailleur
90d6f70bce Comment 2021-05-17 06:54:39 +02:00
Laurent Destailleur
78b38f75a1 Minor fixes 2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590 Add comment 2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
1fbd53993f Fix missing substitutionarray on ticket presend 2021-05-16 19:07:36 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422
Update box_dolibarr_state_board.php 
Global stats box is always enabled
 2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
78633ccb2b Fix expensereport and recruitment homepages 2021-05-16 16:20:46 +02:00
Maxime Kohlhaas
240137b768 Fix HRM homepage 2021-05-16 16:04:19 +02:00
Aisuko
3aa40e97cb Merge branch 'Dolibarr:develop' into develop 2021-05-16 13:56:01 +02:00
Maxime Kohlhaas
c820231363 Fix id of expense report must be before object fetch 2021-05-16 12:24:27 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php 2021-05-16 11:33:07 +02:00
Maxime Kohlhaas
c8b725165e Fix use img_picto in quick create dropdown 2021-05-16 11:16:07 +02:00
Maxime Kohlhaas
3c3613a71a Fix missing quick create holiday and expense report 2021-05-16 11:06:49 +02:00
Maxime Kohlhaas
baf0dda19c Fix missing load langs for my company info in user block 2021-05-16 10:52:51 +02:00
Maxime Kohlhaas
3859e7f00e Fix translations on expensereport list 2021-05-16 10:49:00 +02:00
Maxime Kohlhaas
e5e317bae3 Fix entity was set to 0 on group creation 2021-05-16 09:58:34 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
piernov
beff175de1
Fix use login for User homedir in LDAP 
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a homedir.
Always set a homedir in LDAP for the User class even if user does not have a firstname by using the login instead.
Additionally on Linux the login is typically used for the home directory rather than the first name.
It also avoids having accentuated or other special characters (commonly found in names) in the home directory path.
 2021-05-15 16:48:43 +02:00
piernov
014b34acc6
Fix default gid 65534 for User in LDAP 
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a gid.
Always set a gid in LDAP for the User class even if the user does not belong to any group.
By default 65534 which corresponds to the nobody group on major distributions (incl. Debian).
 2021-05-15 16:44:46 +02:00
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00
Anthony Berton
334f37052c Update card.php 2021-05-15 02:36:56 +02:00
Anthony Berton
1d7765ce12 update phone and address in popup 2021-05-15 02:29:15 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by 
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
 2021-05-14 18:30:56 +02:00
Maxime Kohlhaas
acadef72c1 Fix use supplier relative discount in replenish order creation 2021-05-14 18:01:22 +02:00
stickler-ci
50d4d28c14 Fixing style errors. 2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a FIX: Filter of the dates in the lists is lost 2021-05-14 13:50:12 +02:00
Francis Appels
009588e04d fix implode on string for formproduct loadwarehouse 2021-05-14 11:02:55 +02:00
Laurent Destailleur
a9ddf2a5ad Fix phpcs 2021-05-13 19:07:47 +02:00
Laurent Destailleur
d1f36ec20c Fix phpcs 2021-05-13 15:45:47 +02:00
Ferran Marcet
c577d1c51e FIX: Impossible to add multiple localtax2 2021-05-13 13:35:28 +02:00
stickler-ci
05ea8761a1 Fixing style errors. 2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice 
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
 2021-05-13 10:26:09 +02:00
stickler-ci
79b51baa3d Fixing style errors. 2021-05-12 22:46:09 +00:00
Frédéric Bagnol
8d035f5ec2
Add soc in categories contacts list 2021-05-13 00:40:56 +02:00
Laurent Destailleur
5917a9f73e Fix phpcs 2021-05-12 23:08:52 +02:00
Frédéric FRANCE
59e046112c
Merge remote-tracking branch 'upstream/develop' into completeTabHead 2021-05-12 22:57:23 +02:00
Laurent Destailleur
e471181089 css 2021-05-12 22:52:50 +02:00
Laurent Destailleur
097f493315 css 2021-05-12 22:43:47 +02:00
Laurent Destailleur
488f242e25 css 2021-05-12 22:42:10 +02:00
Laurent Destailleur
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +02:00
Laurent Destailleur
ba6e675273 css 2021-05-12 22:21:20 +02:00
Laurent Destailleur
19a203bd40 Fix amount of memberships 2021-05-12 22:09:06 +02:00
UT from dolibit
95a5e480a1
Update llx_00_c_country.sql 2021-05-12 21:55:31 +02:00
Laurent Destailleur
9eda9c1e21 Enhance setup 2021-05-12 19:55:16 +02:00
Laurent Destailleur
f504cbcec4 Fix log 2021-05-12 19:18:51 +02:00
Givriz
81d899947d Update listevents.php 2021-05-12 18:41:41 +02:00
Laurent Destailleur
aa2d85276e Debug v14 2021-05-12 18:38:22 +02:00
Frédéric FRANCE
23fe7d1b63
add sample completeTabHead 2021-05-12 18:29:56 +02:00
Laurent Destailleur
75bd440591 Trans 2021-05-12 18:29:02 +02:00
stickler-ci
ea0d860593 Fixing style errors. 2021-05-12 14:55:32 +00:00
Antonin MARCHAL
1bfcfc3a0c rename Hook and moved it into LibStatut method 2021-05-12 16:55:03 +02:00
Laurent Destailleur
866c9d012f Fix fetch for customer and vendor relative discount 2021-05-12 14:19:12 +02:00
Florian HENRY
394d43543d fix: when only supplier module is ON top menu should be displayed 2021-05-12 12:04:50 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00
Quentin VIAL-GOUTEYRON
56d78cf12a FIX missing town and zip filter in contract list sql request 2021-05-12 11:02:27 +02:00
Laurent Destailleur
cfded75d11 Debug v14 2021-05-12 09:27:04 +02:00
Laurent Destailleur
f334f2a255 Fix inventory 2021-05-12 09:22:49 +02:00
lmarcouiller
06c1817930 Update mailing-send script and mailling card 2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
b8254186ce Clean code 2021-05-12 09:07:36 +02:00
Laurent Destailleur
dd00feae00 Clean code 2021-05-12 08:57:06 +02:00
Laurent Destailleur
fac32ee913 Better performance 2021-05-12 08:54:36 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +02:00
Laurent Destailleur
dd7ed720e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-12 00:01:04 +02:00
Laurent Destailleur
49f7f85762 Fix example 2021-05-12 00:00:51 +02:00
Laurent Destailleur
8971fde420 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Aisuko Hakumei
8a4fd56b23 Fix SQL error for Panama Provinces 2021-05-11 22:54:26 +02:00
Laurent Destailleur
7454b8ff0b
Merge pull request #17581 from frederic34/patch-3 
fix phpcs
 2021-05-11 22:26:28 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php 2021-05-11 22:12:15 +02:00
Laurent Destailleur
60dd26f21d Fix do not lose selection if error 2021-05-11 22:10:40 +02:00
Frédéric FRANCE
4a735ccc4d
fix phpcs 2021-05-11 22:09:45 +02:00
Laurent Destailleur
3b0f79c3e2 Clean code 2021-05-11 21:46:19 +02:00
Laurent Destailleur
670b604d24 Clean code 2021-05-11 21:45:37 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields 
Stock product card traceability fields
 2021-05-11 21:40:50 +02:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2 
Fix #17491 : date extrafield filter works well now
 2021-05-11 21:15:50 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
207aa8550a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-11 21:02:38 +02:00
Laurent Destailleur
dc2c5aa0a8 Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
 2021-05-11 21:02:27 +02:00
Laurent Destailleur
5a81395ffa
Merge pull request #17474 from dolibit-ut/patch-318 
Update llx_20_c_departements.sql
 2021-05-11 20:51:35 +02:00
Laurent Destailleur
d576e56129
Merge pull request #17526 from daraelmin/daraelmin-V13-DarkMode-1 
Fix #17114 dark display for enabled module in dark mode
 2021-05-11 20:44:24 +02:00
Laurent Destailleur
8cf99448e1
Merge pull request #17523 from bb2a/warhouse_mod_stock_activ 
Warehouse filter if stock activate and not sending
 2021-05-11 20:43:28 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
8dc1e1cb33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	.travis.yml
	htdocs/societe/consumption.php
 2021-05-11 20:17:15 +02:00
Laurent Destailleur
971d611eb6 Fix phpcs 2021-05-11 20:12:25 +02:00
Laurent Destailleur
63db00486d Fix setup 2021-05-11 19:57:20 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy 
Fix missing FORCEMORPHY in new member form setup
 2021-05-11 19:52:35 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey 
New substitution key for member new form url in mailing
 2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete 
bug fix - deletion of invoice supplier payment
 2021-05-11 19:27:05 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode 
uniformize supplier cards
 2021-05-11 19:25:26 +02:00
Laurent Destailleur
6bec5d7e3c
Update document.php 2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae
Update contact.php 2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131
Update card.php 2021-05-11 19:21:38 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php 2021-05-11 19:21:08 +02:00
Laurent Destailleur
74de4edc42
Merge pull request #17531 from daraelmin/daraelmin-patch-1 
Fix vulnerability - Wrong permission in adherent card
 2021-05-11 19:17:33 +02:00
Laurent Destailleur
0ff473aba7
Update card.php 2021-05-11 19:15:30 +02:00
Laurent Destailleur
fe21c318d4
Merge pull request #17534 from ibuiv/patch-8 
Fix bug PMP per entity
 2021-05-11 19:13:53 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity 
add entity check on verif_dispo mod_codeclient_elephant
 2021-05-11 19:13:17 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks 
New Hooks for Supplier Order Card tabs
 2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch 
Fix edit-delete from dispatch card when reception activated.
 2021-05-11 19:03:18 +02:00
Laurent Destailleur
8024e769fd
Merge pull request #17552 from aspangaro/14b2 
Fix Title customer proposal
 2021-05-11 18:55:02 +02:00
Laurent Destailleur
fe4227d04d
Merge pull request #17546 from kastoras/fix_get_documents_response_problem 
Fix #17545 /get /documents response data problem
 2021-05-11 18:53:02 +02:00
Laurent Destailleur
3aac68d65b
Update ecmfiles.class.php 2021-05-11 18:52:49 +02:00
Laurent Destailleur
3cce99d706
Merge pull request #17548 from aspangaro/14b1 
FIX Migration script
 2021-05-11 18:50:43 +02:00
Laurent Destailleur
c37588025f
Update 13.0.0-14.0.0.sql 2021-05-11 18:50:02 +02:00
Laurent Destailleur
dce5ce66eb
Merge pull request #17563 from frederic34/filecheck 
align filecheck code
 2021-05-11 18:46:09 +02:00
Laurent Destailleur
e4aff1a97e
Merge pull request #17578 from frederic34/patch-4 
fix php8 warning
 2021-05-11 18:45:27 +02:00
Laurent Destailleur
fe9b6c0799
Merge pull request #17579 from frederic34/patch-5 
fix $db in class
 2021-05-11 18:45:01 +02:00
Laurent Destailleur
d4616ff0ac
Merge pull request #17549 from frederic34/patch-3 
Delete files not needed
 2021-05-11 18:44:34 +02:00
Laurent Destailleur
f5909be16f
Merge pull request #17551 from grandoc/new_branch_09_05_2021 
comment translation
 2021-05-11 18:43:31 +02:00
Frédéric FRANCE
dc90103526
Update document.php 2021-05-11 18:36:27 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class 2021-05-11 18:34:43 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning 2021-05-11 18:25:20 +02:00
Laurent Destailleur
5943f17b94
Merge pull request #17553 from aspangaro/14b3 
Fix Title company card
 2021-05-11 18:19:58 +02:00
Laurent Destailleur
f87f80b004
Merge pull request #17554 from aspangaro/14b4 
Fix Title customer order
 2021-05-11 18:19:11 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6 
Fix Title supplier proposal
 2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973
Merge pull request #17555 from andreubisquerra/develop 
NEW DOL_VALUE_PLACE tag in TakePOS template
 2021-05-11 18:17:01 +02:00
Laurent Destailleur
88ca25903d
Merge pull request #17559 from aspangaro/14b7 
Fix Title supplier order
 2021-05-11 18:15:02 +02:00
Laurent Destailleur
8a2a996595
Merge pull request #17562 from oscim/patch-42 
Update card.php
 2021-05-11 18:10:07 +02:00
Laurent Destailleur
ce8d6c77ed
Merge pull request #17565 from ksar-ksar/patch-4 
FIX #13955
 2021-05-11 18:09:14 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-11 18:09:05 +02:00
Frédéric FRANCE
0c997e4260
Merge remote-tracking branch 'upstream/develop' into filecheck 2021-05-11 18:06:17 +02:00
Frédéric FRANCE
4c77e07a1b
Merge remote-tracking branch 'upstream/develop' into filecheck 2021-05-11 18:04:04 +02:00
Laurent Destailleur
d98e046fbd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1
Merge pull request #17575 from frederic34/patch-12 
fix php8 warning
 2021-05-11 18:00:29 +02:00
Laurent Destailleur
1900e1cc54
Merge pull request #17567 from frederic34/patch-4 
fix $mysoc not defined (php8 warning)
 2021-05-11 17:59:50 +02:00
Laurent Destailleur
f2d70e2be0
Merge pull request #17571 from frederic34/patch-8 
fix php8 warnings
 2021-05-11 17:59:29 +02:00
Laurent Destailleur
8eae14fb01
Merge pull request #17572 from frederic34/patch-9 
fix php8 warning
 2021-05-11 17:59:14 +02:00
Laurent Destailleur
bea1b83e3f
Merge pull request #17570 from frederic34/patch-7 
fix php8 warning
 2021-05-11 17:58:59 +02:00
Laurent Destailleur
1294f6d912
Merge pull request #17573 from frederic34/patch-10 
fix php8 warning
 2021-05-11 17:58:41 +02:00
Laurent Destailleur
1c79b47147
Merge pull request #17574 from frederic34/patch-11 
fix php8 warning
 2021-05-11 17:58:17 +02:00
Laurent Destailleur
5178100c1d
Merge pull request #17569 from frederic34/patch-5 
fix php8 warning
 2021-05-11 17:58:07 +02:00
Laurent Destailleur
d8cbb735a3 Fix rtl language for pdf 2021-05-11 17:58:00 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
Laurent Destailleur
200c36836b v14 2021-05-11 10:44:53 +02:00
Laurent Destailleur
73972bcbd0 More complete log 2021-05-11 10:30:46 +02:00
Frédéric FRANCE
eccfa40396
fix php8 warning 
remove variables not used
 2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910
fix php8 warning 2021-05-11 08:26:03 +02:00
Frédéric FRANCE
0c8b74b54c
fix php8 warning 2021-05-11 08:20:31 +02:00
Frédéric FRANCE
da7f5e4626
fix php8 warning 2021-05-11 08:15:44 +02:00
Frédéric FRANCE
edad8cdf8f
Update card.php 2021-05-11 08:13:40 +02:00
Frédéric FRANCE
3c52636c22
fix php8 warnings 2021-05-11 08:09:56 +02:00
Frédéric FRANCE
9725c8f309
fix php8 warning 2021-05-11 08:05:30 +02:00
Frédéric FRANCE
c2de343b4e
fix php8 warning 2021-05-11 08:01:13 +02:00
Alexandre SPANGARO
44514475b6 Merge remote-tracking branch 'upstream/develop' into 14b2 2021-05-11 07:04:07 +02:00
Alexandre SPANGARO
461673d814 Merge remote-tracking branch 'upstream/develop' into 14b3 2021-05-11 07:03:43 +02:00
Alexandre SPANGARO
a67ab81b4d Merge remote-tracking branch 'upstream/develop' into 14b4 2021-05-11 07:03:18 +02:00
Alexandre SPANGARO
427221c8d3 Merge remote-tracking branch 'upstream/develop' into 14b6 2021-05-11 07:02:04 +02:00
Alexandre SPANGARO
a830e498de Merge remote-tracking branch 'upstream/develop' into 14b7 2021-05-11 07:01:39 +02:00
Frédéric FRANCE
20724efd44
fix $mysoc not defined (php8 warning) 2021-05-11 00:04:11 +02:00
Laurent Destailleur
b01e795723 Fix of build package 2021-05-10 21:28:11 +02:00
Laurent Destailleur
837c828b1d Prepare 13.0.3 2021-05-10 21:06:48 +02:00
Laurent Destailleur
d7a5e342ab Optimize some widgets 2021-05-10 20:16:51 +02:00
Laurent Destailleur
f8581a1a01 Look and feel v14 2021-05-10 19:33:45 +02:00
Laurent Destailleur
1ca73e609c Clean code 2021-05-10 19:26:47 +02:00
Laurent Destailleur
23d19a8af3 Fix permissions 2021-05-10 19:20:17 +02:00
Laurent Destailleur
73f63509e3 Fix permissions 2021-05-10 19:12:03 +02:00
Dorian Vabre
1e90e618f0 wip filter 2021-05-10 17:25:00 +02:00
Dorian Vabre
e31d8f89f5 wip filter 2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Dorian Vabre
48bbb500d3 fix on replacing thirdparty in attendees when merging multiple thirdparties 2021-05-10 16:25:44 +02:00
Dorian Vabre
bf25fd0834 confattendee merge OK to replace thirdparty 2021-05-10 16:04:13 +02:00
Dorian Vabre
f6956d6a62 using validate() function instead of settStatut(1) to validate an attendee 2021-05-10 15:58:54 +02:00
Dorian Vabre
7d0c3dcf6d transition done from cookies to session 2021-05-10 15:50:29 +02:00
ksar
107374748e
FIX #13955 2021-05-10 15:42:24 +02:00
Dorian Vabre
d71dc37a75 fix 2021-05-10 15:39:39 +02:00
Dorian Vabre
ee4e8dd99f cookies to session transition 2021-05-10 15:37:25 +02:00
Dorian Vabre
c5dc20b9dc opti 2021-05-10 15:31:52 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Frédéric FRANCE
81008fa0da
greenlight 2021-05-10 14:39:40 +02:00
Frédéric FRANCE
0d3afb573a
align check code 2021-05-10 14:33:26 +02:00
stickler-ci
b9bdd9ed8a Fixing style errors. 2021-05-10 12:13:50 +00:00
oscim
dfe0ccee45
Update card.php 
Add hook for block boxstats in fourn card
 2021-05-10 14:10:54 +02:00
Dorian Vabre
0e62edfd42 fix error on fetching thirdparty when there is none 2021-05-10 12:47:09 +02:00
Laurent Destailleur
a2cd181435 FIX Debug reception module 2021-05-10 11:53:19 +02:00
Laurent Destailleur
ed18045807 FIX The comment of a reception was not correctly managed 2021-05-10 11:30:37 +02:00
lmarcouiller
d293be56ce Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-10 10:41:56 +02:00
Dorian Vabre
0dce9ee359 now using correct email templates after booth/conf suggestion 2021-05-10 10:22:45 +02:00
Francis Appels
cd8c71497d replace deprecated warehouse 'libelle' 2021-05-10 10:10:30 +02:00
Dorian Vabre
d86b393d60 useless line removed 2021-05-10 09:54:26 +02:00
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
Alexandre SPANGARO
7993e4634a Fix Title supplier order info card 2021-05-10 07:01:24 +02:00
Alexandre SPANGARO
eccd883156 Fix Title supplier order document card 2021-05-10 06:54:17 +02:00
Alexandre SPANGARO
db50f8c27b Fix Title supplier order note card 2021-05-10 06:49:49 +02:00
Alexandre SPANGARO
9f0cdb0153 Fix Title supplier order contact card 2021-05-10 06:48:27 +02:00
Alexandre SPANGARO
1f00689831 Fix Title supplier order card 2021-05-10 06:46:07 +02:00
Alexandre SPANGARO
6089332a2b Fix Title supplier proposal document card 2021-05-10 06:40:14 +02:00
Alexandre SPANGARO
7a105a054a Fix Title supplier proposal info card 2021-05-10 06:40:01 +02:00
Alexandre SPANGARO
d66d38a846 Fix Title supplier proposal note card 2021-05-10 06:36:22 +02:00
Alexandre SPANGARO
100b0f297e Fix Title supplier proposal contact card 2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41 Move title to v14 ergonomy 2021-05-10 06:26:58 +02:00
Alexandre SPANGARO
7e44494a98 Fix Title supplier proposal card 2021-05-10 06:24:30 +02:00
stickler-ci
3ee26fc881 Fixing style errors. 2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix 2021-05-09 22:53:05 +02:00
Alexandre SPANGARO
14d743db1e Fix Title customer order sendings card 2021-05-09 22:41:52 +02:00
Alexandre SPANGARO
e5d0999073 Fix Title customer order info card 2021-05-09 22:37:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template 
Very important in restaurant orders
 2021-05-09 22:37:00 +02:00
Alexandre SPANGARO
7ad4f13036 Fix Title customer order documents card 2021-05-09 22:36:02 +02:00
Alexandre SPANGARO
a908d302b2 Fix Title customer order note card 2021-05-09 22:33:37 +02:00
Alexandre SPANGARO
222c1d9b89 Fix Title customer order contact card 2021-05-09 22:31:46 +02:00
Alexandre SPANGARO
c8e30203f8 Fix Title customer order card 2021-05-09 22:31:33 +02:00
Alexandre SPANGARO
09674359d5 Fix Title company payment information card 2021-05-09 22:23:15 +02:00
Laurent Destailleur
19bae333c9 Add option MAIN_SHOW_PASSWORD_INTO_LOG 2021-05-09 22:07:08 +02:00
Alexandre SPANGARO
6e9597cd90 Fix Title company customer card 2021-05-09 22:06:05 +02:00
Alexandre SPANGARO
7bd5306ae5 Fix Title company contact card 2021-05-09 22:04:53 +02:00
Alexandre SPANGARO
c2319c0a20 Fix Title customer proposal info card 2021-05-09 21:19:13 +02:00
Alexandre SPANGARO
9cec7e5936 Fix Title customer proposal documents card 2021-05-09 21:15:54 +02:00
Alexandre SPANGARO
dbccb75294 Fix Title customer proposal notes card 2021-05-09 21:13:29 +02:00
Alexandre SPANGARO
dd76ff0f24 Fix Title customer proposal contact card 2021-05-09 21:11:14 +02:00
Alexandre SPANGARO
2dc2256545 Fix Title customer proposal card 2021-05-09 21:08:55 +02:00
Frédéric FRANCE
3b13c4a269
fix syntax error 2021-05-09 21:03:39 +02:00
Frédéric FRANCE
fe2f22a024
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-09 21:01:46 +02:00
Laurent Destailleur
a349f6c6e7 Fix hide a non ready feature 2021-05-09 20:30:42 +02:00
Laurent Destailleur
1fb5b0f681 Fix rtl languages 2021-05-09 20:25:57 +02:00
Laurent Destailleur
3ad8827c8a Clean code 2021-05-09 20:17:17 +02:00
Philippe GRAND
1e844a78a6 comment translation 2021-05-09 16:46:38 +02:00
Laurent Destailleur
8cc100012d Fix vulnerabiity: External users can set a public note 2021-05-09 12:50:46 +02:00
Frédéric FRANCE
20cbc9a36f
Delete ChangeLog.md 2021-05-09 09:02:45 +02:00
Frédéric FRANCE
a848fb65b6
Delete COPYING 2021-05-09 09:02:01 +02:00
Alexandre SPANGARO
c81b4f8c31 FIX Migration script 2021-05-09 08:31:36 +02:00
stickler-ci
db9c423794 Fixing style errors. 2021-05-08 20:07:12 +00:00
kastoras
6fa85efd0f Fix/FIX #17545 get documents, false data problem 
Fix on getting wrong data for products comparing with like operator
 2021-05-08 23:03:08 +03:00
antonin_tdj
60671f1c78
Merge pull request #1 from ibuiv/ibuiv-develop 
Ibuiv develop
 2021-05-08 15:55:15 +02:00
UT from dolibit
c64fec53e2
Update llx_20_c_departements.sql 
so now fixed
 2021-05-08 15:26:52 +02:00
John BOTELLA
2fda3b1b46
FIX ; var case 
On this page $datePrint is not used but $dateprint yes
 2021-05-08 13:53:20 +02:00
Francis Appels
7101c2445d Fix dispatch, only edit received lines on draft reception. 
No stock movement on reception.
 2021-05-08 12:42:58 +02:00
Antonin MARCHAL
44e49e7161 git commit duplication 2021-05-08 11:46:32 +02:00
Antonin MARCHAL
a6267a8ade add (hooks) init hooks on all tabs for supplier order 2021-05-08 11:43:46 +02:00
Alexis LAURIER
e4a430f638 add entity check on verif_dispo mod_codeclient_elephant 2021-05-08 10:24:08 +02:00
daraelmin
22d9c4c166
Update card.php 2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b
Copyright 2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1
add entity in new subst publiclink_newmemberform 2021-05-08 09:18:41 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards 2021-05-07 21:28:35 +02:00
antonin_tdj
35c8bb6b29
fix bug PMP per entity 
wrong alias in SQL query
 2021-05-07 18:28:30 +02:00
Laurent Destailleur
907ea1a8bd Fix sql error 2021-05-07 18:21:11 +02:00
Dorian Vabre
058bef1a79 clean viewandvote page 2021-05-07 17:20:36 +02:00
daraelmin
7c27e9f931
too much underscore 2021-05-07 17:19:33 +02:00
daraelmin
bfac47c84e
Too much underscore 2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip 2021-05-07 17:14:33 +02:00
daraelmin
0173d8db5f
Add substitution key for membernewform url in mailing 2021-05-07 17:09:59 +02:00
Antonin MARCHAL
a91d1b2e07 add(list) hook 2021-05-07 17:09:39 +02:00
Antonin MARCHAL
c6d646f39e add(prop)list 2021-05-07 17:08:36 +02:00
Antonin MARCHAL
9ab12e2455 add (getNomUrl) 2021-05-07 17:06:53 +02:00
daraelmin
2c8da5703f
Fix Wrong test for permission in adherent car 2021-05-07 16:52:44 +02:00
Dorian Vabre
05bbb3dbf6 improved welcome msg on suggestbooth/conf pages 2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b added copyright 2021-05-07 16:15:13 +02:00
Dorian Vabre
d344ce5e08 clean viewandvote page 2021-05-07 15:59:25 +02:00
lmarcouiller
f054169036 revert of last push error of branch 2021-05-07 15:56:33 +02:00
Laurent Destailleur
97ca6895d8 Missing profid1 and 2 in get API 2021-05-07 15:50:07 +02:00
lmarcouiller
0466704dc7 Fix #17477 : Sql error in invoices cards 2021-05-07 15:49:49 +02:00
altairis-noe
61f8a03df6 commisionning_date out, we said 2021-05-07 15:41:48 +02:00
altairis-noe
6d92eb2e84 little correction 2021-05-07 15:38:46 +02:00
altairis-noe
8e61fc44fa traceability must be a choice and we’ll see later about commisioning date 2021-05-07 15:34:11 +02:00
Dorian Vabre
dfd3742d91 fix on label on payment page 2021-05-07 15:33:00 +02:00
lmarcouiller
bf64bde571 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 15:22:10 +02:00
Anthony Berton
fa73fde312 phone_head_document 2021-05-07 15:12:23 +02:00
Laurent Destailleur
1cf46f9ae9 cast int 2021-05-07 15:11:28 +02:00
Dorian Vabre
dbde0f0b02 fix on status change when a booth is paid 2021-05-07 15:05:37 +02:00
Dorian Vabre
6111f43946 security fix, id was encoded where it should not be encoded 2021-05-07 14:49:00 +02:00
Dorian Vabre
2169a106fa note is now saved in database 2021-05-07 14:34:29 +02:00
daraelmin
61786d328f
Update members.lang 2021-05-07 14:09:35 +02:00
Laurent Destailleur
ff14d2817d css 2021-05-07 14:08:39 +02:00
daraelmin
c61383baf7
Update members.lang 2021-05-07 14:04:55 +02:00
stickler-ci
cbac815c66 Fixing style errors. 2021-05-07 11:56:20 +00:00
daraelmin
bd35b9aad2
Fix missing FORCEMORPHY in new member form setup 2021-05-07 13:54:53 +02:00
daraelmin
cb793cb762
Fix #17114 dark display for enabled module in dark mode 2021-05-07 13:19:02 +02:00
daraelmin
078f586299
@daraelmin Add enabled module color in var 2021-05-07 13:15:22 +02:00
Dorian Vabre
5bb100de29 conforbooth class required in paymentok to confirm the booth 2021-05-07 13:02:34 +02:00
Laurent Destailleur
31f63442f8
Merge pull request #17516 from bb2a/filter_warehouse_users_liste 
Filter on warehouse users liste
 2021-05-07 12:24:51 +02:00
Laurent Destailleur
9c23a449ba
Merge pull request #17515 from frederic34/patch-4 
remove declaration already in commonobject
 2021-05-07 12:24:24 +02:00
Dorian Vabre
27cffbddf3 vote page ok 2021-05-07 12:21:15 +02:00
Laurent Destailleur
8a4661fb6c
Merge pull request #17517 from frederic34/patch-5 
fix mulitple module using completeTabsHead
 2021-05-07 12:13:01 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
Laurent Destailleur
b7686f4bab
Merge pull request #17524 from daraelmin/daraelmin-patch-newmemberform 
Fix public new member form use adh type amount
 2021-05-07 12:04:30 +02:00
Laurent Destailleur
44f81ef242
Merge pull request #17514 from frederic34/patch-3 
phpcs
 2021-05-07 12:01:47 +02:00
Laurent Destailleur
cc79fc6eee Lang 2021-05-07 11:30:27 +02:00
stickler-ci
d108496c67 Fixing style errors. 2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3 Fix #17491 : Update of fix date extrafield filter 2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-07 09:46:37 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Laurent Destailleur
5dfa18758c CSS 2021-05-07 01:36:59 +02:00
daraelmin
6504f96188
Copyright 2021-05-07 00:43:01 +02:00
stickler-ci
949e797390 Fixing style errors. 2021-05-06 22:31:41 +00:00
daraelmin
912995a558
Create new.php 2021-05-07 00:28:03 +02:00
daraelmin
9af05f3c6e
Update new.php 2021-05-07 00:25:38 +02:00
daraelmin
2e2b6af98e
Update new.php 2021-05-07 00:23:46 +02:00
daraelmin
82bf9cd3e9
Fix public new member form use adh type amount 2021-05-07 00:13:49 +02:00
Anthony Berton
d84b0bae9d init 2021-05-06 23:23:50 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead 
complete $template['head'] in module and return 0 to not replace instead return $head and replace
 2021-05-06 22:28:03 +02:00
Anthony Berton
7b0d0805f2 Update list.php 2021-05-06 22:14:45 +02:00
Anthony Berton
842268df10 Update list.php 2021-05-06 22:11:41 +02:00
Laurent Destailleur
e791f9b863 Debug MRP feature 2021-05-06 21:34:59 +02:00
Laurent Destailleur
36d50c940a Clean code 2021-05-06 21:21:11 +02:00
Laurent Destailleur
589370496a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-06 21:15:32 +02:00
Laurent Destailleur
a7649a5bc2 Trans 2021-05-06 21:15:20 +02:00
Laurent Destailleur
f655cab5eb Clean code 2021-05-06 21:11:39 +02:00
Frédéric FRANCE
f377b8129a
remove declaration already in commonobject 2021-05-06 21:06:25 +02:00
Frédéric FRANCE
4ef53234f1
Update partnership.class.php 2021-05-06 20:39:36 +02:00
Frédéric FRANCE
7897469963
Update account.class.php 2021-05-06 20:34:45 +02:00
Frédéric FRANCE
7b8d4c2656
phpcs 2021-05-06 20:32:41 +02:00
Laurent Destailleur
48a1e5c75e
Merge pull request #17499 from bb2a/trigger_update_thirpartie 
Add events trigger update Thirparty and Contact
 2021-05-06 19:14:02 +02:00
Laurent Destailleur
457050f1c5 Add pen to edit dictionary 2021-05-06 18:45:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Laurent Destailleur
3e34557066 Clean code 2021-05-06 18:36:02 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 17:41:11 +02:00
Dorian Vabre
166e15633b factorisation 2021-05-06 17:30:11 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php 2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
3090c124f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
0daab6a55a Code comment 2021-05-06 16:50:22 +02:00
Laurent Destailleur
a26d00428e
Merge pull request #17444 from Hystepik/develop_v13#1 
Fix #17361 : change of llx_export_model type to varchar(64)
 2021-05-06 16:48:46 +02:00
Dorian Vabre
2e7d5e6d46 Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-05-06 16:48:30 +02:00
Laurent Destailleur
b7601cb662
Merge pull request #17496 from daraelmin/daraelmin-patch-4 
Fix amnt can be paid for member as membersubscription
 2021-05-06 16:47:41 +02:00
Laurent Destailleur
824a601014
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description 
FIX : search accented words in product description (consumption page)
 2021-05-06 16:45:21 +02:00
Laurent Destailleur
98a4f603f2 Complete merge of thirdparty into API 2021-05-06 16:41:06 +02:00
Laurent Destailleur
0dbd68564c
Merge pull request #17493 from FHenry/13_fix_bank_url_merge_account 
FIX: merge thirparty also work for bank URL entry
 2021-05-06 16:39:13 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php 2021-05-06 16:38:34 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
Dorian Vabre
295c63468b wip vote page 2021-05-06 16:32:39 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320 
Update modules_member.class.php
 2021-05-06 16:27:45 +02:00
Laurent Destailleur
475ed369ed
Merge pull request #17490 from marc-dll/FIX_develop_expense_report_db_field 
FIX: expense report: column last_main_doc forgotten in v14 migration script
 2021-05-06 16:27:01 +02:00
lmarcouiller
7d649dd90e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-06 16:26:30 +02:00
Laurent Destailleur
864c2a0bf7
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case 
FIX : if dom is added with ajax, selector needs to keep working
 2021-05-06 16:24:26 +02:00
Laurent Destailleur
9ce23ac6b2
Merge pull request #17494 from atm-john/fix_not_enabled_email_template 
FIX saving template email
 2021-05-06 16:22:19 +02:00
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop 
NEW: Add import on BOM
 2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
Laurent Destailleur
4c20aa6a60
Merge pull request #17485 from kastoras/add_pagination_to_get_products 
Close #17484 Add pagination to get products
 2021-05-06 16:05:06 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php 2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc
Merge pull request #17510 from Hystepik/develo#2 
Fix #17501 : Undownloable attached file
 2021-05-06 16:00:20 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0 
fix missing token
 2021-05-06 15:57:45 +02:00
Laurent Destailleur
04ac12b477
Merge pull request #17508 from dolibit-ut/patch-319 
Update llx_00_c_country.sql
 2021-05-06 15:57:17 +02:00
Anthony Berton
2615a1f152 Update list.php 2021-05-06 15:34:45 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0 reconcile before PR - second take 2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859 reconcile before PR 2021-05-06 15:19:29 +02:00
Dorian Vabre
2f7dd4e807 wip vote page 2021-05-06 14:53:23 +02:00
altairis-noe
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
Dorian Vabre
a00c9c44c3 now adding contact to conforbooth, not only to thirdparty 2021-05-06 14:26:41 +02:00
Dorian Vabre
9c20e92e17 country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change 2021-05-06 14:06:53 +02:00
Dorian Vabre
abeb1c644c country now only required when paying a booth, dates of start and end required 2021-05-06 13:50:13 +02:00
Dorian Vabre
4d8d94bfbf fixes: show only correspond button on specific page, id no longer encoded in hidden parameter 2021-05-06 12:13:49 +02:00
Dorian Vabre
c56c7afa89 update on specifications on suggesting a booth/conf since its now two separated pages 2021-05-06 11:59:24 +02:00
Dorian Vabre
df78aaff88 now 2 distinct pages to suggest a conf or a booth 2021-05-06 11:49:00 +02:00
Dorian Vabre
099ad77d44 encryption change for url 2021-05-06 11:32:07 +02:00
Dorian Vabre
10c9e9b77c wip 2021-05-06 11:31:23 +02:00
Dorian Vabre
a68a7c1f67 wip 2021-05-06 11:27:48 +02:00
Dorian Vabre
4c50d210dd creation of the 3 main pages 2021-05-06 11:26:42 +02:00
Laurent Destailleur
6f4e151b91 Fix permissions 2021-05-06 11:25:46 +02:00
Laurent Destailleur
644079ff00 Fix sql 2021-05-06 11:18:35 +02:00
altairis-noe
7c53e2bb18 too much td 2021-05-06 11:16:22 +02:00
altairis-noe
cce132b8da one more space 2021-05-06 10:04:54 +02:00
altairis-noe
435cbcd16c spaces after ! 2021-05-06 10:01:53 +02:00
altairis-noe
8a108ae5e8 qcstatus out of formproduct and corrections in syntax 2021-05-06 09:59:33 +02:00
lmarcouiller
d55309c847 fix rename file 2021-05-06 09:46:54 +02:00
UT from dolibit
6b89b99dfd
Update llx_00_c_country.sql 2021-05-05 23:07:52 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
altairis-noe
5be2bdd123 qcstatus is not for this branch 2021-05-05 18:01:47 +02:00
altairis-noe
b1a4031bde no qcstatus in productlot class 2021-05-05 17:47:01 +02:00
Gauthier PC portable 024
9108651a7a FIX : if dom is added with ajax, selector need to keep working 2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506 fix: allow webdavs link type 2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe Add endofline in errors.lang 2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f Fix #17501 : Undownloable attached file 2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8 New: Add import on BOM 2021-05-05 13:47:43 +02:00
Anthony Berton
ed26e75c0b init 2021-05-05 11:54:16 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
lmarcouiller
209682e710 Fix #17361 : changes into mysql/tables of export_model 2021-05-05 11:30:13 +02:00
stickler-ci
95be7e8a63 Fixing style errors. 2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22 Fix #17491 : date extrafield filter works well now 2021-05-05 11:26:15 +02:00
lmarcouiller
c1ac2ebc86 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#1 2021-05-05 10:45:24 +02:00
Laurent Destailleur
17a8c73fad CSS 2021-05-05 03:08:34 +02:00
Laurent Destailleur
7860464724 Sync transifex 2021-05-05 01:48:21 +02:00
Laurent Destailleur
e1498ca7ef Clean code 2021-05-05 01:26:06 +02:00
Laurent Destailleur
f37033b1f4 CSS 2021-05-05 00:56:40 +02:00
Laurent Destailleur
f1929eb106 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-05 00:16:27 +02:00
Laurent Destailleur
3807804acc Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE 2021-05-05 00:15:52 +02:00
daraelmin
d840593ed7
Fix amnt can be paid for member as membersubscription 2021-05-04 23:19:19 +02:00
stickler-ci
fb3c8e698e Fixing style errors. 2021-05-04 20:59:32 +00:00
daraelmin
866857c111
Html link instead of url in substitutionarray 2021-05-04 21:57:59 +02:00
daraelmin
b04dfcadc7
Add function to get html online payment link 2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6 Add date in error message 2021-05-04 19:43:33 +02:00
ATM john
6574e54a41 Fix saving template email 2021-05-04 18:09:13 +02:00
Laurent Destailleur
f2e61ff807 Fix substitution into topic 2021-05-04 18:04:09 +02:00
Florian HENRY
c4e0d8da42 FIX: merge thirparty also work for bank URL entry 2021-05-04 17:28:20 +02:00
Marc de Lima Lucio
ef6ebd4793 FIX: expense report: column last_main_doc forgotten in v14 migration script 2021-05-04 16:24:15 +02:00
Laurent Destailleur
f6305bf551 FIX Sql error 2021-05-04 15:46:38 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
NextGestion
e497e58ebd Conflicts 2021-05-04 10:29:31 +01:00
Laurent Destailleur
ce869003cf Prepare beta v14 2021-05-04 11:13:22 +02:00
Laurent Destailleur
c82317c8af Fix missing include 2021-05-04 11:06:24 +02:00
Laurent Destailleur
b14de0bff7 NEW Can clone a cron job. 2021-05-04 10:56:21 +02:00
stickler-ci
60fc9f5ecd Fixing style errors. 2021-05-04 07:52:53 +00:00
kastoras
ee4288fae3 NEW Add pagination at Get Products response 
At REST API generate pagination data when getting products list using $pagination_data parameter
 2021-05-04 10:48:31 +03:00
daraelmin
729a5677ad
Group tooltip by key type 2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys 2021-05-04 01:41:32 +02:00
Laurent Destailleur
36c6a41b1b Fix non traversable case 2021-05-04 01:14:44 +02:00
Laurent Destailleur
08dbe74643 Fix code not reachable 2021-05-04 01:10:53 +02:00
daraelmin
034378a958
Add online substitution keys link in mailing 2021-05-04 00:58:29 +02:00
Laurent Destailleur
1f31b5851b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-04 00:35:49 +02:00
Laurent Destailleur
1d0c0a8d2a Fix phpcs 2021-05-04 00:35:36 +02:00
Laurent Destailleur
da08670a3d
Update 13.0.0-14.0.0.sql 2021-05-04 00:24:32 +02:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete 
FIX missing token on dolGetButtonAction for action delete
 2021-05-04 00:21:55 +02:00
Laurent Destailleur
b500f27796
Merge pull request #17482 from daraelmin/daraelmin-patch-2 
Fix undefined translation key
 2021-05-04 00:20:23 +02:00
Laurent Destailleur
816acaa4c2 css 2021-05-04 00:17:47 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
af9b2414a0
Merge pull request #17480 from bb2a/ajax-pdf-option 
Use AJAX PDF Options
 2021-05-04 00:06:18 +02:00
Laurent Destailleur
16f1651d4e Add missing action events in trigger 2021-05-04 00:04:44 +02:00
Laurent Destailleur
04930c2a98 Fix filter 2021-05-03 23:21:39 +02:00
Laurent Destailleur
b3af666697 Clean code 2021-05-03 23:09:11 +02:00
Laurent Destailleur
826e3d2855
Merge pull request #17314 from atm-jpb/develop_mcurrencyRate 
NEW mcurrency rate
 2021-05-03 23:01:33 +02:00
Laurent Destailleur
9e5fdfdec3
Update multicurrency_rate.php 2021-05-03 23:01:05 +02:00
Anthony Berton
9ef49a15e4 Update pdf.php 2021-05-03 22:28:40 +02:00
daraelmin
6644fd3a73
Fix undefined translation key 2021-05-03 22:15:40 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9 Disable empty tabs 2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate 
New Add option for doctemplate
 2021-05-03 19:45:40 +02:00
Laurent Destailleur
08806a6d9a
Merge pull request #17403 from kastoras/product_variants_api_add_stock_to_response 
New/NEW Product Variants API, add variant stock to response
 2021-05-03 19:39:50 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3 Enhance error management 2021-05-03 19:25:16 +02:00
Laurent Destailleur
a36df785b0 Fix lang 2021-05-03 19:20:49 +02:00
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport 
Fix show table of pdf payments repports in file order
 2021-05-03 19:19:00 +02:00
Laurent Destailleur
bb5e1c59c7
Merge pull request #17478 from FHenry/13_fix_eventfromcontact 
FIX: create event from contact card preselect contact correctly
 2021-05-03 19:17:52 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/boxes/box_produits_alerte_stock.php
 2021-05-03 18:57:52 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php 2021-05-03 18:55:25 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
WimpyMan
706545081c FIX #17476 releve.php: Fix SQL statement 
Single quotes `'` should be uses instead of double quotes `"` for
string values.
 2021-05-03 18:29:53 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Florian HENRY
9278228e20 FIX: create event from contact card preselect contact correctly 2021-05-03 18:08:49 +02:00
Indelog
c18848c944 Fix: simplify code with dol_dir_list() 2021-05-03 17:17:44 +02:00
Laurent Destailleur
c5449fdd66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 16:48:53 +02:00
Laurent Destailleur
49a0304071 Add TODO 2021-05-03 16:48:40 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
Laurent Destailleur
9ce510f5f9
Merge pull request #17443 from Hystepik/develop#1 
Fix : Error on knowledgemanagement_list error $sql extrafields
 2021-05-03 16:16:04 +02:00
Indelog
dba9b17275 Fix forgot payment filter on file name 2021-05-03 16:00:14 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria 
NEW rise code tries in digeteria customer and supplier accountant code
 2021-05-03 15:57:46 +02:00
Laurent Destailleur
7b706d6fe5 Fix phpunit for crop of image 2021-05-03 15:56:56 +02:00
Laurent Destailleur
5aa9927784 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 15:37:40 +02:00
Laurent Destailleur
5d870d5802 FIx #17447 2021-05-03 15:36:34 +02:00
Laurent Destailleur
ec544cb20e
Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype 
NEW #17292 default subscription amount by adherent type
 2021-05-03 15:32:39 +02:00
UT from dolibit
9bf10c50a2
Update llx_20_c_departements.sql 
Peru
 2021-05-03 15:29:49 +02:00
Laurent Destailleur
1847180c52
Merge pull request #17449 from mafzalzadeh/develop 
fixed Persian themes direction to rtl
 2021-05-03 15:20:16 +02:00
Laurent Destailleur
0dc2c0050c
Merge pull request #17452 from daraelmin/daraelmin-patch-3 
Fix #17352 card nb overlaps exp date on payment with stripe
 2021-05-03 15:00:53 +02:00
Laurent Destailleur
914d27990d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 14:58:41 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
e5b49ce0a2
Merge pull request #17448 from LuferGonn/fourn_facture_change_001 
Update fourn/facture/card.php: Change position(ExtraFields)
 2021-05-03 14:12:07 +02:00
Laurent Destailleur
c6a9117a00 Graph color 2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2 
Close #17271 : Replacement of 2 graphes in /compta/index.php
 2021-05-03 13:56:44 +02:00
Laurent Destailleur
6ef463f688 Code comment 2021-05-03 13:54:26 +02:00
Laurent Destailleur
42c2fb5736 Fix sql error on new filter 2021-05-03 13:47:26 +02:00
Laurent Destailleur
1c61d2df9f
Merge pull request #17455 from aspangaro/14a42 
NEW Accountancy - Possibility to select journals in balance
 2021-05-03 13:36:08 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
097ccdab9f
Merge pull request #17454 from aspangaro/14a30 
NEW Accountancy - Add select date from/to in binding page
 2021-05-03 13:19:12 +02:00
Laurent Destailleur
cc0739d531
Merge pull request #17456 from dolibit-ut/patch-309 
Update llx_20_c_departements.sql
 2021-05-03 13:17:24 +02:00
Laurent Destailleur
a9da0ec93f
Merge pull request #17432 from dolibit-ut/patch-307 
Update llx_00_c_country.sql
 2021-05-03 13:17:03 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Laurent Destailleur
9a69813f85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 13:12:26 +02:00
Laurent Destailleur
76a669a13f Only en_US must exists into template 2021-05-03 13:12:09 +02:00
Laurent Destailleur
ba156deda3
Merge pull request #17457 from dolibit-ut/patch-310 
Update llx_10_c_regions.sql
 2021-05-03 13:09:33 +02:00
Laurent Destailleur
e9ed985e18 Fix filter 2021-05-03 12:47:40 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Laurent Destailleur
9c0d4dd86b Small performance enhancement for transfer in accountancy. 2021-05-03 11:31:16 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
Indelog
9727768192 Fix show table of pdf payments repports in file order 
Use scandir() rather opendir() and readdir() to get a sorted list of
files.
 2021-05-03 09:46:51 +02:00
Laurent Destailleur
0aef431c2a Move language keys 2021-05-02 18:56:40 +02:00
Laurent Destailleur
2400da497c Exclude binary zip files 2021-05-02 16:42:22 +02:00
Laurent Destailleur
2bef447229 Clean code 2021-05-02 16:24:52 +02:00
Laurent Destailleur
6c4d0f4397 css for croping with alpha channel 2021-05-02 15:44:15 +02:00
Laurent Destailleur
efda17657d Fix conversion in webp 2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8 Fix conversion of images 2021-05-02 15:15:27 +02:00
Laurent Destailleur
92c1022b8e Fix duplicate in webp 2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430 Fix lang 2021-05-02 14:31:03 +02:00
UT from dolibit
5408671f8e
Update llx_10_c_regions.sql 
Morocco - changed its regions in 2015 
insert at first only a comment

check how to change for migration of old user datasets
 2021-05-02 13:44:06 +02:00
UT from dolibit
9e2a987ee3
Update llx_20_c_departements.sql 
Morocco / Maroc Provinces (have to check before/after year 2015)
 2021-05-02 13:17:05 +02:00
Laurent Destailleur
71ed90a153 Fix phpcs 2021-05-02 13:16:41 +02:00
Laurent Destailleur
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00
Laurent Destailleur
3edb929f9e Debug v14 2021-05-02 12:43:28 +02:00
Laurent Destailleur
88fa042c3b Can edit language file for core modules 2021-05-02 12:39:33 +02:00
Laurent Destailleur
e8f48667dd Enhance modulebuilder 2021-05-02 12:35:47 +02:00
Laurent Destailleur
173ef31ad4 Enhance modulebuilder 2021-05-02 12:15:31 +02:00
Laurent Destailleur
24a58b1956 Removed not used permission 2021-05-02 11:21:01 +02:00
Alexandre SPANGARO
8eddc75a22 Remove duplicate variable 2021-05-02 02:49:53 +02:00
Alexandre SPANGARO
cd6bcd14f3 NEW Accountancy - Possibility to select journals in balance 2021-05-02 02:35:16 +02:00
Alexandre SPANGARO
6b75edf2f3 NEW Accountancy - Add select date from/to in binding supplier list 2021-05-02 02:03:19 +02:00
Alexandre SPANGARO
87b9f7a77d NEW Accountancy - Add select date from/to in already bind supplier list 2021-05-02 01:59:11 +02:00
Alexandre SPANGARO
3c01eba11a NEW Accountancy - Add select date from/to in already bind customer list 2021-05-02 01:53:49 +02:00
Alexandre SPANGARO
0acbd87a53 NEW Accountancy - Add select date from/to in binding customer list 2021-05-02 01:47:29 +02:00
daraelmin
125162f520
Fix #17352 card number overlaps expiration date on public payment page with Stripe 2021-05-01 22:01:04 +02:00
daraelmin
1d05ce4a15
Update comment 2021-05-01 21:40:43 +02:00
kastoras
127654e792 New/NEW Product Variants API, add variant stock to response 
Remove dependency inserded by mistake
 2021-05-01 22:32:08 +03:00
daraelmin
0610ca89c1
camelCase for amountByType 2021-05-01 20:45:57 +02:00
daraelmin
28ba847709
camelCase format for method amountByType 2021-05-01 20:43:58 +02:00
stickler-ci
832ceb2be3 Fixing style errors. 2021-05-01 18:36:59 +00:00
daraelmin
b643af9c03
Remove unused code from reverted pr 2021-05-01 20:28:47 +02:00
daraelmin
031d258b32
Update newpayment.php 2021-05-01 20:17:29 +02:00
daraelmin
8457fef1a2
Update llx_adherent_type.sql 2021-05-01 20:10:17 +02:00
daraelmin
5ff60c31e6
Update 13.0.0-14.0.0.sql 2021-05-01 20:08:32 +02:00
daraelmin
4c3e37681c
Update adherent_type.class.php 2021-05-01 20:06:15 +02:00
daraelmin
5f23c68f85
Update type.php 2021-05-01 20:01:18 +02:00
Laurent Destailleur
7a986b3e50 Fix colors 2021-05-01 17:44:28 +02:00
Laurent Destailleur
c848a1ce03 css 2021-05-01 16:55:49 +02:00
Laurent Destailleur
ef734aeb58 Debug module inventory 2021-05-01 16:33:05 +02:00
Laurent Destailleur
4e7e6048de Debug generation of webp 2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983 Debug generation of webp 2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374 Debug generation of webp 2021-05-01 15:12:30 +02:00
Laurent Destailleur
0ee1d4b322 Reduce log verbosity 2021-05-01 13:22:01 +02:00
mafzalzadeh
76f42c9b51
fixed Persian themes direction to rtl 2021-05-01 11:09:34 +04:30
Luis Fernando
6fb256822b Update card.php: Change position(ExtraFields) 2021-04-30 21:07:24 -05:00
Laurent Destailleur
e6729355b8 Look and feel v14 2021-04-30 17:56:42 +02:00
Laurent Destailleur
6c649089b8 Fix trans 2021-04-30 17:24:07 +02:00
Laurent Destailleur
fdef17ef0c Fix translation 2021-04-30 16:59:58 +02:00
Laurent Destailleur
3ae303758b Fix trans 2021-04-30 16:49:52 +02:00
Laurent Destailleur
223a06b77d Clean code 2021-04-30 16:41:41 +02:00
Laurent Destailleur
69511e2706 Debug 2021-04-30 16:15:35 +02:00
lvessiller
ab89fe73c2 NEW rise code tries in digeteria customer and supplier accountant code 2021-04-30 16:08:46 +02:00
Laurent Destailleur
46f41681ff Debug 2021-04-30 15:55:28 +02:00
Laurent Destailleur
79133d1205 Debug 2021-04-30 15:37:26 +02:00
Laurent Destailleur
278d8c1317 Debug 2021-04-30 15:34:02 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
lmarcouiller
ce677c4f27 Fix #17361 : change of llx_export_model type to varchar(64) 2021-04-30 14:50:18 +02:00
altairis-noe
c10b165d33 qc_status change in stock correct -> display select 2021-04-30 14:36:25 +02:00
Laurent Destailleur
c693668d38 Clean code 2021-04-30 14:26:39 +02:00
lmarcouiller
06e550cb19 Fix : Error on knowledgemanagement_list error $sql extrafields 2021-04-30 12:32:53 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4 
New Module Knowledge Management
 2021-04-30 12:12:15 +02:00
Laurent Destailleur
c38aabc726
Merge pull request #17440 from Hystepik/develop#1 
Fix #17424 : preg_match error on List of purchase orders
 2021-04-30 12:10:07 +02:00
Laurent Destailleur
edd178c373
Update list.php 2021-04-30 12:09:42 +02:00
Laurent Destailleur
b45ac52311 Clean sql 2021-04-30 12:07:26 +02:00
Laurent Destailleur
ac05874b53
Merge pull request #17434 from FHenry/dev_add_channel_order_list 
NEW: add Channel column into order list
 2021-04-30 12:04:24 +02:00
Laurent Destailleur
27e2c69e4e
Merge pull request #17439 from atm-lena/11.0_FIX_ShowContactSearch_SQLError 
FIX SQL Error show_contacts : socialnetworks
 2021-04-30 12:03:40 +02:00
Laurent Destailleur
baef062295
Merge pull request #17431 from dolibit-ut/patch-306 
Update llx_20_c_departements.sql
 2021-04-30 12:01:46 +02:00
Laurent Destailleur
45f9805c8b
Merge pull request #17430 from dolibit-ut/patch-305 
Update llx_10_c_regions.sql
 2021-04-30 12:00:10 +02:00
Laurent Destailleur
0d4eaca3e8
Merge pull request #17426 from daraelmin/daraelmin-patch-v11 
Fix wrong alias in natural_search v11-v14
 2021-04-30 11:58:53 +02:00
Laurent Destailleur
08c85a88c8
Merge pull request #17437 from daraelmin/daraelmin-patch-v11-2 
Fix logical test always false V11 to v14
 2021-04-30 11:57:58 +02:00
Laurent Destailleur
4bf1bde8fe
Merge pull request #17436 from frederic34/patch-3 
fix activate cron
 2021-04-30 11:55:40 +02:00
Laurent Destailleur
195163b81a Enhance security center 2021-04-30 11:45:45 +02:00
Francis Appels
773b16928d only if no token 2021-04-30 11:15:01 +02:00
altairis-noe
fd42979def qc_status change in stock transfer -> display select 2021-04-30 11:12:33 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
lmarcouiller
484f6f275f Fix #17424 : preg_match error on List of purchase orders 2021-04-30 10:56:47 +02:00
Francis Appels
05a96b3ee2 FIX missing token on dolGetButtonAction for action delete 2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45 Fixing style errors. 2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321 FIX SQL Error show_contacts : socialnetworks 2021-04-30 10:04:21 +02:00
daraelmin
749aeeb233
Fix $objp->subscription =="yes" 2021-04-29 23:16:21 +02:00
daraelmin
4174ebd9c0
Fix subscription =="yes" 2021-04-29 23:11:51 +02:00
daraelmin
965eb2d639
Fix logical test always false 
subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
 2021-04-29 22:57:39 +02:00
Frédéric FRANCE
196f8bbfb8
Update card.php 2021-04-29 22:19:05 +02:00
Frédéric FRANCE
beca2388ba
fix activate cron 2021-04-29 22:08:49 +02:00
Laurent Destailleur
8e1ba67928 css 2021-04-29 18:04:10 +02:00
Laurent Destailleur
66103303eb Fix html tag 2021-04-29 18:02:24 +02:00
altairis-noe
1224327f91 qcstatus everywhere 2021-04-29 17:50:11 +02:00
stickler-ci
d5af15a102 Fixing style errors. 2021-04-29 15:37:19 +00:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
jpb
6aa9c35f0f merge conflic 2021-04-29 17:34:56 +02:00
jpb
5da418ce33 merge conflict 2021-04-29 17:27:59 +02:00
Florian HENRY
fd6eacf022 NEW: add Channel column into order list 2021-04-29 16:15:46 +02:00
UT from dolibit
5f7a3571cd
Update llx_00_c_country.sql 
countries in english
 2021-04-29 16:08:27 +02:00
jpb
330c08ac13 remove number to text type input 2021-04-29 15:59:55 +02:00
UT from dolibit
2c8ab51dac
Update llx_20_c_departements.sql 
Portugal (remove '' at fk_region)
 2021-04-29 15:55:38 +02:00
Laurent Destailleur
e7e2953a9e Look and feel 2021-04-29 15:49:44 +02:00
UT from dolibit
54ab2e523d
Update llx_10_c_regions.sql 
Hungary - sorting & regions in hungarian
 2021-04-29 15:40:45 +02:00
stickler-ci
8fda2ba2b4 Fixing style errors. 2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
altairis-noe
f3ede35b4f lang correction 2021-04-29 13:18:14 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753 merge conflict resolution 2021-04-29 13:08:24 +02:00
altairis-noe
f7182d43fd add entity in c_productbatch_qcstatus key 2021-04-29 13:00:47 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00