Commit Graph

208 Commits

Author SHA1 Message Date
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
7be2097e87 Fix phpcs 2018-12-14 12:00:14 +01:00
Laurent Destailleur
8b0919d7e4 Fix phpcs 2018-12-14 11:26:37 +01:00
Laurent Destailleur
fec64a78ab Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
46db246273 Look and feel v9: Autofocus on create forms 2018-11-07 13:04:43 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Maxime Kohlhaas
2fe4763570 Fix default accounting accounts on loan creation #9643 2018-10-28 09:22:55 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
atm-greg
44b317e03e fix display 2018-10-19 16:49:32 +02:00
atm-greg
6a3661586f create payment for the last loanschedule 2018-10-19 16:12:21 +02:00
atm-greg
582608cc57 manage fk_bank on loanschedule 2018-10-19 15:36:13 +02:00
atm-greg
db2937715d create payment from loan schedule 2018-10-18 17:27:08 +02:00
atm-greg
f0849aaf81 schedule as a tab 2018-10-18 17:16:38 +02:00
atm-greg
ff92572d56 add insurance amount on loan 2018-10-18 17:03:49 +02:00
Laurent Destailleur
d57e55387d Merge branch 'develop' into payloan 2018-10-16 19:43:34 +02:00
Frédéric FRANCE
2e6f0d3d19 clean loan code 2018-10-15 20:40:59 +02:00
Frédéric FRANCE
7ea4f7ea0b clean loan code 2018-10-15 20:36:11 +02:00
Philippe GRAND
c264688635 Standardize and update code 2018-10-11 09:53:36 +02:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Maxime Kohlhaas
75104999d3 NEW PHPUnitTest on Loan class #3163 2018-09-20 15:04:00 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
05fc484d42 Update loan.class.php 2018-09-12 22:53:09 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
6291f18179 Merge pull request #9440 from frederic34/patch-5
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Frédéric FRANCE
b2a58067d9 replace select_date 2018-09-09 09:56:33 +02:00
Frédéric FRANCE
7b15a92318 Update card.php 2018-09-08 23:15:05 +02:00
Frédéric FRANCE
a01918a340 Upper-Lower-Casing 2018-09-08 23:13:33 +02:00
Frédéric FRANCE
80880d8fb9 replace select_date by selectDate 2018-09-08 13:00:39 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
61c4e9831f move phpcs:ignore 2018-09-02 18:18:10 +02:00
Frédéric FRANCE
04c1a7d4af move phpcs:ignore 2018-09-02 13:38:11 +02:00
Frédéric FRANCE
e98b8e5e25 move phpcs:ignore 2018-09-02 09:27:59 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Laurent Destailleur
c3438b79c8 Fix merge 2018-09-01 15:39:11 +02:00
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
5604f3b0c3 Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
2018-09-01 12:59:32 +02:00
Frédéric FRANCE
4c0b083f45 function Comment Missing 2018-08-31 22:11:52 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Frédéric FRANCE
0e512cbc36 Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00