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

69421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class 2018-09-16 13:59:15 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
9c4f582f5c Merge 2018-09-16 12:52:11 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Laurent Destailleur
f7c2bd877a Comment dead code 2018-09-16 10:39:30 +02:00
Laurent Destailleur
10c6bc44ca Fix scrutinizer 2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee Remove warnings 2018-09-16 10:09:19 +02:00
Laurent Destailleur
d9ffba72f0 Fix use fetch_object instead of fetch_array 2018-09-16 10:03:47 +02:00
Laurent Destailleur
2527127859 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 09:50:30 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
a0bcf999c5 FIX #9043 2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b FIX #9043 2018-09-16 09:44:52 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
272944983c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-16 09:27:54 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
39419367b6
Merge pull request #9491 from frederic34/patch-11 
reduce complexity of libstatut expedition.class.php
 2018-09-16 08:56:02 +02:00
Laurent Destailleur
1aaf395831
Merge pull request #9524 from frederic34/patch-19 
update code comment lettering class
 2018-09-16 08:55:44 +02:00
Laurent Destailleur
de0355ac59
Merge pull request #9523 from frederic34/patch-18 
reduce complexity libstatut adherent
 2018-09-16 08:55:25 +02:00
Laurent Destailleur
2e7394efc0
Merge pull request #9522 from frederic34/patch-17 
reduce complexity libstatut societe.account.class
 2018-09-16 08:55:14 +02:00
Laurent Destailleur
62d4955db0
Merge pull request #9521 from frederic34/patch-16 
reduce complexity of showWeather
 2018-09-16 08:55:04 +02:00
Laurent Destailleur
48ff10e76f
Merge pull request #9520 from frederic34/patch-15 
reduce complexity libstatut commande fournisseur class
 2018-09-16 08:54:44 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14 
reduce complexity of libstatut inventory.class.php
 2018-09-16 08:54:22 +02:00
Laurent Destailleur
949cd5f82f
Merge pull request #9518 from frederic34/patch-10 
reduce complexity of libstatut product.class.php
 2018-09-16 08:54:12 +02:00
Laurent Destailleur
11c9ac8b13
Merge pull request #9517 from frederic34/patch-9 
remove superfluous space
 2018-09-16 08:53:40 +02:00
Frédéric FRANCE
e8d2cb6135
update code comment lettering class 2018-09-16 08:39:43 +02:00
Frédéric FRANCE
4a57a75758
Merge branch 'develop' into patch-9 2018-09-16 08:09:18 +02:00
Frédéric FRANCE
8f5e5be01c
reduce complexity libstatut adherent 2018-09-16 08:06:17 +02:00
Frédéric FRANCE
e89ef9c3db
reduce complexity libstatut societe.account.class 2018-09-16 07:58:16 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018 
New branch 15 09 2018
 2018-09-15 23:59:10 +02:00
Laurent Destailleur
856b1e7f40 Fix phpcs 2018-09-15 23:58:02 +02:00
Frédéric FRANCE
c15ccb0498
reduce complexity of showWeather 2018-09-15 22:38:16 +02:00
Frédéric FRANCE
fafa7f18b1
reduce complexity libstatut fournisseur.commande;class.php 2018-09-15 22:24:57 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php 2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php 2018-09-15 22:13:54 +02:00
Frédéric FRANCE
c86e734299
remove superfluous space 2018-09-15 21:06:33 +02:00
Laurent Destailleur
edb3671cf3
Merge pull request #9502 from frederic34/contractHookFormConfirm 
NEW add hook formconfirm to contractcard
 2018-09-15 17:31:56 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018 
Standardize and update code
 2018-09-15 17:30:14 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing 
printing remove no camelcaps function
 2018-09-15 17:29:21 +02:00
Laurent Destailleur
e9159dda02
Merge pull request #9513 from ptibogxiv/patch-62 
FIX link in connect mode
 2018-09-15 17:28:35 +02:00
Laurent Destailleur
8ceee52d97
Merge pull request #9507 from frederic34/stripetransac 
clean code indentation completely broken
 2018-09-15 17:27:20 +02:00
Laurent Destailleur
c587de4a3d
Merge branch 'develop' into stripetransac 2018-09-15 17:27:04 +02:00
Laurent Destailleur
4efab446d0
Merge pull request #9508 from frederic34/patch-15 
reduce complexity of libstatut propal.class.php
 2018-09-15 17:24:59 +02:00
Laurent Destailleur
ecfbe0a568
Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate 
FIX #9497
 2018-09-15 17:14:05 +02:00
Laurent Destailleur
1749c07ffe
Merge pull request #9496 from ptibogxiv/patch-61 
Fix currency display in transaction.php
 2018-09-15 17:07:27 +02:00
Laurent Destailleur
69a577f58d
Update transaction.php 2018-09-15 17:07:18 +02:00