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 |
|
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 |
|
Philippe GRAND
|
ecda8bf55d
|
clean and update code
|
2018-04-19 17:07:36 +02:00 |
|
Alexandre SPANGARO
|
fd7bc2e607
|
Accountancy - move to loadLangs
|
2018-04-18 06:20:34 +02:00 |
|
Laurent Destailleur
|
bbfc4a3e17
|
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
|
2018-04-18 03:26:15 +02:00 |
|
Laurent Destailleur
|
8fbde88872
|
Look and feel v8
|
2018-04-15 17:37:49 +02:00 |
|
Laurent Destailleur
|
9e50bbb9b1
|
standardize code
|
2018-04-15 16:35:18 +02:00 |
|
Alexandre SPANGARO
|
251117fcce
|
Accountancy - Small fix
|
2018-04-12 06:07:22 +02:00 |
|
Laurent Destailleur
|
fae509e41d
|
Clean code
|
2018-04-09 14:25:15 +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
|
99ed9c4589
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/compta/facture/list.php
|
2018-04-08 13:10:10 +02:00 |
|
Laurent Destailleur
|
aad99bdcc0
|
FIX Removed error when no error on accounting setup page
|
2018-04-07 22:27:42 +02:00 |
|
Alexandre SPANGARO
|
2a50e9e6c4
|
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
|
2018-04-02 19:54:30 +02:00 |
|
Alexandre SPANGARO
|
a5428cc8c7
|
NEW Module Assets
|
2018-04-01 21:26:52 +02:00 |
|
Laurent Destailleur
|
43f8834b28
|
Uniformize code with the new module builder framework
|
2018-03-31 18:48:27 +02:00 |
|
Laurent Destailleur
|
e2cbf903ba
|
Remove deprecated code
|
2018-03-16 10:33:23 +01:00 |
|
Laurent Destailleur
|
c4ca4a5a16
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/tva/index.php
htdocs/install/mysql/data/llx_accounting_category.sql
|
2018-03-15 15:11:18 +01:00 |
|
Laurent Destailleur
|
73005d81a7
|
FIX country must not be mandatory for accounting report groups
|
2018-03-15 11:42:59 +01:00 |
|
Laurent Destailleur
|
db18db9488
|
Clean code
|
2018-03-15 11:27:39 +01:00 |
|
Laurent Destailleur
|
0dfc9af72a
|
FIX multicompany compatibility and fix reports
|
2018-03-06 19:58:13 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Laurent Destailleur
|
48d250b201
|
Help to understand
|
2018-02-20 15:55:58 +01: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 |
|
Laurent Destailleur
|
534cbcb941
|
Debug translation
|
2018-01-03 20:59:35 +01:00 |
|
Alexandre SPANGARO
|
1269d98df2
|
Merge remote-tracking branch 'uptream/develop' into 7.0-7
# Conflicts:
# htdocs/accountancy/admin/export.php
# htdocs/accountancy/class/accountancyexport.class.php
# htdocs/accountancy/journal/expensereportsjournal.php
|
2017-12-09 06:14:34 +01:00 |
|
Alexandre SPANGARO
|
065ef4e5c2
|
Fix : Accountancy some cleaning
|
2017-12-09 06:00:13 +01:00 |
|
Laurent Destailleur
|
b14cb7a97f
|
Debug accountancy
|
2017-11-28 11:49:11 +01:00 |
|
Laurent Destailleur
|
ef786f2271
|
Debug accountancy module
|
2017-11-28 11:31:55 +01:00 |
|
Laurent Destailleur
|
a15a57317b
|
Debug accountancy module
|
2017-11-28 11:12:13 +01:00 |
|
Frédéric FRANCE
|
7f44faf0be
|
correct merge
|
2017-11-06 20:29:57 +01:00 |
|
Frédéric FRANCE
|
ea910adeb2
|
Merge branch 'develop' into accountingexport
|
2017-11-05 21:11:41 +01:00 |
|
Frédéric FRANCE
|
bb252846e3
|
accounting export admin config
|
2017-11-05 11:48:41 +01:00 |
|
Philippe GRAND
|
c31f852f67
|
fix : Warning: A non-numeric value encountered
|
2017-11-03 19:37:54 +01:00 |
|
Laurent Destailleur
|
28ae602b7e
|
NEW Chart of account is loaded when selected into accounting setup
|
2017-10-23 20:42:09 +02:00 |
|
Laurent Destailleur
|
e0c9c00827
|
Add field to list
|
2017-10-23 20:17:57 +02:00 |
|
Laurent Destailleur
|
2a75f09070
|
NEW Use autocompletion on selection of chart of account
|
2017-10-23 20:14:14 +02:00 |
|
Laurent Destailleur
|
ef628025d2
|
NEW Add and edit country for chart of accounts systems
|
2017-10-23 20:01:38 +02:00 |
|
Laurent Destailleur
|
605c9c45e4
|
Merge pull request #7656 from atm-maxime/fix_accounting_mode
Fix #7584
|
2017-10-22 02:21:53 +02:00 |
|
Laurent Destailleur
|
210fb5206c
|
Update index.php
|
2017-10-22 02:21:04 +02:00 |
|
Laurent Destailleur
|
f4db4373ea
|
Update defaultaccounts.php
|
2017-10-22 02:20:29 +02:00 |
|
Maxime Kohlhaas
|
4224ea6c56
|
Fix use conf instead of global var
|
2017-10-18 19:09:29 +02:00 |
|
Laurent Destailleur
|
6fcc0bfdca
|
Remove deprecated option
|
2017-10-13 02:02:13 +02:00 |
|
Scrutinizer Auto-Fixer
|
328d39bc71
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-07 11:09:31 +00:00 |
|
Laurent Destailleur
|
7b1fe6e5af
|
Look and feel v6
|
2017-10-06 11:02:44 +02:00 |
|
Laurent Destailleur
|
1e33495f42
|
Fix remove warnings
|
2017-09-19 00:31:51 +02:00 |
|
Laurent Destailleur
|
0355b0d9ed
|
Merge pull request #7414 from aspangaro/7.0-4
Accountancy - Finish moving admin to specific menu & some cleaning
|
2017-09-18 11:16:36 +02:00 |
|
Laurent Destailleur
|
ab5724e7ff
|
Mutualize code for forms to send emails. Remove thousand line of code.
|
2017-09-17 17:12:14 +02:00 |
|
Alexandre SPANGARO
|
c2e1e2491d
|
Accountancy - Finish moving admin to specific menu & some cleaning
|
2017-09-16 06:53:29 +02:00 |
|
Laurent Destailleur
|
8773a6860f
|
Fix HTML5 use of <br> is preferred to <br />
|
2017-09-15 23:49:04 +02:00 |
|
Laurent Destailleur
|
77056d9adb
|
NEW All setup of accountancy can be done from menu "Accountancy-Setup"
|
2017-09-15 14:09:42 +02:00 |
|
Laurent Destailleur
|
f5d2283093
|
USe second parameter in GETPOST
|
2017-09-15 10:52:53 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +02:00 |
|
Laurent Destailleur
|
892ab420a7
|
Avoid duplicate function
|
2017-09-12 19:52:05 +02:00 |
|
Laurent Destailleur
|
25254a19fc
|
Fix back to link
|
2017-09-06 19:56:01 +02:00 |
|
Laurent Destailleur
|
7c2c496823
|
Fix pagination on account list page
|
2017-09-06 19:53:28 +02:00 |
|
Laurent Destailleur
|
b4abb7151f
|
Use autocomplete on multi selection of accounts for group definition
|
2017-09-06 19:42:41 +02:00 |
|
Laurent Destailleur
|
7a6f3d899c
|
Fix initial data
|
2017-09-06 19:21:46 +02:00 |
|
Laurent Destailleur
|
f29a4c1fb1
|
Make accountancy pages responsive
|
2017-09-05 20:42:34 +02:00 |
|
Laurent Destailleur
|
f23a681dc0
|
Clean code
|
2017-09-05 10:16:08 +02:00 |
|
Laurent Destailleur
|
4b11332927
|
Debug edit accounting groups
|
2017-09-05 09:42:05 +02:00 |
|
Laurent Destailleur
|
e1fa37f7ff
|
Work on reports per date
|
2017-09-05 02:13:02 +02:00 |
|
Laurent Destailleur
|
9b51810653
|
Clean code
|
2017-09-01 17:30:09 +02:00 |
|
Laurent Destailleur
|
31a74d448c
|
Work on accounting reports.
|
2017-08-31 22:38:30 +02:00 |
|
Laurent Destailleur
|
9be342bd25
|
Fix missing $form
|
2017-08-22 10:02:45 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
2870798d07
|
Fix remove warnings
|
2017-07-13 00:35:10 +02:00 |
|
Laurent Destailleur
|
1d35c87c18
|
Merge pull request #7125 from aspangaro/6.0-fec3
Fix some problems
|
2017-07-07 20:32:27 +02:00 |
|
Laurent Destailleur
|
3270d141b0
|
Update index.php
|
2017-07-07 20:07:28 +02:00 |
|
Laurent Destailleur
|
5eaf49a265
|
Update journals_list.php
|
2017-07-07 20:05:32 +02:00 |
|
Laurent Destailleur
|
2dd9cb61a6
|
Update export.php
|
2017-07-07 20:04:29 +02:00 |
|
Laurent Destailleur
|
51a9c4fad5
|
Update defaultaccounts.php
|
2017-07-07 20:03:57 +02:00 |
|
Laurent Destailleur
|
d880c943ae
|
Update categories_list.php
|
2017-07-07 20:03:39 +02:00 |
|
Laurent Destailleur
|
0fc6f6920e
|
Update categories.php
|
2017-07-07 20:03:14 +02:00 |
|
Alexandre SPANGARO
|
0c5febfb4d
|
Fix: Accountancy
|
2017-07-07 06:09:49 +02:00 |
|
florian HENRY
|
a4b1c28696
|
fix : accountancy right management
|
2017-07-05 11:33:58 +02:00 |
|
Laurent Destailleur
|
b7218c1bcd
|
Fix menu consistency
|
2017-07-01 03:18:17 +02:00 |
|
Laurent Destailleur
|
31fe8ebcee
|
Debug v6
|
2017-07-01 02:22:08 +02:00 |
|
Laurent Destailleur
|
e97a4d953d
|
Merge pull request #7052 from hidupcloud/develop
FIX Fixing pages warning when value is null
|
2017-06-25 03:03:34 +02:00 |
|
Juan Bautista Mesa Roldán
|
0f5dc90bae
|
Fixing pages warning when value is null
|
2017-06-24 16:45:45 +02:00 |
|
Laurent Destailleur
|
30e881b03a
|
Merge pull request #7051 from aspangaro/6.0-fec3
Fix : Accountancy v6
|
2017-06-24 16:34:28 +02:00 |
|
Laurent Destailleur
|
1b96bb4221
|
Fix usage of constant. No need to have a dedicated setup as it should be
supported by the responsive design architecture.
|
2017-06-22 14:48:13 +02:00 |
|
Alexandre SPANGARO
|
c381c213a5
|
Fix : Accountancy
|
2017-06-20 06:52:41 +02:00 |
|
Alexandre SPANGARO
|
95573e8608
|
Fix : Accountancy - Debug
|
2017-06-19 21:39:43 +02:00 |
|
Alexandre SPANGARO
|
a4de12dd8d
|
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
|
2017-06-18 22:15:36 +02:00 |
|
Laurent Destailleur
|
819656bd89
|
Fix security: Check _SERVER["QUERY_STRING"] is escaped.
|
2017-06-18 21:27:49 +02:00 |
|
Laurent Destailleur
|
86a6a83647
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
|
2017-06-18 21:13:48 +02:00 |
|
Alexandre SPANGARO
|
b240f536b5
|
Fix : Accountancy - Debug and add information in database
|
2017-06-17 07:54:35 +02:00 |
|
Laurent Destailleur
|
343e8d8498
|
Debug accounting module with new structure v6
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
|
2017-06-16 00:49:52 +02:00 |
|
Laurent Destailleur
|
097be322a6
|
Modify code to match new v6 structure.
|
2017-06-15 19:29:00 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
b441c62e1d
|
Fix syntax error
|
2017-06-08 14:55:12 +02:00 |
|
Laurent Destailleur
|
b1f93ccb0c
|
Fix security
|
2017-06-08 14:33:46 +02:00 |
|
Regis Houssin
|
bfd6116e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
|
2017-06-06 15:03:36 +02:00 |
|
Laurent Destailleur
|
02b5d9e6f7
|
FIX #6945
|
2017-06-06 10:53:53 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
Laurent Destailleur
|
395d361d66
|
Look and feel v6
|
2017-05-29 11:38:23 +02:00 |
|
Alexandre SPANGARO
|
1f079fac9d
|
Move html.formventilation.class.php to html.formaccounting.class.php
|
2017-05-25 06:57:28 +02:00 |
|
Alexandre SPANGARO
|
a086b82f84
|
Removed old code (Function select_pcgtype/subtype)
|
2017-05-25 05:40:41 +02:00 |
|
Alexandre SPANGARO
|
ba7e754174
|
Remove old code (journal)
|
2017-05-25 05:32:13 +02:00 |
|
Laurent Destailleur
|
b3dc73e611
|
Look and feel v6
|
2017-05-21 02:43:51 +02:00 |
|
Laurent Destailleur
|
80cbc28385
|
NEW Add REST API to push a file.
|
2017-05-20 15:52:36 +02:00 |
|
Laurent Destailleur
|
7dbe3b1da9
|
Merge pull request #6843 from aspangaro/6.0-multijournal
Fix : Sql error on salaries index for accountancy multijournal + debug
|
2017-05-18 17:45:21 +02:00 |
|
Laurent Destailleur
|
68e333879f
|
Fix var not sanitized
|
2017-05-16 13:27:32 +02:00 |
|
Alexandre SPANGARO
|
93554b7e30
|
Typo searchpicto
|
2017-05-14 21:06:33 +02:00 |
|
Laurent Destailleur
|
4343f93c00
|
Remove a lot of useless code
|
2017-05-13 19:36:28 +02:00 |
|
Laurent Destailleur
|
553f5b990c
|
Fix scrutinizer errors
|
2017-05-13 18:50:55 +02:00 |
|
Laurent Destailleur
|
fc5f4007a1
|
Debug accountancy module. Page for bank journalization is still KO.
|
2017-05-05 16:54:05 +02:00 |
|
Laurent Destailleur
|
885a636351
|
Debug new journal list page
|
2017-05-05 16:35:05 +02:00 |
|
Laurent Destailleur
|
b7f7683e5a
|
Merge pull request #6774 from aspangaro/6.0-multijournal
Finish to move accountancy journals list to page like dictionnary
|
2017-05-05 14:21:55 +02:00 |
|
Laurent Destailleur
|
7ec46b3bd6
|
Finished work to have substitution keys code mutualized.
|
2017-05-04 12:35:45 +02:00 |
|
Alexandre SPANGARO
|
6afd0d642a
|
Finish to move accountancy journals list to page like dictionnary
|
2017-05-01 08:16:09 +02:00 |
|
Alexandre SPANGARO
|
fed1b152d9
|
Correct multi-journals
|
2017-04-30 07:41:47 +02:00 |
|
Laurent Destailleur
|
b87eb07b08
|
Look and feel v6
|
2017-04-27 17:51:11 +02:00 |
|
Laurent Destailleur
|
2f23b36ca1
|
Fix typo in var name picto
|
2017-04-27 14:20:06 +02:00 |
|
Laurent Destailleur
|
39ebaec064
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 11:22:48 +02:00 |
|
Laurent Destailleur
|
3907c30ee3
|
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
grandoc-develop
Conflicts:
dev/skeletons/skeleton_list.php
|
2017-04-11 11:06:26 +02:00 |
|
Laurent Destailleur
|
be439f6252
|
Work on look and feel v6
|
2017-04-07 16:16:44 +02:00 |
|
philippe grand
|
3715fcdd5f
|
Update code using new css class
|
2017-04-07 14:25:33 +02:00 |
|
Laurent Destailleur
|
d975e7f442
|
Work on 6.0 look and feel
|
2017-04-01 12:46:47 +02:00 |
|
Alexandre SPANGARO
|
06c2f04927
|
Finish work on multijournal admin part
Need harmonization on rights
|
2017-03-29 06:32:26 +02:00 |
|
Alexandre SPANGARO
|
fc2b9a858b
|
New : [FP17] Add multijournals in accountancy admin
|
2017-03-28 06:35:03 +02:00 |
|
Laurent Destailleur
|
0838953ef7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-27 00:49:24 +02:00 |
|
Laurent Destailleur
|
278bbf184c
|
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
New : Add Various payment submodule linked to the accountancy to replace free input in bank
|
2017-03-24 22:52:39 +01:00 |
|
Alexandre SPANGARO
|
6116145d8a
|
Fix : Missing language file in accountancy configuration
|
2017-03-24 06:23:40 +01:00 |
|
Alexandre SPANGARO
|
6d5578a876
|
Reactivated constant BANK_DISABLE_DIRECT_INPUT
|
2017-03-19 20:47:30 +01:00 |
|
Laurent Destailleur
|
4831fb4dcb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2017-03-19 11:26:49 +01:00 |
|
Alexandre SPANGARO
|
16b12b33fc
|
First step : remove BANK_DISABLE_DIRECT_INPUT
|
2017-03-18 07:24:55 +01:00 |
|
Laurent Destailleur
|
39c8f9a15a
|
Fix country not preselected
|
2017-03-15 00:04:09 +01:00 |
|
Laurent Destailleur
|
c72e7c1057
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-03-10 14:54:35 +01:00 |
|
Laurent Destailleur
|
fda84995e8
|
If manage zero is set, we must NOT set length. So we can here make a
shortcut to avoid useless code.
|
2017-03-10 11:50:57 +01:00 |
|
Laurent Destailleur
|
6cd53cb471
|
Merge pull request #6482 from aspangaro/5.0-27
Fix : Language & revert a description of the function
|
2017-03-10 11:12:42 +01:00 |
|
Laurent Destailleur
|
5f79b2d0c6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2017-03-05 22:11:35 +01:00 |
|
Laurent Destailleur
|
4cd82fc2c2
|
Fix a list was filled if a record was created but we need the field
filled to create the record.
|
2017-03-03 18:27:14 +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
|
bef5f2c236
|
FIX #6465
|
2017-03-03 15:06:17 +01:00 |
|
Alexandre SPANGARO
|
19ce0b0d89
|
Fix : Language & revert a description of the function
|
2017-03-03 06:22:12 +01:00 |
|
Laurent Destailleur
|
4804cc47bd
|
Clean and uniformize code
|
2017-02-24 15:16:53 +01:00 |
|
Laurent Destailleur
|
eef3824f8c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
|
2017-02-21 10:34:52 +01:00 |
|
Laurent Destailleur
|
a8129ce46e
|
Fix transaction/sql error
|
2017-02-20 11:49:27 +01:00 |
|
Laurent Destailleur
|
89d10ae5aa
|
Fix the accounting account groups must be editable by book keeper, not
admin user.
|
2017-02-20 11:21:38 +01:00 |
|
Laurent Destailleur
|
501f118f92
|
Fix style
|
2017-02-19 22:53:29 +01:00 |
|
Laurent Destailleur
|
d72e5a3646
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-10 17:34:23 +01:00 |
|
Alexandre SPANGARO
|
4126dcff03
|
[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.
|
2017-02-08 06:51:42 +01:00 |
|
Alexandre SPANGARO
|
ea7a2b1e2a
|
Fix : Bank account ref not show in accountancy journal. Complete informations for tooltip
|
2017-02-07 06:47:12 +01:00 |
|
Laurent Destailleur
|
4e43a815d1
|
Merge pull request #6359 from aspangaro/6.0-3
Fix : [FP17] Correct some problems on category accounting account page
|
2017-02-02 01:02:49 +01:00 |
|
aspangaro
|
2ce4ba99fe
|
Fix : [FP17] Correct some fix on category accounting account page
|
2017-02-01 06:54:01 +01:00 |
|
aspangaro
|
e1e2c49d93
|
NEW : [FP17] Accountancy - Add select field in list of accounts
|
2017-01-31 06:08:40 +01:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
Laurent Destailleur
|
d14e4dbaba
|
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
|
2017-01-15 20:49:20 +01:00 |
|
Laurent Destailleur
|
8ee838c9c4
|
Minor fixes in accounting module.
|
2017-01-07 16:17:15 +01:00 |
|
aspangaro
|
e1773249c3
|
Fix: Traduction on index accountancy page & improvements
|
2016-12-19 05:56:47 +01:00 |
|
Laurent Destailleur
|
bd8f923cee
|
Several fixes in filter on lists
|
2016-11-29 22:52:16 +01:00 |
|
Laurent Destailleur
|
77337fe0cc
|
Fix scrutinizer warning
|
2016-11-19 16:23:50 +01:00 |
|
Laurent Destailleur
|
e5cedafdc0
|
Fix search on accounts
|
2016-11-16 18:00:37 +01:00 |
|
Laurent Destailleur
|
ab269bd7a6
|
Better responsive
|
2016-11-11 01:15:41 +01:00 |
|
Laurent Destailleur
|
18d1878775
|
Debug accountancy module
|
2016-11-06 13:07:49 +01:00 |
|
Laurent Destailleur
|
614f3d8286
|
Fix param lost when saving setup
|
2016-11-04 16:32:28 +01:00 |
|
Laurent Destailleur
|
e59c2bb61c
|
Debug accounting menu. Can now edit product account if already set.
|
2016-11-04 16:15:31 +01:00 |
|
Laurent Destailleur
|
a057cb93c9
|
Debug accounting module
|
2016-10-22 14:23:33 +02:00 |
|
Laurent Destailleur
|
304a44ffc2
|
Debug accounting module
|
2016-10-21 14:48:55 +02:00 |
|
Laurent Destailleur
|
3111b56b20
|
Fix navigation for list of product to bound.
|
2016-10-21 12:45:19 +02:00 |
|
Laurent Destailleur
|
9cad437d5c
|
Fix list in chart of account
|
2016-10-15 16:20:08 +02:00 |
|
Laurent Destailleur
|
04c0e87d79
|
Work on accounting module
|
2016-10-15 15:51:28 +02:00 |
|
Laurent Destailleur
|
c689248211
|
The setup that must be done by the bookkeeper is removed from admin
setup and move into setup of accountancy
|
2016-10-15 14:38:43 +02:00 |
|
Laurent Destailleur
|
79d376ee12
|
Debug accountancy module
|
2016-10-14 13:05:01 +02:00 |
|
Laurent Destailleur
|
7c1b74133a
|
Debug accountancy module
|
2016-10-13 22:29:49 +02:00 |
|
Laurent Destailleur
|
e7a09c07f9
|
Sync and clean language files
|
2016-10-11 10:38:38 +02:00 |
|
Laurent Destailleur
|
6489cd6164
|
Debug accounting module
|
2016-10-07 12:10:16 +02:00 |
|
Laurent Destailleur
|
28e4c17730
|
Debug module accountancy expert
|
2016-10-06 19:59:33 +02:00 |
|
Laurent Destailleur
|
539ee1ace2
|
Uniformize code
|
2016-10-06 18:06:40 +02:00 |
|
Laurent Destailleur
|
93c848fcc5
|
Add page index for accountancy module
|
2016-10-06 17:43:10 +02:00 |
|
Laurent Destailleur
|
efaf1210c2
|
Uniformize look and feel
|
2016-10-04 20:28:58 +02:00 |
|
Laurent Destailleur
|
989cfe749d
|
Fix permission on fiscal year
|
2016-10-04 19:52:16 +02:00 |
|
Laurent Destailleur
|
ee252f549a
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
|
2016-10-01 18:42:50 +02:00 |
|
Laurent Destailleur
|
2f557fc09b
|
Several fix on module accountancy expert
|
2016-09-30 17:03:09 +02:00 |
|
Laurent Destailleur
|
bac1f95e30
|
Fix consistency on permission. Missing the getLibStatut function.
|
2016-09-29 12:11:57 +02:00 |
|
aspangaro
|
37c7d49537
|
Presentation of fiscal year
|
2016-09-06 22:42:15 +02:00 |
|
Juanjo Menent
|
5c92cc7fa3
|
Merge pull request #5613 from atm-florian/40_accountancy
fix export
|
2016-08-11 20:47:02 +02:00 |
|
Juanjo Menent
|
0907465fcf
|
Merge pull request #5615 from aspangaro/4.0-p41
Fix: Accountancy - Problem to define account_parent for an accounting account + presentation
|
2016-08-11 20:46:08 +02:00 |
|
aspangaro
|
300da71b9c
|
Replace with 0
|
2016-08-11 06:12:04 +02:00 |
|
aspangaro
|
55a83f9d8d
|
Fix: Accountancy - Problem to define account_parent for an accounting account & presentation
|
2016-08-11 06:08:33 +02:00 |
|
florian HENRY
|
07412b2f79
|
force export txt for ciel and quadratus
|
2016-08-10 17:37:22 +02:00 |
|
aspangaro
|
43ffb061ef
|
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
|
2016-08-10 08:07:27 +02:00 |
|
aspangaro
|
20144c9883
|
FIX Accountancy - Problem with the manage of the zero at the end of an accounting account in dolibarr for somes countries. Add an option.
|
2016-07-29 07:32:55 +02:00 |
|
florian HENRY
|
ea3e851ec0
|
Fix stuff in accoutancy
|
2016-06-29 16:54:37 +02:00 |
|
Laurent Destailleur
|
232f525f29
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2016-06-15 18:31:43 +02:00 |
|
Laurent Destailleur
|
9019576394
|
Fix css class opacitymedium was not used everywhere.
|
2016-06-07 15:58:02 +02:00 |
|
aspangaro
|
23b748aca3
|
Fix: Accountancy - Access rights
|
2016-06-05 14:22:13 +02:00 |
|
aspangaro
|
466010a412
|
Fix: Accountancy 4.0 - Right to access to fiscal year
|
2016-06-05 14:14:20 +02:00 |
|
Juanjo Menent
|
8f617b196a
|
Fix printing following the rules
|
2016-06-04 15:51:28 +02:00 |
|
Laurent Destailleur
|
986119d2b5
|
Start debug
|
2016-05-12 21:32:24 +02:00 |
|
Laurent Destailleur
|
55e904bc01
|
Debug for expert accounting module
|
2016-05-12 20:45:05 +02:00 |
|
Laurent Destailleur
|
c8d98dbfdc
|
FIX error reported by scrutinizer
|
2016-05-08 11:33:46 +02:00 |
|
Laurent Destailleur
|
816dda5a8b
|
Merge pull request #5158 from aspangaro/4.0-p29
FIX: Accountancy - Little fix et add page to assign massively the category
|
2016-05-05 22:52:20 +02:00 |
|
Laurent Destailleur
|
ec34b26562
|
Merge pull request #5148 from aspangaro/4.0-p27
FIX: Fiscal year - Some mistakes on card
|
2016-05-05 22:46:48 +02:00 |
|
aspangaro
|
e0f600f226
|
FIX: Accountancy - Little fix et add page to assign massively the category
|
2016-05-02 20:21:37 +02:00 |
|
aspangaro
|
1f015388b6
|
FIX: Fiscal year - Some mistakes on card
|
2016-05-01 17:04:55 +02:00 |
|
aspangaro
|
3cf1d891ab
|
FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country
|
2016-04-30 07:05:10 +02:00 |
|
aspangaro
|
7041a041ce
|
FIX: Accountancy - Chart of accounts are limited on only one country
|
2016-04-30 06:52:21 +02:00 |
|
Laurent Destailleur
|
7e047ada2b
|
Merge pull request #5064 from aspangaro/4.0-p21
FIX: Accountancy - Road to stable version
|
2016-04-22 19:21:18 +02:00 |
|
Laurent Destailleur
|
366db31a9e
|
Make css more simple
|
2016-04-22 13:38:44 +02:00 |
|
aspangaro
|
df91a95b9b
|
FIX: Add right to manage chart of accounts for non-admin
|
2016-04-22 07:05:24 +02:00 |
|
aspangaro
|
24fddaa039
|
Hidden old functions
|
2016-04-22 06:58:18 +02:00 |
|
aspangaro
|
b59c94e056
|
NEW: Accountancy - Add Result page
& review
|
2016-04-17 15:44:04 +02:00 |
|
Laurent Destailleur
|
83644dcb93
|
Fix errors reported by scrutinizer
|
2016-04-09 15:38:15 +02:00 |
|
aspangaro
|
c48869e02b
|
Bugfix
|
2016-04-03 10:51:56 +02:00 |
|
aspangaro
|
0c5f504881
|
FIX: Accountancy - Correct the display of account_parent
|
2016-04-02 06:22:31 +02:00 |
|
aspangaro
|
ef03dc3454
|
Youps !
|
2016-03-30 06:49:10 +02:00 |
|
aspangaro
|
26e017f4ef
|
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
Conflicts:
htdocs/accountancy/admin/card.php
|
2016-03-30 06:05:38 +02:00 |
|
aspangaro
|
2be979569d
|
Debug II
|
2016-03-28 21:03:47 +02:00 |
|
aspangaro
|
432cc44ab6
|
NEW: Accountancy - Add category
|
2016-03-28 13:51:19 +02:00 |
|
aspangaro
|
98a46fd335
|
NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts
|
2016-03-28 08:21:02 +02:00 |
|
Laurent Destailleur
|
91caea5707
|
Code was corrupted with very bad commits. I restore files manually.
|
2016-03-25 15:53:44 +01:00 |
|
Laurent Destailleur
|
630f5a632d
|
Revert "Corrected non-static usages of Form::selectarray function"
This reverts commit 87cd6e1e40.
|
2016-03-25 15:34:37 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Marcos García de La Fuente
|
5a046125db
|
Missing changes from previous commits
|
2016-03-20 14:24:49 +01:00 |
|
Marcos García de La Fuente
|
87cd6e1e40
|
Corrected non-static usages of Form::selectarray function
|
2016-03-20 14:15:17 +01:00 |
|
Florian HENRY
|
c380faacce
|
Accountancy
|
2016-03-15 08:58:53 +01:00 |
|
Florian HENRY
|
e40de3ce28
|
fix accoutancy
|
2016-03-10 11:39:26 +01:00 |
|
Laurent Destailleur
|
3a58613e45
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
|
2016-03-02 23:40:11 +01:00 |
|
aspangaro
|
ba6dadb6fa
|
Fix: Use getNomUrl to show account_parent instead of rowid of the account
|
2016-02-27 16:21:40 +01:00 |
|
Laurent Destailleur
|
5ea9c6dd83
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
|
2016-02-09 14:40:25 +01:00 |
|
aspangaro
|
eaca582cb5
|
Fixed: Problem of merging - Review page init accountancy again
|
2016-02-07 08:47:02 +01:00 |
|
Laurent Destailleur
|
47e2e33fb7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
|
2016-02-03 03:27:17 +01:00 |
|
Florian HENRY
|
fb5aba6de2
|
Accountancy
|
2016-02-01 15:07:12 +01:00 |
|
Florian HENRY
|
165b553a79
|
Format code
|
2016-02-01 14:50:25 +01:00 |
|
bobby
|
71c407e670
|
add coala book keeping export
|
2016-01-25 12:43:47 +01:00 |
|
bobby
|
59f356905a
|
Accoutancy update
|
2016-01-25 12:42:18 +01:00 |
|
Juanjo Menent
|
cbf5021161
|
Merge pull request #4297 from aspangaro/develop-a10
Accountancy Add a list to select accounting account on accoutancy admin
|
2016-01-09 17:46:41 +01:00 |
|
aspangaro
|
6114606c11
|
Accountancy Add a list to select accounting account on accoutancy admin
|
2015-12-26 06:26:18 +01:00 |
|
aspangaro
|
ec7cffd6a4
|
Merge remote-tracking branch 'Upstream/develop' into develop-a7
|
2015-12-22 07:11:10 +01:00 |
|
Laurent Destailleur
|
db7a98f0ef
|
Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
|
2015-12-21 13:56:59 +01:00 |
|
aspangaro
|
c7b25ec497
|
Review page init accountancy
|
2015-12-21 06:51:46 +01:00 |
|