Commit Graph

99615 Commits

Author SHA1 Message Date
Laurent Destailleur
37fa8f4c19 Fix method not found 2021-04-15 15:07:06 +02:00
Laurent Destailleur
402f751994 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-15 14:33:56 +02:00
Laurent Destailleur
bf547cf20d Debug v14 2021-04-15 14:33:48 +02:00
Laurent Destailleur
be190c720a Debug v14 2021-04-15 14:20:59 +02:00
Laurent Destailleur
ce1a257522 Fix remove a setup that should not exists. Info is already into a table 2021-04-15 13:53:24 +02:00
Laurent Destailleur
d4884e9063 Debug 2021-04-15 13:36:05 +02:00
Laurent Destailleur
7e4f7f7200 Nicer page of widget setup 2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9 Nicer page of widget setup 2021-04-15 13:22:03 +02:00
Dorian Vabre
12a796fd8e dynamic selector print improved, now using ref instead of id 2021-04-15 12:57:19 +02:00
Laurent Destailleur
dd4a5c9f76 Complete demo img 2021-04-15 12:52:42 +02:00
Laurent Destailleur
2e2a1b9a27 Add squarred logo 2021-04-15 12:51:00 +02:00
Laurent Destailleur
e1a33e6c55 css 2021-04-15 12:50:47 +02:00
Dorian Vabre
764d984ebf fix on dynamic selector 2021-04-15 12:28:53 +02:00
NextGestion
010b89ce78 Merge branch 'dolibarr_partnership' of https://github.com/NextGestion/dolibarr into dolibarr_partnership 2021-04-15 11:22:46 +01:00
NextGestion
e8fc6fe293 Code optimization 2021-04-15 11:21:33 +01:00
Dorian Vabre
98c622446e dynamic selector of service/product used for the invoice added 2021-04-15 12:14:34 +02:00
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