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

76844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ad0ed2bb19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 21:03:16 +02:00
Laurent Destailleur
d49891d009 All ->lignes were renamed into ->lines 2019-06-24 21:03:04 +02:00
Laurent Destailleur
d075f42d8b
Merge pull request #11028 from aspangaro/10.0_accounting6 
NEW Accounting - Add rights on export, delete operations in ledger
 2019-06-24 19:59:18 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
Laurent Destailleur
f66281d7e5
Update modAccounting.class.php 2019-06-24 19:50:22 +02:00
Laurent Destailleur
366efff633
Merge pull request #11107 from gentooza/develop 
NEW adding 'formObjectOptions' hooks loading at card.php of adherents module
 2019-06-24 19:20:36 +02:00
Laurent Destailleur
c3a109d790
Update card.php 2019-06-24 19:20:27 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse 
NEW add extrafield separator collapsing capabilities
 2019-06-24 19:04:51 +02:00
Laurent Destailleur
23c8b3305c Doc 2019-06-24 19:02:59 +02:00
Laurent Destailleur
9961b9c132
Merge pull request #11136 from ptibogxiv/patch-175 
NEW add multicurrency rate at currency list API
 2019-06-24 19:00:27 +02:00
Laurent Destailleur
604633afd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 18:45:15 +02:00
Laurent Destailleur
31ffa6bc69 FIX #11218 #11150 2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100 FIX #11218 #11150 2019-06-24 18:40:31 +02:00
Laurent Destailleur
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared 
NEW Add global task declared progression
 2019-06-24 18:12:55 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Laurent Destailleur
857233f175
Merge pull request #11394 from grandoc/new_branch_23_06_2019 
New branch 23 06 2019
 2019-06-24 16:40:50 +02:00
Laurent Destailleur
d6814111f3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:38:26 +02:00
Laurent Destailleur
803e2aa337 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-24 16:37:50 +02:00
Laurent Destailleur
862e20e820 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:37:29 +02:00
Laurent Destailleur
cc64e0fe52 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:36:26 +02:00
Laurent Destailleur
609eefaf08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:36:08 +02:00
Laurent Destailleur
ae1ad80994 Fix count 2019-06-24 16:32:42 +02:00
Laurent Destailleur
70f19b3a3d Fix counter of record 2019-06-24 16:31:56 +02:00
Laurent Destailleur
202fbf5e7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:31:09 +02:00
Laurent Destailleur
bf731e3de6 Fix trans 2019-06-24 16:30:55 +02:00
Laurent Destailleur
293b3987e8 CSS 2019-06-24 16:28:54 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
43123d6a87 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:13:36 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
84575df7e6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
Laurent Destailleur
cade08342c
Merge pull request #11390 from grandoc/develop 
translation
 2019-06-24 15:30:30 +02:00
Laurent Destailleur
7bbbe49b70
Merge pull request #11389 from atm-john/9.0_fix_ancor 
Fix send mail ancor
 2019-06-24 15:29:36 +02:00
Laurent Destailleur
60596d4237
Merge pull request #11376 from bafbes/abb90061 
Fix:modulebuilder output folder
 2019-06-24 15:29:13 +02:00
Laurent Destailleur
a340bb616d
Update myobject_document.php 2019-06-24 15:28:13 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0 
fix depending extrafeilds list
 2019-06-24 15:23:48 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
Laurent Destailleur
01b8522216 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 13:56:39 +02:00
Laurent Destailleur
7154ecb80b Fix reload of conf in cron script 2019-06-24 13:56:10 +02:00
Laurent Destailleur
76d49229cd Fix log 2019-06-24 13:42:46 +02:00
Laurent Destailleur
1c86294f83 Enhance pdf_getFormat 2019-06-24 13:39:32 +02:00
Laurent Destailleur
1699413a4c Add log 2019-06-24 12:59:16 +02:00
Philippe GRAND
72c8316eb0 all http addresses should be https now 2019-06-24 09:39:58 +02:00
Philippe GRAND
2e86344d9a all http addresses should be https now 2019-06-24 09:38:26 +02:00
Philippe GRAND
b731edef16 all http addresses should be https now 2019-06-24 09:37:05 +02:00
Philippe GRAND
40b09f1cf7 all http addresses should be https now 2019-06-24 09:35:41 +02:00
Laurent Destailleur
43fc0466e5 Fix position of modules 2019-06-23 20:05:15 +02:00