Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Laurent Destailleur
|
87ec1de78e
|
Start to work on solution to sort permissions by module
|
2019-10-17 18:43:07 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
035da6a711
|
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
|
2019-10-07 14:24:22 +02:00 |
|
Laurent Destailleur
|
edfedbb818
|
FIX Load chart of account only if we click or select button "Load chart"
|
2019-10-06 21:13:55 +02:00 |
|
Laurent Destailleur
|
80c1a92872
|
FIX Load chart of account only if we click or select button "Load chart"
|
2019-10-06 21:11:29 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Alexandre SPANGARO
|
a6e429ff32
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-10-02 08:49:00 +02:00 |
|
Alexandre SPANGARO
|
f91513937a
|
Remove option to hide FAQ
|
2019-09-30 21:37:20 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
a005408d83
|
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
|
2019-09-23 20:42:50 +02:00 |
|
Laurent Destailleur
|
86d39b435b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-12 02:42:11 +02:00 |
|
Laurent Destailleur
|
e21d6289ea
|
FIX Can't add a new chart of account
|
2019-08-10 02:09:59 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
6c23154a91
|
FIX #11506
|
2019-07-15 22:59:18 +02:00 |
|
Laurent Destailleur
|
cf00ae971a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-15 22:45:29 +02:00 |
|
Laurent Destailleur
|
e396824133
|
FIX #11507
|
2019-07-15 19:08:57 +02:00 |
|
Laurent Destailleur
|
57140b79dc
|
Restore official text of licence
|
2019-06-24 18:30:07 +02:00 |
|
Philippe GRAND
|
fea969dc63
|
all http addresses should be https now
|
2019-06-23 15:39:25 +02:00 |
|
Laurent Destailleur
|
afb6362317
|
Fix look and feel v10
Fix link to direct debit payment order
|
2019-06-20 13:37:06 +02:00 |
|
Alexandre SPANGARO
|
2085958a69
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-23 11:10:07 +02:00 |
|
Laurent Destailleur
|
e463b17c15
|
Fix look and feel v10
|
2019-05-21 15:31:56 +02:00 |
|
Alexandre SPANGARO
|
d9e9cb2ea9
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-20 15:02:05 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Alexandre SPANGARO
|
d4e2fab983
|
Replace term "Advanced accountancy" by Accountancy (Double entries)
|
2019-05-13 22:25:15 +02:00 |
|
Laurent Destailleur
|
e37519ed89
|
Fix label
|
2019-05-07 22:43:59 +02:00 |
|
Laurent Destailleur
|
60bf3452c3
|
Hide export in EEC for non european countries
|
2019-05-04 12:26:54 +02:00 |
|
Alexandre SPANGARO
|
61547e3f82
|
NEW Manage account sell_intra & sell_export in page default product
|
2019-05-03 14:08:20 +02:00 |
|
Laurent Destailleur
|
4421dedbd2
|
Merge pull request #11008 from aspangaro/10.0_closure
FIX: Update blocked by datec on fiscal year
|
2019-04-24 10:28:23 +02:00 |
|
Laurent Destailleur
|
74d0edfc59
|
Removed not used file
|
2019-04-23 13:24:32 +02:00 |
|
Laurent Destailleur
|
7c458ee4c0
|
TODO
|
2019-04-23 13:02:25 +02:00 |
|
Laurent Destailleur
|
1c90d157a0
|
Look and feel v10
|
2019-04-19 18:45:01 +02:00 |
|
Laurent Destailleur
|
94ca74b37e
|
Merge pull request #11009 from bafbes/abb90047
fix:Select chart plan from active countries only 2829bfc
|
2019-04-19 13:12:00 +02:00 |
|
Laurent Destailleur
|
6d34a38042
|
Update account.php
|
2019-04-19 13:11:50 +02:00 |
|
Laurent Destailleur
|
cb8f9cc120
|
Fix link
|
2019-04-19 12:37:55 +02:00 |
|
Laurent Destailleur
|
87eb5f5c02
|
Fix filter lost
|
2019-04-19 12:36:32 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Abbes Bahfir
|
2829bfc84f
|
fix:Select chart plan from active countries only
|
2019-04-14 17:36:16 +01:00 |
|
Alexandre SPANGARO
|
c1ecfae6f2
|
FIX: Update on fiscal year
|
2019-04-13 22:46:40 +02:00 |
|
Laurent Destailleur
|
c62d147c60
|
Auto clean search field to avoid to have 2 conflict search criteria
|
2019-03-25 16:47:20 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Philippe GRAND
|
d118d269a2
|
update with html5 compliant code
|
2019-03-19 13:44:21 +01:00 |
|
Laurent Destailleur
|
d4f2a16abf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
|
2019-03-14 17:10:58 +01:00 |
|
Laurent Destailleur
|
8410d59182
|
FIX Missing field "In sale" in list
|
2019-03-14 16:16:50 +01:00 |
|
Laurent Destailleur
|
5ccfba1210
|
FIX Edit of personalized groups
Conflicts:
htdocs/accountancy/admin/categories.php
|
2019-03-14 16:06:20 +01:00 |
|
Laurent Destailleur
|
3ab5c3e6ab
|
FIX Edit of personalized groups
|
2019-03-14 16:03:37 +01:00 |
|
Frédéric FRANCE
|
a836c75d70
|
replace html by html5 in accountancy
|
2019-03-03 10:31:46 +01:00 |
|
Laurent Destailleur
|
b33b3698c8
|
Merge pull request #10691 from aspangaro/develop
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
|
2019-02-27 02:18:20 +01:00 |
|
Alexandre SPANGARO
|
1c59554806
|
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
|
2019-02-25 22:22:31 +01:00 |
|
Alexandre SPANGARO
|
49a975beb3
|
Update works
|
2019-02-18 07:14:21 +01:00 |
|
Alexandre SPANGARO
|
93a0cdd6d6
|
NEW: Add accounting account for result
Use for closure workflow
|
2019-02-18 06:00:21 +01:00 |
|
Laurent Destailleur
|
9dc2a1f148
|
Update productaccount.php
|
2019-02-12 12:51:52 +01:00 |
|
Laurent Destailleur
|
53b2100dbb
|
Update productaccount.php
|
2019-02-12 12:50:36 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
d0b20178e0
|
Merge pull request #10442 from aspangaro/10.0_accountancy_default
NEW: When you create product or service, sell accountancy account by default are proposed
|
2019-01-30 16:30:13 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
bdbc61c1aa
|
Merge pull request #10454 from grandoc/new_branch_30_01_2019
update with html5 compliant code
|
2019-01-30 16:01:08 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Philippe GRAND
|
cf27065ed1
|
update with html5 compliant code
|
2019-01-30 09:24:22 +01:00 |
|
Philippe GRAND
|
bb6159784a
|
update with html5 compliant code
|
2019-01-30 08:42:31 +01:00 |
|
Alexandre SPANGARO
|
64975b3b9e
|
NEW: When you create product or service, sell accountancy account by default are proposed
|
2019-01-28 22:27:55 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +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
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +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
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +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 |
|
Philippe GRAND
|
133e6f3de0
|
useless code
|
2019-01-25 16:27:36 +01:00 |
|
Philippe GRAND
|
0d089f2fec
|
fix : The condition == 3 is always false
|
2019-01-25 15:50:30 +01:00 |
|
Philippe GRAND
|
f045cf353b
|
update with html5 compliant code
|
2019-01-21 21:13:42 +01:00 |
|
Philippe Grand
|
dff30f17a5
|
Update productaccount.php
|
2019-01-16 19:20:28 +01:00 |
|
Philippe Grand
|
c9aa00c09f
|
Update productaccount.php
|
2019-01-16 19:19:54 +01:00 |
|
Philippe Grand
|
6d266d78b1
|
Update productaccount.php
|
2019-01-16 19:19:14 +01:00 |
|
Philippe Grand
|
27edf7c803
|
Update importaccounts.php
|
2019-01-16 19:18:36 +01:00 |
|
Philippe Grand
|
9e699b59ad
|
Update fiscalyear.php
|
2019-01-16 19:17:53 +01:00 |
|
Philippe GRAND
|
3168c76946
|
update with html5 compliant code
|
2019-01-16 17:39:40 +01:00 |
|
Alexandre SPANGARO
|
41c7af590d
|
NEW: Accountancy - Add default accounting account for member subcriptions
|
2018-12-29 22:11:24 +01:00 |
|
Laurent Destailleur
|
eb66d45947
|
Merge branch 'develop' into 10.0_accoutancy_stats
|
2018-12-15 15:17:15 +01:00 |
|
Laurent Destailleur
|
e0011222d1
|
Fix syntax error
|
2018-12-14 16:25:37 +01:00 |
|
Laurent Destailleur
|
185524bd50
|
Update fiscalyear.php
|
2018-12-14 15:49:58 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Alexandre SPANGARO
|
088c002ed1
|
NEW: Add stats on entries & movements by fiscal year
|
2018-12-02 11:01:11 +01:00 |
|
Alexandre SPANGARO
|
703d3d90eb
|
Revert "Fix create accounting account from balance"
This reverts commit 9154fd366f.
|
2018-11-24 22:40:04 +01:00 |
|
Alexandre SPANGARO
|
9154fd366f
|
Fix create accounting account from balance
|
2018-11-24 22:30:06 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
Laurent Destailleur
|
84983140b6
|
Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
|
2018-11-11 17:35:35 +01:00 |
|
Laurent Destailleur
|
ed3a333436
|
Fix phpcs
|
2018-11-10 13:11:18 +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
|
7dd941dd51
|
Fix bad fix
|
2018-11-06 19:51:16 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|