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

24039 Commits

Author SHA1 Message Date
César de la Cal Bretschneider
eadd8defaf Good friday is a holiday 2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f Fix phpcs 2021-04-10 00:31:20 +02:00
Laurent Destailleur
52213d0ac7 Fix duplicate permissions 2021-04-09 21:15:43 +02:00
Ahmad Hadeed
63f7369adb Fixing 'stickler-ci' complaint, function description not in order 2021-04-09 21:16:24 +03:00
Ahmad Hadeed
20e51016ed fixing function description comment to satisfy 'stickler-ci' 2021-04-09 21:11:37 +03:00
Ahmad Hadeed
937fe333f1 Moving Friday to end of function declaration to maintain backward compatibility 2021-04-09 20:49:39 +03:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
lmarcouiller
19ee78e123 Close #17193 : Move button convert in webp 2021-04-09 15:44:47 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146 
13.0-fix17146
 2021-04-09 13:57:50 +02:00
Laurent Destailleur
4016c300d2 Fix missing lin to thirdparty on some actions 2021-04-09 13:38:29 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php 2021-04-09 12:48:06 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
Laurent Destailleur
d098bf412d Move directory to match the one of composer package for phpspreadsheet 2021-04-08 17:35:52 +02:00
Dorian Vabre
60341e8a14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-08 17:29:16 +02:00
Laurent Destailleur
f8b5bee9eb Add function getListOfPossibleImageExt 2021-04-08 14:20:59 +02:00
Laurent Destailleur
244e83e18d
Merge pull request #17164 from draceo/art261-7 
Add bill tax code article for non profit organization VAT (fixes #17163)
 2021-04-08 13:46:22 +02:00
Laurent Destailleur
aacea00460
Merge pull request #17167 from OPEN-DSI/fix_00004 
NEW : Add new permok for edit extrafields on contact card
 2021-04-08 13:43:39 +02:00
Laurent Destailleur
93269bab9e
Merge pull request #17183 from OPEN-DSI/fix_00005 
FIX : Fix warning
 2021-04-08 13:14:53 +02:00
kamel
1ec6317b80 FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors) 2021-04-08 10:33:27 +02:00
Laurent Destailleur
489cff46a3 FIX #yogosha5828 2021-04-08 00:37:17 +02:00
Laurent Destailleur
59c8e70fd2 Fix #yogosha4510 2021-04-07 23:43:10 +02:00
Laurent Destailleur
6c4f5b851d Use all param of getURLContent 2021-04-07 23:31:16 +02:00
Laurent Destailleur
1e1b963ca7 Restriction on name of files 2021-04-07 19:38:54 +02:00
kamel
c06cc6d75a NEW : Add new permok for edit extrafields on contact card 2021-04-07 17:28:13 +02:00
Florent Peyraud
7be9a98ef0 Add bill tax code article for non profit organization VAT 2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership 2021-04-07 12:30:37 +01:00
stickler-ci
c9aed75837 Fixing style errors. 2021-04-07 11:24:31 +00:00
NextGestion
5f5f0eb3f3 Add menu entries into thirdparty menu or member menu & Allow extrafields 2021-04-07 12:21:59 +01:00
Laurent Destailleur
f4d56c710b Fix log levels 2021-04-07 12:43:28 +02:00
Dorian Vabre
f7b6e239e9 nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable) 2021-04-07 10:06:38 +02:00
Indelog
17fa9559a3 Fix empty string WEBSITE_OTHERLANG 
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
 2021-04-07 09:29:40 +02:00
Günter Lukas
04a55a3df3 Fix #17146 2021-04-07 09:08:34 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Indelog
4d60fe8ff9 Fix empty $sublang dolSavePageAlias 
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
 2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Laurent Destailleur
7ff74768eb Fix pb with renaming field total 2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100 Fix sql 2021-04-06 20:10:29 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22 
Code enhanced - Standardize field name #14697
 2021-04-06 20:01:38 +02:00
NextGestion
78b4aa61fa Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup) 2021-04-06 18:57:45 +01:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424 
FIX uniformization of external link
 2021-04-06 19:36:26 +02:00
Laurent Destailleur
bbbf1dc7c8
Merge pull request #17133 from dolibit-ut/patch-235 
Update box.php
 2021-04-06 19:31:45 +02:00
Laurent Destailleur
d1df327284 Add tab for import/export profiles 2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7 Look and feel v14 2021-04-06 18:18:07 +02:00
NextGestion
debef2fb6d initial Batch to cancel partnership for expired members 2021-04-06 15:53:51 +01:00
Laurent Destailleur
10fb793fb1 Enhance the security page 2021-04-06 13:56:33 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
Ahmad Hadeed
f2f2aed6cd Fix 3 weekend holiday behavior after adding support to Friday as a holiday. 2021-04-05 22:05:22 +03:00
UT from dolibit
40059f1d05
Update box.php 
$userid   defined twice
 2021-04-05 20:37:58 +02:00
Laurent Destailleur
a3fb8d3e14 Factorize code 2021-04-05 19:34:56 +02:00
stickler-ci
caa2facd47 Fixing style errors. 2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528 Add support for Friday as a holiday and some comment alignment fixes 2021-04-05 19:57:33 +03:00
Laurent Destailleur
95de241245 FIx #yogosha5774 2021-04-05 15:21:17 +02:00
Laurent Destailleur
685c880e6c Debug module workstation 2021-04-05 14:56:47 +02:00
Laurent Destailleur
6c521073ea Fix perm id and sort of modules by id. 2021-04-05 13:52:19 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php 2021-04-05 13:52:09 +02:00
Laurent Destailleur
6fc19c626d Try fix for #17094 2021-04-04 17:05:01 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
1a70aebba6 NEW Can set a target image in dolcropresize function. 2021-04-04 01:12:25 +02:00
Laurent Destailleur
17437670b1 Set include of js as async 2021-04-03 13:24:34 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership 2021-04-03 09:44:21 +01:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
5ce9bc5801 FIX #yogosha5748 2021-04-02 23:23:44 +02:00
Laurent Destailleur
cadef101db Fix var name 2021-04-02 21:40:33 +02:00
Laurent Destailleur
b237126679 Clean code 2021-04-02 13:33:41 +02:00
Laurent Destailleur
c23610f851 Rename const 2021-04-02 13:31:03 +02:00
Laurent Destailleur
5d7efcc0d1
Merge pull request #17063 from aspangaro/13p31 
FIX: Periodicity by default on fiscal year, according to the now date, we have plus 1 year added
 2021-04-02 01:53:24 +02:00
Laurent Destailleur
39fc2e6e60 NEW Save old page with .old in edition of a website page 2021-04-01 19:49:36 +02:00
Laurent Destailleur
d4f14183b7 Code comment 2021-04-01 13:15:23 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Florian Mortgat
f5617a6247 FIX 13.0 warning - missing quotes around 'label' 2021-04-01 12:33:23 +02:00
Laurent Destailleur
354adbde54 Look and feel v14 2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434 FIX #yogosha5775 2021-04-01 11:27:39 +02:00
Alexandre SPANGARO
b5702fcb13 Merge branch '13.0' into 13p31 2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added 2021-04-01 04:37:47 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Laurent Destailleur
5e67427922
Merge pull request #16483 from frederic34/repairToUtf8mb4 
NEW Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
 2021-03-31 22:28:58 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30 
NEW: Accountancy - Add FEC import
 2021-03-31 22:15:26 +02:00
Alexandre SPANGARO
dd913b2385 Update 2021-03-31 20:40:26 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Frédéric FRANCE
1823fb34bb
Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4 2021-03-31 18:41:49 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
b695c4a1c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-31 13:59:35 +02:00
Laurent Destailleur
14c7ce7492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/reception/card.php
 2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27 
FIX: Add a sub table to manage accountancy on product/company
 2021-03-31 13:39:17 +02:00
Laurent Destailleur
6aa1229c19 FIX #yogosha5791 2021-03-31 12:44:13 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +02:00