lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,214 Commits 43 Branches 150 Tags 886 MiB
8f9ee3250d
Commit Graph

86214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
8f9ee3250d
clean 2020-05-07 23:28:32 +02:00
Frédéric FRANCE
b88a84323b
clean 2020-05-07 22:59:34 +02:00
Frédéric FRANCE
7e7a10f8d2
clean 2020-05-07 22:55:21 +02:00
Frédéric FRANCE
f13c3447f1
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-07 21:49:01 +02:00
Laurent Destailleur
b84e9141a5
Merge pull request #13840 from OPEN-DSI/new-ticket-messages-show-on-card 
NEW show messages on ticket card
 2020-05-07 21:30:24 +02:00
Laurent Destailleur
9ea84b87e5
Merge pull request #13836 from frederic34/patch-6 
session_cache_limiter before starting session
 2020-05-07 21:22:56 +02:00
Laurent Destailleur
3638a59d8d
Merge pull request #13832 from frederic34/patch-4 
fix html
 2020-05-07 21:21:01 +02:00
Laurent Destailleur
dd256b6857
Merge pull request #13842 from frederic34/patch-7 
NEW add dedicated substitutions keys for extrafields of type date and datetime
 2020-05-07 21:20:38 +02:00
Frédéric FRANCE
6d5e83ad66
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-07 16:16:10 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php 2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime 2020-05-07 15:37:32 +02:00
VESSILLER
7e8cd565f4 NEW not show linked table on add message action 2020-05-07 14:35:04 +02:00
VESSILLER
ad489ab1b4 NEW show messages on ticket card 2020-05-07 12:22:13 +02:00
Laurent Destailleur
03fddd48af Clean some constructors 2020-05-07 12:14:45 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
 2020-05-07 11:59:13 +02:00
Laurent Destailleur
695771726f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-07 11:39:45 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
Frédéric FRANCE
91dcf10375
session_cache_limiter before starting session 2020-05-06 23:56:02 +02:00
Frédéric FRANCE
3fcd9e6949
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-06 22:17:43 +02:00
Frédéric FRANCE
326dc7d367
fix html 
file:///home/fred/Images/S%C3%A9lection_078.png
 2020-05-06 17:59:40 +02:00
Laurent Destailleur
387c2209d7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-06 16:17:45 +02:00
Laurent Destailleur
b3a064d309 Fix dup 2020-05-06 16:02:34 +02:00
Laurent Destailleur
4c04ace9d8 fix reset of session 2020-05-06 15:39:07 +02:00
Laurent Destailleur
5e6b7fb6b4 Show message after pass reset 2020-05-06 15:36:14 +02:00
Laurent Destailleur
485896614b Add message during password reset 2020-05-06 15:30:00 +02:00
Laurent Destailleur
1ec8b31e46 Fix remove action param in url to allow a second try without the error 
message
 2020-05-06 15:15:12 +02:00
Laurent Destailleur
abdb0cc8c0 Fix use correct trackid 2020-05-06 15:03:57 +02:00
Laurent Destailleur
db40dd8e49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-06 14:48:58 +02:00
Laurent Destailleur
e7ae9c752e Fix missing trackid 2020-05-06 14:48:02 +02:00
Laurent Destailleur
bfd4ebd49d FIX Changing password message not visible if a background is set 2020-05-06 14:28:24 +02:00
Laurent Destailleur
c4d0133fbf
Merge pull request #13829 from indelog/accountreportincludevarpayloan 
NEW Add include various payments and loans in accounting report with simplfified accountancy
 2020-05-06 14:19:47 +02:00
Laurent Destailleur
3dbe9a4af1 Fix label 2020-05-06 13:59:15 +02:00
DEMAREST Maxime (Indelog)
889e5db4fb Fix use Form::selectyesno() for added options in admin/compta.php 2020-05-06 13:55:38 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f Fix blank line at end of control structure 2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a Fix somes code formating errors 2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78 Add include various payments and loans in accounting report 
For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
 2020-05-06 12:58:41 +02:00
Frédéric FRANCE
574a4d4ce8
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-06 10:54:59 +02:00
Laurent Destailleur
a8222c2651 Look and feel v12 2020-05-06 05:10:42 +02:00
Laurent Destailleur
b09f179a16 NEW Website logs are now into a separated log file. 2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c Fix Add '_pw' var as var sensibles. 2020-05-06 04:03:07 +02:00
Laurent Destailleur
8512fba7db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-06 03:49:25 +02:00
Laurent Destailleur
247acdd274 Fix position of custom groups of modules 2020-05-06 03:47:28 +02:00
Laurent Destailleur
e7f0035237
Merge pull request #13811 from frederic34/patch-4 
nowtime is not defined
 2020-05-06 02:23:58 +02:00
Laurent Destailleur
860b6e7557
Merge pull request #13812 from mapiolca/patch-45 
Fix issue in status name
 2020-05-06 02:23:15 +02:00
Laurent Destailleur
8f76d19827
Merge pull request #13822 from atm-florian/develop 
fix filter on date service contrat with hour
 2020-05-06 02:21:10 +02:00
Laurent Destailleur
d9cef1c8d7 Fix packager to publish on new web site 2020-05-06 01:49:19 +02:00
Laurent Destailleur
9f176c5e2d Fix trans 2020-05-06 01:41:10 +02:00
Laurent Destailleur
fa305fdaca Prepare version 11.0.4 2020-05-05 21:49:46 +02:00
Laurent Destailleur
eacb1b3b2e Debug modulebuilder 2020-05-05 21:45:10 +02:00