Laurent Destailleur
|
b8c2dd6025
|
Look and feel v12
|
2020-04-02 15:11:46 +02:00 |
|
Laurent Destailleur
|
84cda962c1
|
Clean dead code
|
2020-04-02 12:03:29 +02:00 |
|
Alexandre SPANGARO
|
af5444806d
|
Work on reconcilation of accouting account
|
2020-03-16 06:41:14 +01:00 |
|
Laurent Destailleur
|
891bc52532
|
Update accountingaccount.class.php
|
2020-03-15 11:12:10 +01:00 |
|
Laurent Destailleur
|
1a273551be
|
Update accountingaccount.class.php
|
2020-03-15 11:11:12 +01:00 |
|
stickler-ci
|
375bcf8720
|
Fixing style errors.
|
2020-03-15 07:01:36 +00:00 |
|
Alexandre SPANGARO
|
bc717bc6ae
|
Work on reconciliation of accouting account
|
2020-03-15 07:49:24 +01:00 |
|
Alexandre SPANGARO
|
86d9622360
|
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-27 10:44:04 +01:00 |
|
Laurent Destailleur
|
7b10c2440b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-29 23:08:42 +01:00 |
|
Laurent Destailleur
|
af61c19ffd
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-01-29 23:06:21 +01:00 |
|
altairis
|
f1ea0ce5a1
|
better fix
|
2020-01-29 11:47:23 +01:00 |
|
altairis
|
b04bb9e392
|
FIX : fetching account on current entity
|
2020-01-29 11:05:10 +01:00 |
|
Alexandre SPANGARO
|
c3518426bd
|
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
|
2020-01-03 22:05:49 +01:00 |
|
Laurent Destailleur
|
feef992d39
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-07 11:16:09 +01:00 |
|
Laurent Destailleur
|
de77e39e08
|
FIX #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC.
Now autofill works, option can be reverted in v11.
|
2019-11-07 11:14:36 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
57140b79dc
|
Restore official text of licence
|
2019-06-24 18:30:07 +02:00 |
|
Philippe GRAND
|
4d3107c57b
|
all http addresses should be https now
|
2019-06-23 15:43:32 +02:00 |
|
Laurent Destailleur
|
f41606ba15
|
Merge branch '10.0' into 10.0_Differentiated_export
|
2019-06-12 13:27:49 +02:00 |
|
Laurent Destailleur
|
fd0eb47b35
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/card.php
|
2019-05-29 09:57:48 +02:00 |
|
Laurent Destailleur
|
35b021f203
|
Fix phpcs
|
2019-05-29 09:53:54 +02:00 |
|
Laurent Destailleur
|
19ff0120ff
|
# WARNING: head commit changed in the meantime
Removed uselesss files (replaced by DebugBar)
|
2019-05-26 11:42:00 +02:00 |
|
Laurent Destailleur
|
bad565cc64
|
Fix syntax error
|
2019-05-24 18:13:24 +02:00 |
|
Laurent Destailleur
|
0fc7ad7c1f
|
Add one param to fetch of accounting account to solve chart import
|
2019-05-24 18:05:29 +02:00 |
|
Alexandre SPANGARO
|
d4e2fab983
|
Replace term "Advanced accountancy" by Accountancy (Double entries)
|
2019-05-13 22:25:15 +02:00 |
|
Laurent Destailleur
|
a8b645c7a3
|
Fix warnings
|
2019-04-23 13:07:46 +02:00 |
|
Philippe Grand
|
2a91629e57
|
Update accountingaccount.class.php
|
2019-03-18 12:24:52 +01:00 |
|
Philippe GRAND
|
c98f3ae4b3
|
add comments
|
2019-03-18 10:20:24 +01:00 |
|
Frédéric FRANCE
|
42a1387218
|
wip
|
2019-02-25 00:56:48 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +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 |
|
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 |
|
Laurent Destailleur
|
da2ba20653
|
Try fix for postgresql
|
2019-01-20 20:31:12 +01:00 |
|
Laurent Destailleur
|
f7c11ec7f4
|
Fix unit test on accounting
|
2019-01-20 17:06:24 +01:00 |
|
Frédéric FRANCE
|
550dc622ca
|
code comment
|
2018-10-20 13:40:40 +02:00 |
|
Philippe GRAND
|
6ea115f828
|
Standardize code
|
2018-10-09 09:04:27 +02:00 |
|
Philippe GRAND
|
da560289e3
|
Standardize code
|
2018-10-05 15:48:38 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Philippe GRAND
|
707f8b7312
|
fix merge
|
2018-09-04 14:49:56 +02:00 |
|
Frédéric FRANCE
|
2a9ef8dc05
|
move phpcs:ignore
|
2018-09-02 22:05:19 +02:00 |
|
Philippe GRAND
|
7b0d3c32ab
|
Standardize and Update code
|
2018-09-01 22:55:10 +02:00 |
|
Philippe GRAND
|
d86d7323fb
|
Update code
|
2018-09-01 22:46:35 +02:00 |
|
Philippe GRAND
|
091b8269a6
|
fix conflict
|
2018-09-01 22:42:42 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe Grand
|
df4a4aa6c9
|
Merge branch 'develop' into develop
|
2018-09-01 17:23:43 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Philippe Grand
|
5ec22d9fad
|
Update accountingaccount.class.php
|
2018-08-30 14:25:25 +02:00 |
|
Philippe Grand
|
b3c84ac3bc
|
Merge branch 'develop' into new_branch_29_08_2018
|
2018-08-30 12:09:40 +02:00 |
|
Philippe GRAND
|
2e66c65650
|
WTF...
|
2018-08-30 12:03:20 +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 |
|
Philippe GRAND
|
79988282af
|
Fix white spaces
|
2018-08-29 12:14:07 +02:00 |
|
Frédéric FRANCE
|
846778657f
|
fix syntax error
|
2018-08-29 11:44:26 +02:00 |
|
Philippe Grand
|
34ea3d479f
|
Update accountingaccount.class.php
|
2018-08-28 10:38:01 +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 |
|
Frédéric FRANCE
|
1182f29864
|
trimtrailing
|
2018-08-28 08:33:02 +02:00 |
|
Philippe Grand
|
3309badd8d
|
Update accountingaccount.class.php
|
2018-08-22 22:43:17 +02:00 |
|
Philippe Grand
|
ec8422af73
|
Update accountingaccount.class.php
|
2018-08-22 22:31:54 +02:00 |
|
Philippe GRAND
|
6542dcf0bd
|
Update and standardize code
|
2018-08-22 12:04:50 +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 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Laurent Destailleur
|
db3c17668e
|
Fix coding style
|
2018-08-21 19:08:11 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Philippe GRAND
|
c48211ad70
|
Update and standardize code
|
2018-08-17 19:31:22 +02:00 |
|
Frédéric FRANCE
|
69a7af88e7
|
function declaration
|
2018-08-15 18:14:02 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Laurent Destailleur
|
182abfdb5b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
|
2018-05-25 15:02:24 +02:00 |
|
Laurent Destailleur
|
de84f0e687
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
|
2018-05-21 23:35:09 +02:00 |
|
Sean Wang
|
8e397b772f
|
Fix sql error
|
2018-05-21 14:19:41 +08:00 |
|
Laurent Destailleur
|
26e10caa7d
|
FIX #8813
|
2018-05-18 09:15:18 +02:00 |
|
Alexandre SPANGARO
|
fd7bc2e607
|
Accountancy - move to loadLangs
|
2018-04-18 06:20:34 +02:00 |
|
Laurent Destailleur
|
a231074012
|
Save search criteria when using "back to" on accounting account
Change type of foreign key to be an integer to avoid CAST in requests
|
2018-04-09 11:31:24 +02:00 |
|
Laurent Destailleur
|
39c4df723a
|
Fix error management when setting product accounts
|
2018-01-22 21:07:10 +01:00 |
|
Laurent Destailleur
|
15ed7584b8
|
Fix navigation in accounting account card
|
2018-01-11 17:06:06 +01:00 |
|
Alexandre SPANGARO
|
7b935a96bf
|
FIX : Various payment
|
2017-12-11 07:03:37 +01:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Alexandre SPANGARO
|
b240f536b5
|
Fix : Accountancy - Debug and add information in database
|
2017-06-17 07:54:35 +02:00 |
|
Laurent Destailleur
|
fa290c34fa
|
Fix against SQL injection. Add phpunit to detect missing escapement.
|
2017-05-12 16:55:11 +02:00 |
|
Alexandre SPANGARO
|
94b69844f2
|
Add option no url
|
2017-05-01 20:39:46 +02:00 |
|
Alexandre SPANGARO
|
e11254a9bf
|
Add option on accounting account getNomUrl
|
2017-04-30 15:04:51 +02:00 |
|
Alexandre SPANGARO
|
b09398a68e
|
Update works
|
2017-03-19 15:23:35 +01:00 |
|
Laurent Destailleur
|
6c91cb4f90
|
Fix it was not possible to create/edit a new chart of account
|
2017-03-03 17:59:49 +01:00 |
|
Laurent Destailleur
|
37d0e7a2e8
|
Doxygen
|
2016-11-30 16:17:54 +01:00 |
|
Laurent Destailleur
|
6489cd6164
|
Debug accounting module
|
2016-10-07 12:10:16 +02:00 |
|
Laurent Destailleur
|
bac1f95e30
|
Fix consistency on permission. Missing the getLibStatut function.
|
2016-09-29 12:11:57 +02:00 |
|
aspangaro
|
b59c94e056
|
NEW: Accountancy - Add Result page
& review
|
2016-04-17 15:44:04 +02:00 |
|
aspangaro
|
1f31163e5e
|
Correct travis
|
2016-03-28 21:36:57 +02:00 |
|
aspangaro
|
2be979569d
|
Debug II
|
2016-03-28 21:03:47 +02:00 |
|
aspangaro
|
cbecb37c59
|
debug
|
2016-03-28 15:32:57 +02:00 |
|
aspangaro
|
436fb91901
|
Uniformize name of table
|
2016-03-28 14:50:51 +02:00 |
|