lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,007 Commits 43 Branches 150 Tags 886 MiB
506ba30d5a
Commit Graph

70007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
506ba30d5a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-06 20:54:14 +02:00
Laurent Destailleur
a7d26409c7 FIX trackid into email sent from member module. 2018-10-06 20:51:35 +02:00
Laurent Destailleur
fef40439be responsive 2018-10-06 20:05:41 +02:00
Laurent Destailleur
3e49935eac Fix online payment 2018-10-06 15:48:47 +02:00
Laurent Destailleur
a0ba01321b Fix phpcs 2018-10-06 12:50:32 +02:00
Laurent Destailleur
dc0489cdcf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-06 12:48:40 +02:00
Laurent Destailleur
df1c6e5aee Fix phpcs 2018-10-06 12:48:28 +02:00
Laurent Destailleur
086748396c
Merge pull request #9692 from ebzao/ebzao-546ec625b96d7ff1725fff1cf153f1865b2972f4 
Typo fix: "eee" in localtax1 display
 2018-10-06 12:47:14 +02:00
Laurent Destailleur
ccc6dea85c
Merge pull request #9686 from frederic34/patch-11 
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 2018-10-06 12:46:54 +02:00
Laurent Destailleur
36b75031f5
Merge pull request #9681 from ptibogxiv/patch-70 
Fix metadata for charge.php
 2018-10-06 12:44:16 +02:00
Laurent Destailleur
5045bbc3bd
Update newpayment.php 2018-10-06 12:44:06 +02:00
Laurent Destailleur
835ca4e4a5
Update newpayment.php 2018-10-06 12:42:14 +02:00
Laurent Destailleur
f742b0f55b
Merge pull request #9685 from frederic34/patch-9 
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
 2018-10-06 12:39:30 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Nicolas Aupetit
49693854ce
Typo fix: "eee" in localtax1 display 2018-10-06 13:51:46 +11:00
Laurent Destailleur
c0d45430c4 Fix phpcs 2018-10-06 03:15:27 +02:00
Laurent Destailleur
d1dde0ffac Include rgpd module with name DataPolicies 2018-10-06 02:51:47 +02:00
Laurent Destailleur
5437c2ae85 Fix popup on img_picto 2018-10-05 14:32:19 +02:00
Laurent Destailleur
4e84ed0e80 FIX Symbol of currency in substitution variables 2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1 FIX Symbol of currency in substitution variables 2018-10-05 13:58:38 +02:00
Laurent Destailleur
429b078708 Typo 2018-10-05 13:42:30 +02:00
ptibogxiv
0e83863d45
Add save or not source functionnality 2018-10-04 20:32:49 +02:00
Frédéric FRANCE
2fc54ccf66
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps 2018-10-04 20:23:58 +02:00
Laurent Destailleur
10033e8f64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 20:22:56 +02:00
Laurent Destailleur
f154139a0e Reduce length of tab title "Bank" 2018-10-04 20:22:25 +02:00
Frédéric FRANCE
48a063eca4
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody 2018-10-04 20:18:24 +02:00
Laurent Destailleur
29cafc78d0
Merge pull request #9634 from grandoc/new_branch_29_09_2018 
add some significant info within notification mail
 2018-10-04 19:31:31 +02:00
Laurent Destailleur
4fad28d360
Update notify.class.php 2018-10-04 19:30:45 +02:00
Laurent Destailleur
2232bd3944
Update notify.class.php 2018-10-04 19:30:03 +02:00
ptibogxiv
f5966e6303
Update newpayment.php 2018-10-04 19:29:52 +02:00
Laurent Destailleur
41add1c251 Standardize code 2018-10-04 19:19:29 +02:00
Laurent Destailleur
6fcb45cf40 Rename page various_payment/index.php into list.php (coding rule) 2018-10-04 19:10:39 +02:00
Laurent Destailleur
3e36612a52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 19:07:51 +02:00
Laurent Destailleur
5b350a0322 Use short label 2018-10-04 19:07:38 +02:00
Laurent Destailleur
571bc86836
Update newpayment.php 2018-10-04 19:03:18 +02:00
Laurent Destailleur
20f45db6b8
Merge pull request #9677 from grandoc/new_branch_04_10_2018 
Standardize and update code
 2018-10-04 18:33:24 +02:00
Laurent Destailleur
5034264d60 Debug / Standardize code 2018-10-04 18:27:49 +02:00
Laurent Destailleur
ebba33635b Close #9674 by keeping old code present (this help for transition tests) 2018-10-04 18:20:57 +02:00
Laurent Destailleur
09fbe479d1 Missing picto 2018-10-04 18:01:20 +02:00
Laurent Destailleur
b52a38bcd2 Trans 2018-10-04 17:59:34 +02:00
Laurent Destailleur
31916c94f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:56:56 +02:00
Laurent Destailleur
9fe5f242a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-04 17:53:59 +02:00
Laurent Destailleur
13759ea146 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2018-10-04 17:53:40 +02:00
Laurent Destailleur
3060647212 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
Laurent Destailleur
1c735ea6d5
Merge pull request #9673 from atm-florian/dev_resource 
NEW : add event tab on resource card
 2018-10-04 17:45:01 +02:00
Laurent Destailleur
2aca9cb394
Update company.lib.php 2018-10-04 17:44:47 +02:00
Laurent Destailleur
75b9140446
Merge pull request #9672 from atm-florian/8.0 
FIX ressource list with extrafields
 2018-10-04 17:40:42 +02:00
Laurent Destailleur
577192554d
Merge pull request #9670 from oas-services/7.0 
Fix issue #9434 : no array_options available when calling api on order line and invoice line
 2018-10-04 17:39:37 +02:00