Laurent Destailleur
|
2ccef4e469
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
|
2019-11-11 19:10:35 +01:00 |
|
Laurent Destailleur
|
5a4a421a8e
|
FIX #12372
|
2019-11-07 13:07:40 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
a1f0245c79
|
clean indent in compta, contact directory
|
2019-10-26 18:13:20 +02:00 |
|
Laurent Destailleur
|
b4eb14ee44
|
Use dolGetStatus
|
2019-10-24 16:43:23 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
6abfd8b145
|
Fix use short labels for workboard
|
2019-08-19 10:01:42 +02:00 |
|
Laurent Destailleur
|
f27bea9497
|
Fix phpcs
|
2019-08-18 20:39:02 +02:00 |
|
Laurent Destailleur
|
ad5f2dbe9d
|
Fix update on id
|
2019-08-18 18:56:58 +02:00 |
|
Jean Traullé
|
6edf5494c3
|
Added @throws annotations for possible exceptions
|
2019-08-15 15:29:37 +02:00 |
|
Jean Traullé
|
f37b8c78c8
|
NEW Add POST /bankaccounts/transfer REST API endpoint.
This allow internal transfers between two bankaccounts.
|
2019-08-15 15:18:09 +02:00 |
|
Alexandre SPANGARO
|
5f042cf6ad
|
QUAL Move ligne.php to line.php
|
2019-07-19 23:19:06 +02:00 |
|
Laurent Destailleur
|
280a034199
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-05-29 13:15:57 +02:00 |
|
Laurent Destailleur
|
cafb3840b7
|
Fix look and feel v10
|
2019-05-29 12:56:11 +02:00 |
|
Alexandre SPANGARO
|
19b275f2d1
|
Fix bankline cat with various payment
|
2019-05-26 22:33:35 +02:00 |
|
Alexandre SPANGARO
|
ea13657617
|
Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2
|
2019-05-26 14:23:47 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Alexandre SPANGARO
|
9210a39f6a
|
Merge branch 'develop' into 10.0_accountancy2
|
2019-04-24 21:49:41 +02:00 |
|
Laurent Destailleur
|
ee4150665e
|
Fix phpcs
|
2019-03-21 20:15:19 +01:00 |
|
Philippe GRAND
|
86c3b1a5b0
|
add some comments
|
2019-03-21 14:59:21 +01:00 |
|
Alexandre SPANGARO
|
ad485b55b6
|
NEW: Add category to bank transaction in various payment
|
2019-03-10 20:01:39 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Frédéric FRANCE
|
62501b11e8
|
add visibility
|
2019-03-02 00:14:22 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Alexandre SPANGARO
|
2ba8ae00e4
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-02-06 21:56:01 +01:00 |
|
Alexandre SPANGARO
|
13cf3b1d7f
|
Add subledger in various payment
|
2019-02-01 15:50:12 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Laurent Destailleur
|
eb66d45947
|
Merge branch 'develop' into 10.0_accoutancy_stats
|
2018-12-15 15:17:15 +01:00 |
|
Laurent Destailleur
|
21b3bbc2e6
|
Merge
|
2018-12-08 11:55:27 +01:00 |
|
Laurent Destailleur
|
a915d82883
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2018-12-08 11:42:30 +01:00 |
|
Laurent Destailleur
|
5ce26bae1b
|
Fix form of bank info for CH
|
2018-12-04 22:01:35 +01:00 |
|
Alexandre SPANGARO
|
088c002ed1
|
NEW: Add stats on entries & movements by fiscal year
|
2018-12-02 11:01:11 +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 |
|
Laurent Destailleur
|
01adaf253c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
|
2018-10-24 03:35:44 +02:00 |
|
Laurent Destailleur
|
f8316abfc0
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
|
2018-10-24 02:58:29 +02:00 |
|
Laurent Destailleur
|
919c4fc5bc
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/theme/md/style.css.php
|
2018-10-24 02:40:57 +02:00 |
|
Laurent Destailleur
|
99fde00902
|
Merge pull request #9719 from frederic34/patch-11
do not trim int
|
2018-10-12 17:35:04 +02:00 |
|
Laurent Destailleur
|
cb29209457
|
NEW Enhancement in process to make manual bank conciliation
|
2018-10-10 12:47:18 +02:00 |
|
Frédéric FRANCE
|
03fcc2f088
|
Update paymentvarious.class.php
|
2018-10-09 20:31:14 +02:00 |
|
Frédéric FRANCE
|
b917fd0cf2
|
do not trim int
|
2018-10-09 19:41:53 +02:00 |
|
Philippe GRAND
|
e9bd1be41b
|
Standardize and update code
|
2018-10-09 15:38:42 +02:00 |
|
Laurent Destailleur
|
5034264d60
|
Debug / Standardize code
|
2018-10-04 18:27:49 +02:00 |
|
Philippe GRAND
|
15ff9f8917
|
Standardize and update code
|
2018-09-28 14:44:47 +02:00 |
|
Philippe GRAND
|
803505b6b7
|
Standardize and update code
|
2018-09-20 12:27:06 +02:00 |
|
Frédéric FRANCE
|
ce76a2e714
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-12 20:21:35 +02:00 |
|
Frédéric FRANCE
|
cdc5a174aa
|
Update account.class.php
|
2018-09-11 00:29:01 +02:00 |
|
Frédéric FRANCE
|
7e0b1055db
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-09 13:36:53 +02:00 |
|
Laurent Destailleur
|
84bbe8684b
|
Fix scrutinizer
|
2018-09-08 18:38:24 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Philippe GRAND
|
38ca6096b2
|
Standardize and update code
|
2018-09-05 10:31:12 +02:00 |
|
Frédéric FRANCE
|
7799774ca1
|
move phpcs:ignore
|
2018-09-04 22:52:55 +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
|
04c1a7d4af
|
move phpcs:ignore
|
2018-09-02 13:38:11 +02:00 |
|
Philippe GRAND
|
c4f05aff28
|
Standardize and update code
|
2018-09-02 10:42:31 +02:00 |
|
Philippe GRAND
|
ae2df6be11
|
Standardize and Update code
|
2018-09-01 23:04:46 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Philippe GRAND
|
7354e485b0
|
precise label comment
|
2018-09-01 13:22:08 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Laurent Destailleur
|
b863b5176d
|
Merge pull request #9322 from grandoc/new_branch_29_08_2018
New branch 29 08 2018
|
2018-09-01 12:11:01 +02:00 |
|
Philippe GRAND
|
edaa575435
|
Standardize and update code
|
2018-08-31 18:36:15 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Philippe GRAND
|
88ad651743
|
Fix white spaces
|
2018-08-29 12:26:47 +02:00 |
|
Philippe Grand
|
1337d85a29
|
Update bankcateg.class.php
|
2018-08-28 10:40:41 +02:00 |
|
Philippe GRAND
|
65af8f902f
|
Update and standardize code
|
2018-08-28 09:44:54 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Philippe GRAND
|
2fa82edd39
|
Standardize and update code
|
2018-08-23 17:07:27 +02:00 |
|
Philippe GRAND
|
504b0e3d16
|
Update and standardize code
|
2018-08-22 18:34:50 +02:00 |
|
Philippe GRAND
|
6542dcf0bd
|
Update and standardize code
|
2018-08-22 12:04:50 +02:00 |
|
Philippe GRAND
|
e0462b975b
|
Update and standardize code
|
2018-08-22 11:48:26 +02:00 |
|
Philippe GRAND
|
95349365ba
|
Update and standardize code
|
2018-08-22 11:39:37 +02:00 |
|
Philippe GRAND
|
0ffad50974
|
Update and standardize code
|
2018-08-22 11:24:31 +02:00 |
|
Philippe GRAND
|
29f15b4ae6
|
Update and standardize code
|
2018-08-22 10:51:55 +02:00 |
|
Philippe GRAND
|
a669830427
|
Update and standardize code
|
2018-08-22 10:37:16 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Frédéric FRANCE
|
39462742e2
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-16 08:17:55 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Laurent Destailleur
|
5c712a6cd3
|
Merge branch 'develop' into trimtrailing
|
2018-08-16 00:47:09 +02:00 |
|
Frédéric FRANCE
|
69a7af88e7
|
function declaration
|
2018-08-15 18:14:02 +02:00 |
|
Frédéric FRANCE
|
d25fa61998
|
return comment
|
2018-08-14 13:14:55 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
c991a4d204
|
trim trailing
|
2018-07-26 18:05:20 +02:00 |
|