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 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
0e464ea4f5
|
Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-26 15:31:24 +02:00 |
|
Frédéric FRANCE
|
21c441540c
|
add string cast
|
2018-10-25 21:57:19 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Philippe Grand
|
7e82e3d44c
|
Update card.php
|
2018-10-12 19:13:07 +02:00 |
|
Philippe GRAND
|
1cfb06934c
|
Standardize and update code
|
2018-10-12 16:49:53 +02:00 |
|
Philippe GRAND
|
bd426d1052
|
Standardize and update code
|
2018-10-12 16:44:25 +02:00 |
|
Philippe GRAND
|
4df574d58e
|
Standardize and update code
|
2018-10-12 16:23:27 +02:00 |
|
Philippe GRAND
|
c5edb3289b
|
Standardize and update code
|
2018-10-12 16:09:05 +02:00 |
|
Philippe GRAND
|
181c1e0b77
|
Standardize and update code
|
2018-10-12 16:01:27 +02:00 |
|
Philippe GRAND
|
9d4f6dc444
|
Standardize and update code
|
2018-10-12 15:55:36 +02:00 |
|
Laurent Destailleur
|
6c55bfc0f7
|
Fix export and remove duplicate csv export.
|
2018-10-10 19:45:26 +02:00 |
|
Laurent Destailleur
|
1f44380dd1
|
Clean code
|
2018-10-04 16:20:55 +02:00 |
|
Laurent Destailleur
|
111d589474
|
NEW Can mix offset before and after with rules for due date of invoices
|
2018-10-04 16:06:26 +02:00 |
|
Laurent Destailleur
|
e07ce644e8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
|
2018-09-18 11:49:35 +02:00 |
|
Laurent Destailleur
|
2d8eb034e3
|
FIX Maxi debug to allow to load chart of account with multicompany
|
2018-09-17 21:02:07 +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
|
8c5a785797
|
completely comment unused code
|
2018-09-09 13:42:38 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Frédéric FRANCE
|
cb97a29fc0
|
introduce seletDate
|
2018-09-08 12:00:11 +02:00 |
|
Frédéric FRANCE
|
7e0ef3ad7e
|
Update fiscalyear_card.php
|
2018-09-06 22:10:19 +02:00 |
|
Laurent Destailleur
|
540999faa5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
|
2018-09-03 14:06:51 +02:00 |
|
Laurent Destailleur
|
47655f0725
|
Add comment as FIXME
|
2018-09-03 14:00:12 +02:00 |
|
Laurent Destailleur
|
bcee0ef0ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
|
2018-09-01 14:16:57 +02:00 |
|
Frédéric FRANCE
|
2b5407c31d
|
Update export.php
|
2018-09-01 13:30:28 +02:00 |
|
Frédéric FRANCE
|
6113b536a0
|
remove superfluous spaces
|
2018-08-12 19:59:39 +02:00 |
|
Philippe GRAND
|
5a4524451c
|
standardize
|
2018-07-28 14:02:33 +02:00 |
|
Laurent Destailleur
|
5c93fa1bfb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
|
2018-06-26 01:25:03 +02:00 |
|
Laurent Destailleur
|
ca04ffe420
|
Load lang
|
2018-06-22 17:07:49 +02:00 |
|
Laurent Destailleur
|
4a5fd35e11
|
Look and feel v8
|
2018-06-13 22:57:41 +02:00 |
|
Alexandre SPANGARO
|
f2c04c5653
|
Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
|
2018-06-05 20:37:39 +02:00 |
|
Frédéric FRANCE
|
d986909109
|
loadlangs
|
2018-05-26 23:52:52 +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 |
|
Laurent Destailleur
|
004c85b4ed
|
Update journals_list.php
|
2018-05-18 11:35:37 +02:00 |
|
Abbes Bahfir
|
933e277862
|
Fix: Add journal label translation in journal list
|
2018-05-16 19:59:56 +01:00 |
|
Alexandre SPANGARO
|
88bc2dd416
|
Correct insert
|
2018-05-14 20:59:38 +02:00 |
|
Alexandre SPANGARO
|
2f1ac6fad8
|
Fix : Double WHERE on admin/journal_list.php
|
2018-05-13 20:35:07 +02:00 |
|
Laurent Destailleur
|
546da0ceda
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
|
2018-05-05 14:40:39 +02:00 |
|
Laurent Destailleur
|
9c68b81f59
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
|
2018-05-05 14:34:54 +02:00 |
|
florian HENRY
|
886ad9d4b6
|
check eldy message
|
2018-05-02 08:45:18 +02:00 |
|
Laurent Destailleur
|
14fd740b04
|
Fix lang must be '' and not empty in email_template
|
2018-05-01 16:25:06 +02:00 |
|
florian HENRY
|
b5d7206519
|
fix 6.0 accountancy multientity
|
2018-05-01 12:02:33 +02:00 |
|
Laurent Destailleur
|
cee4df9b27
|
Merge pull request #8667 from grandoc/new_branch_23_04_2018
clean code
|
2018-04-27 09:46:55 +02:00 |
|
Laurent Destailleur
|
69db960a92
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/activity/perweek.php
|
2018-04-26 18:33:02 +02:00 |
|
Laurent Destailleur
|
83b762b681
|
FIX CVE-2018-9019
|
2018-04-25 16:01:06 +02:00 |
|
Philippe GRAND
|
bf1e5bc618
|
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
|
2018-04-24 17:31:10 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
Philippe GRAND
|
11d739494d
|
clean code
|
2018-04-23 15:51:21 +02:00 |
|
Laurent Destailleur
|
721ff3e1a4
|
Merge branch 'develop' into new_branch_19_04_2018
|
2018-04-20 01:30:57 +02:00 |
|