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

61124 Commits

Author SHA1 Message Date
Philippe GRAND
da560289e3 Standardize code 2018-10-05 15:48:38 +02:00
Philippe GRAND
94df8d297d Standardize code 2018-10-05 15:44:57 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +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
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
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
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
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
Laurent Destailleur
3b7af822db
Merge pull request #9663 from frederic34/patch-18 
add missing translation key found in box graph
 2018-10-04 17:26:42 +02:00
Laurent Destailleur
ba3552558c
Merge pull request #9662 from frederic34/patch-17 
remove useless param
 2018-10-04 17:26:21 +02:00
Laurent Destailleur
9f2a2be837
Merge pull request #9661 from frederic34/patch-16 
remove useless phpcs:disable
 2018-10-04 17:25:44 +02:00
Laurent Destailleur
0fd7a5a172
Merge pull request #9659 from frederic34/patch-15 
typo in template
 2018-10-04 17:22:47 +02:00
Laurent Destailleur
301f7349e0
Merge pull request #9656 from fmarcet/8.0 
FIX Can't create shipping if have shipping line's extrafields
 2018-10-04 17:22:24 +02:00
Laurent Destailleur
34f1691302
Merge pull request #9655 from frederic34/patch-11 
group same condition into one in html.formprojet.class.php
 2018-10-04 17:15:15 +02:00
Laurent Destailleur
16aef0e9fc
Merge pull request #9651 from frederic34/patch-9 
fix td filecheck
 2018-10-04 17:09:46 +02:00
Laurent Destailleur
9e95ae0e3a
Merge pull request #9650 from bafbes/abb80017 
Fix : backtopage link in listings
 2018-10-04 17:09:25 +02:00
Laurent Destailleur
dec313810d
Update myobject_list.php 2018-10-04 17:09:19 +02:00
Laurent Destailleur
3a0d777df7
Merge pull request #9649 from lex111/replaces-load 
Replace multiple load calls with loadLangs method
 2018-10-04 17:05:48 +02:00
Laurent Destailleur
f6099fba15 Fix phpcs 2018-10-04 16:58:34 +02:00
Laurent Destailleur
1f44380dd1 Clean code 2018-10-04 16:20:55 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae FIX Backup of database without mysqladmin available from cron. 2018-10-04 13:10:48 +02:00
Laurent Destailleur
7a94f4fc00 Add more logs 2018-10-04 11:34:46 +02:00
Philippe GRAND
e045d0e9ac Translation 2018-10-04 09:55:05 +02:00
Philippe GRAND
8bee69277d Standardize and update code 2018-10-04 09:33:30 +02:00
Philippe GRAND
d2ec703b51 Standardize and update code 2018-10-04 09:24:57 +02:00
Philippe GRAND
c32b96c207 Standardize and update code 2018-10-04 09:15:15 +02:00
florian HENRY
d09bbe4690 NEW : add event tab on resource card 2018-10-03 21:13:02 +02:00
Laurent Destailleur
378013b863 Better select language component 2018-10-03 20:58:45 +02:00