Commit Graph

100555 Commits

Author SHA1 Message Date
Laurent Destailleur
bd1aa38c64 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
2021-04-15 12:04:08 +02:00
Laurent Destailleur
460d6a0589 Fix init pass 2021-04-15 11:57:53 +02:00
Dorian Vabre
880d763abe wip on payment page 2021-04-15 11:55:28 +02:00
Laurent Destailleur
bc574a1849 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-15 11:52:41 +02:00
Laurent Destailleur
39d6ac3753 initdemopassword can use password_hash algorithm 2021-04-15 11:52:20 +02:00
Dorian Vabre
dd7c09582f payment page structure ok, still need to confirm the attendee after the payment 2021-04-15 10:45:44 +02:00
Noé Cendrier
7da62aa752
Merge pull request #5 from altairis-noe/warehouses_in_project
association of warehouses to projects
2021-04-15 10:43:42 +02:00
altairis-noe
2e340c61cc preselect project when warehouse created from there 2021-04-15 10:31:18 +02:00
altairis-noe
3fe0eb54c7 association of warehouses to projects 2021-04-15 09:59:08 +02:00
Alexandre SPANGARO
1be8bfe5c0 Text 2021-04-15 06:08:41 +02:00
Laurent Destailleur
5e2bec9cad Look and feel v14 2021-04-15 02:09:29 +02:00
andreubisquerra
662caadd18
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS 2021-04-14 23:32:08 +02:00
Alexandre SPANGARO
b2a1b06736 text 2021-04-14 23:19:10 +02:00
Alexandre SPANGARO
957968eea2 typo 2021-04-14 23:17:26 +02:00
Alexandre SPANGARO
140f098c79 NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service 2021-04-14 23:16:30 +02:00
Laurent Destailleur
e7d64d073a Look and feel v14 2021-04-14 23:14:38 +02:00
Laurent Destailleur
d4420bbfd9 Look and feel v14 2021-04-14 22:31:44 +02:00
Givriz
47cdfee1d2 Compatibility pvpv8 2021-04-14 22:03:04 +02:00
Pierre Payet
377c730363 add missing group by hook in fichinter list 2021-04-14 21:27:53 +02:00
Laurent Destailleur
195d3b578b Fix phpcs 2021-04-14 20:44:34 +02:00
Laurent Destailleur
59f1270264 Trans 2021-04-14 19:12:25 +02:00
Laurent Destailleur
8bfb69cdba Fix security check 2021-04-14 18:56:31 +02:00
Gauthier PC portable 024
9ca67b81f8 FIX : correction migration queries for postgres 2021-04-14 18:49:21 +02:00
stickler-ci
5d404836f7 Fixing style errors. 2021-04-14 16:35:19 +00:00
Givriz
598156de04 Update modDataPolicy.class.php
There was useless condition
2021-04-14 17:58:46 +02:00
NextGestion
03a944edf5 Manage membership expiration 2021-04-14 16:32:23 +01:00
Francis Appels
7c809c7978 Merge remote-tracking branch 'Dolibarr/13.0' into 13 2021-04-14 17:09:53 +02:00
Alexandre SPANGARO
89281d4875 Merge remote-tracking branch 'upstream/develop' into 14a38 2021-04-14 16:43:16 +02:00
Dorian Vabre
caf74fe1cb pull problem corrected 2021-04-14 16:20:05 +02:00
stickler-ci
4700fd467f Fixing style errors. 2021-04-14 14:14:39 +00:00
Gauthier PC portable 024
4d643db4e6 FIX : travis 2021-04-14 16:14:03 +02:00
altairis-noe
658e1de45d stickler adjust 2021-04-14 16:08:28 +02:00
Givriz
9b66895945 Update mails_templates.php 2021-04-14 16:06:53 +02:00
Dorian Vabre
c58414c0ca merging with dev_EventOrganization after the changes on it 2021-04-14 16:04:36 +02:00
stickler-ci
6f0f527a89 Fixing style errors. 2021-04-14 14:04:33 +00:00
Gauthier PC portable 024
a596424328 FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid 2021-04-14 16:01:48 +02:00
Dorian Vabre
3d5e439d92 company name is now required if price is set 2021-04-14 15:55:59 +02:00
Dorian Vabre
2f3f2509b2 wip on asking for the company name only if price is set v2 2021-04-14 15:54:21 +02:00
Dorian Vabre
6238ff0321 wip on asking for the company name only if price is set 2021-04-14 15:52:46 +02:00
Givriz
32d401bed4 Update mails.php 2021-04-14 15:26:18 +02:00
Laurent Destailleur
63d4d83025 Better text 2021-04-14 15:15:52 +02:00
Laurent Destailleur
b298420ac5 Fix bad test 2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04 Look and feel v14 2021-04-14 15:11:26 +02:00
NextGestion
4e45011e45 Manage Partnership for third-party 2021-04-14 13:59:38 +01:00
NextGestion
a91a9256a3 Fix extrafields in list 2021-04-14 13:49:26 +01:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
altairis-noe
4c8d37ce28 warehouse can now be linked to a project with
fk_project
2021-04-14 13:45:25 +02:00
Damien BENOIT
4a7c8deb38
Merge pull request #18 from Dolibarr/develop
Update fork
2021-04-14 13:21:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00