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
Laurent Destailleur
61428b9c00
Fix use standard product country code if country of buyer not defined
2019-04-19 12:19:45 +02:00
Laurent Destailleur
eab474e23a
Update list.php
2019-04-19 12:10:40 +02:00
Laurent Destailleur
265671a5f3
Update list.php
2019-04-19 12:00:06 +02:00
Alexandre SPANGARO
033e9b9f22
FIX Accounting Customer dispatch with intra/export
2019-04-19 06:48:51 +02:00
Alexandre SPANGARO
660a1cea1d
NEW Accounting - Add rights on export, delete operations in ledger
2019-04-17 07:26:39 +02:00
ATM john
07e6ce5460
Appli function to links
2019-04-15 21:33:31 +02:00
Alexandre SPANGARO
9957b8aed5
WIP - FEC - Validate
2019-04-15 09:07:36 +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
b8d3110266
Merge pull request #10916 from frederic34/patch-2
...
Update EBP export
2019-04-11 16:56:16 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
321ffb859b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Alexandre SPANGARO
ba34b601b3
FIX: MultiEntity in lettering functionality
2019-04-04 16:44:36 +02:00
Alexandre SPANGARO
6f1b496373
Merge remote-tracking branch 'upstream/develop' into 10.0_WARNING
2019-03-28 11:57:59 +01:00
Laurent Destailleur
c62d147c60
Auto clean search field to avoid to have 2 conflict search criteria
2019-03-25 16:47:20 +01:00
Frédéric FRANCE
f9c1289a5b
Update EBP export
...
@aspangaro @Darkjeff can you confirm that montant must be always >0 (in case of credit)
2019-03-25 14:52:30 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Philippe GRAND
5677177ebc
update with html5 compliant code
2019-03-19 13:45:50 +01:00
Philippe GRAND
d118d269a2
update with html5 compliant code
2019-03-19 13:44:21 +01:00
Laurent Destailleur
eab11ce743
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2019-03-19 13:14:44 +01:00
Laurent Destailleur
dbe15d3685
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-19 13:10:17 +01:00
Laurent Destailleur
8664594fc8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-19 13:09:39 +01: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
Laurent Destailleur
ae35c982af
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit
...
FIX : need to round with 2 decimals to avoid movements not correctly balanced
2019-03-16 14:27:03 +01:00
Frédéric FRANCE
4822a2d396
Update accountancycategory.class.php
2019-03-16 09:51:57 +01:00
Laurent Destailleur
63b6900f2c
Fix phpcs
2019-03-15 16:09:20 +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
a0d8ba268e
Update doc with the new menu entries
2019-03-14 16:28:32 +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
Laurent Destailleur
39e6e71b0d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
3073567763
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-14 14:17:52 +01:00
Frédéric FRANCE
9b61577bf7
Update card.php
...
It seems like GETPOST('fk_doc', 'int') of type string or string[] is incompatible with the declared type integer of property $fk_doc
2019-03-10 21:04:35 +01:00
Alexandre SPANGARO
49f72b6a9a
Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT
2019-03-09 05:50:16 +01:00
Alexandre SPANGARO
895367060c
Fix some small error
2019-03-09 05:31:05 +01:00
Alexandre SPANGARO
d926657534
FIX: Accountancy - Format EBP import
...
Add doc
2019-03-08 10:57:14 +01:00
Frédéric FRANCE
a836c75d70
replace html by html5 in accountancy
2019-03-03 10:31:46 +01:00
Laurent Destailleur
a5711a51ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Frédéric FRANCE
e5e1a0b07d
The property $fk_doc was declared of type integer
2019-02-28 19:15:50 +01:00
Frédéric FRANCE
089875b8a2
add visibility
2019-02-27 17:53:52 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +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
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2
2019-02-27 01:51:01 +01:00
Alexandre SPANGARO
1c59554806
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
2019-02-25 22:22:31 +01:00
Frédéric FRANCE
42a1387218
wip
2019-02-25 00:56:48 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Frédéric FRANCE
70350231ca
Update accountancycategory.class.php
2019-02-23 18:49:28 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5
FIX #10638
2019-02-23 15:57:57 +01:00
Philippe GRAND
33164bcb3e
fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator.
2019-02-21 14:25:09 +01:00
Laurent Destailleur
acc0ac2c88
Fix line feed
2019-02-20 05:05:26 +01:00
Laurent Destailleur
d5c2984266
Merge pull request #10622 from aspangaro/10.0_portal2
...
NEW: Add hooks in accountancy index
2019-02-19 13:29:46 +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
Alexandre SPANGARO
1b213ccbd6
NEW: Add hooks in accountancy index
2019-02-17 09:11:11 +01:00
Alexandre SPANGARO
5142d5b631
Fix also in binding page
2019-02-13 13:43:59 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
00eb95b660
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-12 13:36:32 +01:00
Laurent Destailleur
53a8f1cd3b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-02-12 13:36:05 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +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
Alexandre SPANGARO
2dc4edb68c
FIX: Accountancy - Add transaction with multicompany use all the time 1st entity
2019-02-11 11:36:12 +01:00
klemens
beb2791dde
spelling fixes
2019-02-10 12:59:09 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
gauthier
2142ccee8a
FIX : better method
2019-02-08 15:17:40 +01:00
Maxime Kohlhaas
da361f0ea5
Fix wrong column name in purchase journal
2019-02-08 12:24:07 +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
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
afd53a99c2
Fix merge
2019-02-03 18:21:03 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Laurent Destailleur
456e78b7cf
FIX #10485
2019-02-03 17:45:31 +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
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Philippe GRAND
a0e87fbfd2
update with html5 compliant code
2019-01-30 19:38:04 +01:00
Philippe GRAND
e12f66e3d9
update with html5 compliant code
2019-01-30 19:34:33 +01:00
Philippe GRAND
06055ed586
update with html5 compliant code
2019-01-30 19:32:08 +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
1eb57b6542
update with html5 compliant code
2019-01-30 09:32:19 +01:00
Philippe GRAND
cda89c65cd
update with html5 compliant code
2019-01-30 09:30:55 +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
12e75cb8c9
Merge pull request #10401 from aspangaro/10.0_accountancy2
...
NEW: Automatically binding for intra/export accountancy code in customer list
2019-01-27 18:06:08 +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
Laurent Destailleur
999f84458f
Merge pull request #10415 from grandoc/new_branch_25_01_2019
...
fix : The condition == 3 is always false
2019-01-26 14:01:35 +01:00
Laurent Destailleur
d3decebd83
Merge pull request #10418 from grandoc/new_branch_26_01_2019
...
fix : bad type cast
2019-01-26 14:00:59 +01:00
Laurent Destailleur
a10203bfad
Merge pull request #10378 from rycks/exportJournaux
...
Export journaux
2019-01-26 13:51:41 +01:00
Philippe Grand
a1b90638d4
Update card.php
...
fix
2019-01-26 09:10:16 +01:00
Philippe GRAND
b1ea5af876
fix : bad type cast
2019-01-26 09:02:49 +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
Alexandre SPANGARO
9ff848210f
NEW: Automatically binding for intra/export accountancy code
2019-01-23 22:14:13 +01:00
Philippe GRAND
1f3be71d8b
update with html5 compliant code
2019-01-21 21:22:12 +01:00
Philippe GRAND
1741e77996
update with html5 compliant code
2019-01-21 21:19:42 +01:00
Philippe GRAND
9ce73dfa71
update with html5 compliant code
2019-01-21 21:15:53 +01:00
Philippe GRAND
f045cf353b
update with html5 compliant code
2019-01-21 21:13:42 +01:00
Laurent Destailleur
b868397902
Fix colspan
2019-01-21 02:27:13 +01:00
Eric
fdb1e1145c
add if ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL
2019-01-20 20:58:52 +01:00
Eric
71f7aa9503
use transnoentitiesnoconv instead of html_entity_decode
2019-01-20 20:55:59 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +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
Eric
88efc830fe
re enable export for expensereportsjournal
2019-01-20 15:25:53 +01:00
Eric
df5aa33022
add html_entity_decode on fields for export process (for example ´ -> é)
2019-01-20 15:25:24 +01:00
Eric
13586ff3d8
typo on my previus patch MainAccountForSupplierssNotDefined -> MainAccountForSuppliersNotDefined
2019-01-20 15:24:38 +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
2ce8529c06
Merge pull request #10346 from grandoc/new_branch_16_01_2019
...
update with html5 compliant code
2019-01-16 19:39:31 +01:00
Philippe Grand
98ebc0a667
Update index.php
2019-01-16 19:24:15 +01:00
Philippe Grand
551a1a5e58
Update lines.php
2019-01-16 19:23:41 +01:00
Philippe Grand
3cc68aca21
Update index.php
2019-01-16 19:23:08 +01:00
Philippe Grand
13ea2d93dd
Update index.php
2019-01-16 19:22:29 +01:00
Philippe Grand
5810fa9acd
Update list.php
2019-01-16 19:21:19 +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
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
05cdf895e8
Allow supplier code to be '0', but not empty ('')
2019-01-09 11:10:44 +01:00
Laurent Destailleur
86f0d6c26f
FIX Warning on non complete setup
2019-01-09 11:02:06 +01:00
Laurent Destailleur
5d0ff28556
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/card.php
2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
6e078105ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
ldestailleur
0ce514079b
FIX Button journalize grey when mandatroy setup not done
2019-01-05 12:51:08 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
Laurent Destailleur
c690b92410
Merge pull request #10277 from aspangaro/9.0_accountancy_html
...
FIX : #10221 Html codes in accounting export
2019-01-02 19:52:18 +01:00
Laurent Destailleur
a39336c80d
Simple join is better than RIGHT JOIN
2019-01-02 19:50:23 +01:00
Alexandre SPANGARO
cbcf097ec1
FIX : #10221 Html codes in accounting export
2018-12-29 23:20:30 +01:00
Alexandre SPANGARO
3eb5b06472
FIX: Generation of FEC:CompteLib
2018-12-29 22:26:06 +01:00
Alexandre SPANGARO
41c7af590d
NEW: Accountancy - Add default accounting account for member subcriptions
2018-12-29 22:11:24 +01:00
Ferran Marcet
dc93cccbe1
FIX: Loan impossible to account
2018-12-28 12:57:04 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Alexandre SPANGARO
f728b28a67
FIX: Missing information on Agiris Export
2018-12-17 06:02:29 +01:00
Laurent Destailleur
20d24f2feb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-16 18:45:30 +01:00
Alexandre SPANGARO
6eb9013430
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
2018-12-16 06:36:55 +01:00
Alexandre SPANGARO
8148ea8361
Revert "Fix: Problem with loan integration in general ledger"
...
This reverts commit 50da3c2ed2
2018-12-16 06:16:14 +01:00
Alexandre SPANGARO
50da3c2ed2
Fix: Problem with loan integration in general ledger
2018-12-16 06:14:33 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
2c5a5e5eac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-14 16:25:48 +01:00
Laurent Destailleur
e0011222d1
Fix syntax error
2018-12-14 16:25:37 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +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
Laurent Destailleur
539e2c55cd
FIX #9629 #9625
2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91
FIX #9629 #9625
2018-12-14 10:31:09 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Alexandre SPANGARO
2466fa224c
Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats
2018-12-02 10:48:55 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
florian HENRY
47eda86e2f
fix scrutinizer
2018-12-01 14:39:04 +01:00
Alexandre SPANGARO
7f1a48916e
Merge remote-tracking branch 'upstream/develop' into develop
2018-12-01 07:00:34 +01:00
florian HENRY
38059ed60d
fix #10006
2018-12-01 00:39:37 +01:00
Laurent Destailleur
b15403207b
Merge pull request #10077 from aspangaro/9.0p1
...
Fix create accounting account from balance
2018-11-29 11:16:27 +01:00
Laurent Destailleur
b9e544d291
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/resource/list.php
2018-11-26 23:08:06 +01:00
Laurent Destailleur
84d73086ea
Fix bookkeeping list was empty
2018-11-26 22:53:56 +01:00
Laurent Destailleur
4bb8568d6c
Fix doxygen
2018-11-25 12:18:45 +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
d21abc2dc3
Update accountancycategory.class.php
2018-11-22 23:26:04 +01:00
Frédéric FRANCE
295d082da1
Update accountancycategory.class.php
2018-11-22 22:56:38 +01:00
Frédéric FRANCE
21b429836a
doc comment accountancycategory class
2018-11-22 21:08:03 +01:00
Laurent Destailleur
fe35e72e83
Fix perf. Make only one request per group for year N-1.
2018-11-22 20:45:50 +01:00
Laurent Destailleur
5727cf2910
Prepare code for performance enhancement
2018-11-22 20:09:27 +01:00
Laurent Destailleur
72fc0226e3
Optimize performance: Remove call for year N, can be done with total of
...
each month
2018-11-22 19:45:35 +01:00
Laurent Destailleur
89138bc349
FIX Accounting personalized report when using multicompany
2018-11-22 10:59:39 +01:00
Laurent Destailleur
21e9c02b11
Performance enhancement in Accounting Personalized report
2018-11-22 10:40:15 +01:00
atm-quentin
4cc3fa1006
FIX we dont share object for accountancy
2018-11-16 11:23:27 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Frédéric FRANCE
4909e3afc4
doc bookkeeping class
2018-11-14 08:28:20 +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
Alexandre SPANGARO
af1305a0a8
Fix Specific finename for FEC export only available on general ledger export
2018-11-01 07:24:48 +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
Laurent Destailleur
612e3a9805
Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
...
into aspangaro-9.0_accountancy
# Conflicts:
# htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
# htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
# htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
Laurent Destailleur
769bae75e9
Update list.php
2018-10-24 02:48:38 +02:00
Laurent Destailleur
a9736c1eef
Merge pull request #9828 from frederic34/patch-15
...
code comment
2018-10-24 02:44:46 +02:00
Laurent Destailleur
065d715d41
FIX #9837 - The fetchAllXXX was not managing correctly the limit
2018-10-24 02:20:07 +02:00
Laurent Destailleur
fe665a060d
Merge branch 'develop' into patch-17
2018-10-24 01:42:02 +02:00
Alexandre SPANGARO
930dce7611
change class name from lettering to Lettering
2018-10-22 06:39:23 +02:00
Alexandre SPANGARO
3f79580b19
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-22 06:33:34 +02:00
Laurent Destailleur
2816bdf747
FIX Date into filename of FEC file.
2018-10-21 16:22:56 +02:00
Frédéric FRANCE
02954931d8
Update thirdparty_lettrage_supplier.php
2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef
Update thirdparty_lettrage.php
2018-10-20 16:25:57 +02:00
Frédéric FRANCE
fab10acc15
change class name from lettering to Lettering
2018-10-20 16:23:43 +02:00
Frédéric FRANCE
550dc622ca
code comment
2018-10-20 13:40:40 +02:00
Alexandre SPANGARO
a7de7013a1
Update code
2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3
Fix travis
2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465
Debug Lettering
2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Laurent Destailleur
4571210bcf
Fix remove deprecated field
2018-10-19 15:45:56 +02:00
Laurent Destailleur
5a228bf394
Merge pull request #9786 from aspangaro/9.0_accountancy2
...
Fix FEC on accountancy movement card
2018-10-19 14:33:46 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Alexandre SPANGARO
a466104b81
Fix FEC on transaction card
...
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
a5ebcff2ee
Fix lettering function
2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
eb4ffcf1a7
Fix FEC Missing some information in bookkeeping
2018-10-16 21:17:00 +02:00
Frédéric FRANCE
a40271e475
Update bankjournal.php
2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d
fix phpcs
2018-10-16 20:10:13 +02:00
Laurent Destailleur
ae76891853
Merge pull request #9751 from frederic34/patch-17
...
Update bookkeeping.class.php
2018-10-16 19:44:07 +02:00
Laurent Destailleur
63c79f23d6
Merge pull request #9749 from aspangaro/9.0_accountancy
...
Fix FEC Missing some information on bookeeping
2018-10-16 19:35:14 +02:00
Laurent Destailleur
f0c0c4779b
Fix remove yellow alert
2018-10-16 19:32:35 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Philippe GRAND
bd3315528e
add links and highlight relevant text
2018-10-16 15:08:06 +02:00
Philippe GRAND
059c72c678
add links and highlight relevant text
2018-10-16 14:55:29 +02:00
Philippe GRAND
5f37e07540
add links and highlight relevant text
2018-10-16 14:42:36 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
Alexandre SPANGARO
a971a2afe6
Fix FEC
2018-10-16 06:32:55 +02:00
Alexandre SPANGARO
3a6824da68
Fix FEC Missing label_compte & label_operation
2018-10-15 21:50:05 +02:00
Alexandre SPANGARO
47305f5b0b
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-15 20:06:02 +02:00
Laurent Destailleur
2684767b19
Fix pagination
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2018-10-15 11:08:40 +02:00
Laurent Destailleur
e29fb85cec
Fix limit
2018-10-15 11:07:16 +02:00
Laurent Destailleur
aa6996e2d0
Fix pagination show two times the same account on balance of accounts
2018-10-15 11:07:07 +02:00
Laurent Destailleur
9afc53ca06
Fix remove step in accountancy if module expense report not used
2018-10-15 11:05:20 +02:00
Frédéric FRANCE
425e26ecb6
Update bookkeeping.class.php
2018-10-15 08:46:41 +02:00
Frédéric FRANCE
4d6d3afbea
code comment
2018-10-15 08:39:46 +02:00
Alexandre SPANGARO
c8b9c11a01
Fix FEC Missing some subledger label on bookeeping
2018-10-15 06:53:48 +02:00
Laurent Destailleur
c881be847d
Fix remove step in accountancy if module expense report not used
2018-10-15 01:47:44 +02:00
Laurent Destailleur
35eeb32f5d
Fix pagination
2018-10-15 00:08:28 +02:00
Laurent Destailleur
b13d9650f2
Fix pagination
2018-10-15 00:06:16 +02:00
Laurent Destailleur
995f4fa35f
Fix limit
2018-10-14 23:57:07 +02:00
Laurent Destailleur
8fc73d1b1b
Fix pagination show two times the same account on balance of accounts
2018-10-14 23:47:38 +02:00
Philippe GRAND
eecc56c1a3
highlight relevant text
2018-10-14 13:00:01 +02:00
Philippe GRAND
b2677f08a4
add links for set-up
2018-10-14 12:47:26 +02:00
Philippe GRAND
5dd447445a
html5
2018-10-14 09:43:33 +02:00
Alexandre SPANGARO
d9e1312924
Debug FEC model export
2018-10-14 06:16:14 +02:00
Philippe Grand
7e82e3d44c
Update card.php
2018-10-12 19:13:07 +02:00
Philippe GRAND
18b3238bad
Standardize and update code
2018-10-12 16:56:01 +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
cf88de05e2
NEW Add format code into exported filename
2018-10-10 20:01:01 +02:00
Laurent Destailleur
6c55bfc0f7
Fix export and remove duplicate csv export.
2018-10-10 19:45:26 +02:00
Laurent Destailleur
8d9f6aad3f
css
2018-10-10 19:20:10 +02:00
Laurent Destailleur
4a80a4d9e7
css
2018-10-10 19:18:33 +02:00
Laurent Destailleur
5cb111e339
css
2018-10-10 19:13:00 +02:00
Laurent Destailleur
9f4cee5fb7
css
2018-10-10 19:11:37 +02:00
Laurent Destailleur
b13088849b
CSS
2018-10-10 18:58:28 +02:00
Laurent Destailleur
62a6af3288
phpcs
2018-10-10 17:02:35 +02:00
Laurent Destailleur
1d04ce2185
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df
Merge
2018-10-09 17:06:08 +02:00
Laurent Destailleur
0fbc9d640e
Fix syntax error
2018-10-09 16:05:56 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
...
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Philippe GRAND
6ea115f828
Standardize code
2018-10-09 09:04:27 +02:00
Philippe GRAND
ac214a7258
Standardize code
2018-10-09 08:53:08 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270
NEW Can filter on EEC, not EEC, etc... in binding step of accountancy
2018-10-09 01:47:37 +02:00
Laurent Destailleur
6ded9e843d
NEW The binding step in accountancy has a country filter like a combo
2018-10-09 01:03:46 +02:00
Alexandre SPANGARO
75b9862c14
New : Add FEC Export in accountancy
2018-10-08 21:01:21 +02:00
Philippe GRAND
dd9af92020
Standardize code
2018-10-06 12:07:24 +02:00
Philippe GRAND
da560289e3
Standardize code
2018-10-05 15:48:38 +02:00
Laurent Destailleur
20f45db6b8
Merge pull request #9677 from grandoc/new_branch_04_10_2018
...
Standardize and update code
2018-10-04 18:33:24 +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
atm-ph
58d1ac427e
Fix missing hook on sellsjournal
2018-10-04 10:57:22 +02:00
Philippe GRAND
c32b96c207
Standardize and update code
2018-10-04 09:15:15 +02:00
gauthier
d6a9da57e1
FIX : need to round with 2 decimals to avoid movements not correctly balanced
2018-10-01 14:11:19 +02:00
Laurent Destailleur
85bed00474
Fix default fields
2018-09-18 11:50:04 +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
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Frédéric FRANCE
e8d2cb6135
update code comment lettering class
2018-09-16 08:39:43 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +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
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
3bf296c9cf
Merge pull request #9448 from frederic34/loadfichetitre
...
remove deprecated
2018-09-12 18:23:24 +02:00
Laurent Destailleur
b5d866f4d5
Merge pull request #9444 from frederic34/patch-11
...
Completely comment unused code
2018-09-12 18:14:22 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10
...
Completely comment unused code
2018-09-12 17:28:29 +02:00
Frédéric FRANCE
d8f77f040f
Update accountancycategory.class.php
2018-09-09 23:12:16 +02:00
Frédéric FRANCE
9d8a4e463b
Update accountancycategory.class.php
2018-09-09 23:09:52 +02:00
Frédéric FRANCE
aab617aeb3
remove deprecated
2018-09-09 18:38:48 +02:00
Frédéric FRANCE
0e0db9d1ee
remove deprecated
2018-09-09 15:52:55 +02:00
Frédéric FRANCE
86e237f61f
Completely comment unused code
2018-09-09 14:18:26 +02:00
Frédéric FRANCE
fdd24a5a30
Update accountancycategory.class.php
2018-09-09 13:47:12 +02:00
Frédéric FRANCE
8c5a785797
completely comment unused code
2018-09-09 13:42:38 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +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
Frédéric FRANCE
3ecf788438
move phpcs:ignore
2018-09-06 18:29:01 +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
Philippe GRAND
0492492df1
fix merge
2018-09-04 12:30:06 +02:00
Frédéric FRANCE
7288335c6d
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-03 19:01:11 +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
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +02:00
Philippe GRAND
ae2df6be11
Standardize and Update code
2018-09-01 23:04:46 +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
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
aa2655d604
Merge pull request #9374 from bafbes/abb80014
...
Fix: No link is shown to access for bank transfers.
2018-09-01 13:36:08 +02:00
Frédéric FRANCE
2b5407c31d
Update export.php
2018-09-01 13:30:28 +02:00
Laurent Destailleur
0d3c34f2b3
Merge pull request #9364 from frederic34/patch-22
...
Update export.php
2018-09-01 13:29:41 +02:00
Philippe GRAND
0dc812cf10
precise label comment
2018-09-01 13:02:27 +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
Abbes Bahfir
c288c42ee3
Fix: No link is shown to access for bank transfers.
2018-08-31 18:13:56 +01:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
7973489f8a
fix display comment issue
2018-08-31 17:18:08 +02:00
Frédéric FRANCE
d8441619ed
Update export.php
2018-08-31 08:29:51 +02:00
Philippe Grand
5ec22d9fad
Update accountingaccount.class.php
2018-08-30 14:25:25 +02:00
Philippe Grand
e96e3bdf42
Update accountancycategory.class.php
2018-08-30 14:19:21 +02:00
Philippe GRAND
ba6a48360e
Standardize and update code
2018-08-30 12:26:59 +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
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +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
b29721df61
Fix white spaces
2018-08-29 12:17:59 +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
df05eb785b
Update accountingjournal.class.php
2018-08-28 10:38:42 +02:00
Philippe Grand
34ea3d479f
Update accountingaccount.class.php
2018-08-28 10:38:01 +02:00
Philippe Grand
c352bbbd18
Update accountancycategory.class.php
2018-08-28 10:37:16 +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
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
74ce0bfea6
Standardize and update code
2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174
Standardize and update code
2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d
Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018
2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5
Update and standardize code
2018-08-23 11:11:46 +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
25b1b08d92
Update accountancysystem.class.php
2018-08-22 22:30:09 +02:00
Philippe GRAND
449ef9c464
Update and standardize code
2018-08-22 18:12:44 +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
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Philippe GRAND
da951e61f2
Update and standardize code
2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +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
7bb781eea8
function declaration
2018-08-15 14:28:34 +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
6113b536a0
remove superfluous spaces
2018-08-12 19:59:39 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
Philippe GRAND
f17275845d
standardize
2018-07-28 14:29:28 +02:00
Philippe GRAND
5a4524451c
standardize
2018-07-28 14:02:33 +02:00
Frédéric FRANCE
c991a4d204
trim trailing
2018-07-26 18:05:20 +02:00
Philippe GRAND
e755fde52a
clean and update code
2018-07-23 17:35:30 +02:00
Philippe GRAND
365ed9c5de
clean and update code
2018-07-23 17:28:19 +02:00
Philippe GRAND
1dd39a4c5c
clean and update code
2018-07-23 17:21:51 +02:00
Laurent Destailleur
66f9153490
Fix css
2018-07-18 11:33:53 +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
7daee6dc6b
A lot of fix of css and look and feel v8
2018-06-23 00:07:56 +02:00
Laurent Destailleur
ca04ffe420
Load lang
2018-06-22 17:07:49 +02:00
Laurent Destailleur
4f877e7970
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/accountancy/supplier/lines.php
2018-06-18 14:46:30 +02:00
Laurent Destailleur
31067b6250
FIX picto for type in product link in accountany list is wrong
2018-06-18 14:43:32 +02:00
Laurent Destailleur
ce5514bd68
Fix sql begin at wrong place
2018-06-18 14:37:16 +02:00
Laurent Destailleur
ad2df304b4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
2018-06-18 13:31:29 +02:00
Laurent Destailleur
102f9aa84f
FIX Problems in accountancy module when using multicompany module.
2018-06-18 13:19:46 +02:00
gauthier
fed61930d5
FIX : clause must not be there
2018-06-18 11:37:15 +02:00
gauthier
e9d65ea751
FIX : need to filter on aa.entity for same accounting accounts available in several entities
2018-06-14 11:56:22 +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
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +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
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26
...
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
2018-05-25 10:36:46 +02:00
Alexandre SPANGARO
d1e1d64b42
Add some information in bank_journal
2018-05-24 20:26:38 +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
Alexandre SPANGARO
0b581fc507
loadLangs
2018-05-19 08:06:52 +02:00
Laurent Destailleur
004c85b4ed
Update journals_list.php
2018-05-18 11:35:37 +02:00
Laurent Destailleur
078ea2ce9b
Merge pull request #8790 from aspangaro/7.0-f1
...
Fix : Double WHERE on admin/journal_list.php
2018-05-18 11:20:05 +02:00
Laurent Destailleur
26e10caa7d
FIX #8813
2018-05-18 09:15:18 +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
daf829c9f7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/7.0.0-8.0.0.sql
2018-05-02 08:49:40 +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
c84f44a508
fix accountanty in multientity
2018-05-01 12:30:22 +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
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24
...
Fix Accountancy
2018-04-22 20:30:42 +02:00
Alexandre SPANGARO
034f7d56e4
Invert credit debit
2018-04-22 06:49:04 +02:00
Laurent Destailleur
5f43ff3609
Fix no pitco if bank account not defined
2018-04-20 08:47:53 +02:00
Laurent Destailleur
b0b88d18df
Fix class not found
2018-04-20 02:08:09 +02:00
Laurent Destailleur
066d324e5f
nowrap
2018-04-20 02:02:30 +02:00
Laurent Destailleur
721ff3e1a4
Merge branch 'develop' into new_branch_19_04_2018
2018-04-20 01:30:57 +02:00
Laurent Destailleur
bb5d3ee47e
Merge pull request #8635 from aspangaro/8.0-a23
...
Accountancy - move to loadLangs
2018-04-20 01:19:51 +02:00
Laurent Destailleur
4ce313d864
NEW Can filter on country and taxid into the binding page
2018-04-19 23:52:37 +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
Alexandre SPANGARO
e0c0f7fd9b
Fix Accountancy
2018-04-17 20:04:55 +02:00
Laurent Destailleur
faea6861c3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
50d86a7cfd
Fix accounting area when advanced accounting module not enabled
2018-04-16 14:25:39 +02:00
Laurent Destailleur
69c26e19a8
NEW Can edit the text color for title line of tables
2018-04-15 22:01:52 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +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
Laurent Destailleur
e49e455c0c
Merge pull request #8598 from aspangaro/8.0-a19
...
Accountancy - list by account - Add some fix & functions
2018-04-15 11:31:01 +02:00
Alexandre SPANGARO
910d83d6e3
Fix export balance
2018-04-15 07:49:54 +02:00
Alexandre SPANGARO
899ef6d2a6
Accountancy - list by account - Add some fix & functions
2018-04-15 06:55:18 +02:00
Laurent Destailleur
187cc35786
Look and feel v8
2018-04-14 22:23:56 +02:00
Laurent Destailleur
fea3182e93
NEW Can filter on account range in general ledger grouped by account
2018-04-14 00:01:54 +02:00
Laurent Destailleur
d833620285
Fix title of break in balance account report
2018-04-13 23:49:08 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Alexandre SPANGARO
251117fcce
Accountancy - Small fix
2018-04-12 06:07:22 +02:00
Laurent Destailleur
afdd504e16
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/journal/sellsjournal.php
2018-04-11 17:58:21 +02:00
atm-ph
6f526eb780
Fix wrong amount for situation invoice in sellsjournal
2018-04-11 16:40:59 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15
2018-04-11 13:17:12 +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
f388e235fd
Fix filter on account
2018-04-08 13:42:39 +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
a09681f943
Fix css
2018-04-08 13:02:25 +02:00
Laurent Destailleur
3d36e3ee49
Fix search criteria in bookkeeping table
2018-04-08 12:41:03 +02:00
Laurent Destailleur
8cca3dabd6
FIX look and feel v7 "back to" for bookkeeping record
2018-04-08 11:29:30 +02:00
Laurent Destailleur
6529043182
Clean code
2018-04-08 10:49:59 +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
741a14993a
NEW Add file number in accountant card and update export filename
2018-04-07 06:21:49 +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
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Laurent Destailleur
930512d9a2
FIX Add a test to avoid to reset binding by error.
2018-03-27 13:08:16 +02:00
Laurent Destailleur
4740c92eb1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-27 12:47:14 +02:00
Laurent Destailleur
56944115cb
Hide a very dangerous feature. Should be useless.
2018-03-27 12:46:15 +02:00
Laurent Destailleur
dab8dbd671
FIX Binding pages must start on fiscal month not calendar month
2018-03-27 12:31:08 +02:00
Laurent Destailleur
d1e9a4719b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2018-03-27 12:27:15 +02:00
Laurent Destailleur
ba4839fa76
FIX The menu "Line bindings" start at the fiscal start month
2018-03-27 12:22:10 +02:00
Laurent Destailleur
88939a8469
FIX Draft invoice must be excluded from report
2018-03-27 11:10:12 +02:00
Laurent Destailleur
89bf781fe6
FIX Add warning when expense report line not into range
...
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
2018-03-26 14:13:40 +02:00
Laurent Destailleur
e51eb4ae1c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-21 11:00:28 +01:00
Laurent Destailleur
891ebc0e7c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-21 10:59:59 +01:00
Laurent Destailleur
04199c2b4b
Fix according to mail of Olivier Geffroy the 21th of march
2018-03-21 10:59:13 +01:00
Laurent Destailleur
0c45760dd4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
8e50e63243
Fix translation
2018-03-18 20:32:18 +01: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
542eb2e5f4
Comment
2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8
Fix report when group is not dedicated to a country
2018-03-15 12:31:24 +01:00
Laurent Destailleur
b2e4c6cf14
Clean code
2018-03-15 11:53:47 +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
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
f0f6f71161
Fix Sqli
2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Sean Wang
9a1588df13
Add missing $mode in BookKeeping::createStd()
...
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.
According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.
It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
2018-03-14 16:38:22 +08:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
2053cc9307
Merge pull request #8284 from hregis/7.0_bug5
...
Fix: wrong entity id, always value 1 !
2018-03-07 12:19:09 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
0dfc9af72a
FIX multicompany compatibility and fix reports
2018-03-06 19:58:13 +01:00
Regis Houssin
1807bb36e2
Fix: missing global $conf
2018-03-06 13:31:13 +01:00
Regis Houssin
35703cff99
Fix: wrong entity id, already value 1 !
2018-03-06 13:23:00 +01:00
Marc de Lima Lucio
24ffce0be5
FIX: supplier credit notes: accounting display in purchases journal
2018-03-01 11:21:15 +01:00
Laurent Destailleur
ee4fcba4f2
Fix class not found
2018-02-27 22:11:11 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
florian HENRY
b4b185abe0
fix bad link invoice URL into acoutantcy customer affectation
2018-02-23 14:42:52 +01:00
Laurent Destailleur
b87feab1e3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
aac59f3e21
Fix escaping
2018-02-21 11:09:17 +01:00
Laurent Destailleur
48d250b201
Help to understand
2018-02-20 15:55:58 +01:00
Laurent Destailleur
15ba0c3b49
Close #7989 Merge manually in existing class
2018-02-20 15:35:42 +01:00
Laurent Destailleur
522caa4cf0
Merge #7989
2018-02-20 15:26:40 +01:00
Laurent Destailleur
aa1ede6f74
FIX Search criteria on vat
2018-02-20 06:03:08 +01:00
Laurent Destailleur
0a00bdcb73
FIX Search criteria on vat
2018-02-20 05:45:42 +01:00
Laurent Destailleur
12e48e07ae
Fix deletion of ledger line when editing transaction
2018-02-12 13:50:26 +01:00
Laurent Destailleur
284e6f1ad3
Better position of error check
2018-02-12 13:39:06 +01:00
Laurent Destailleur
caa136bed3
FIX Debug journalization: Avoid journalizing if all lines not bound
2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f
Fix journalization protection
2018-02-12 12:02:01 +01:00
Laurent Destailleur
f251113f69
Fix accounting module with multicompany
2018-02-06 01:00:35 +01:00
Laurent Destailleur
c2590b9c7e
Fix: complete labels of operation if bank journal
...
Conflicts:
htdocs/compta/tva/class/tva.class.php
2018-02-05 17:10:18 +01:00
Laurent Destailleur
a91172b7bc
Add comment into csv export
2018-02-03 18:58:02 +01:00
Laurent Destailleur
fe1f276d85
FIX labels into ledger are same that into screen
...
FIX pagination
FIX init of fiscal year
Fix tr balance
2018-02-02 17:24:40 +01:00
Laurent Destailleur
a41847d084
Fix: date of modificaiton in ledger not visible.
...
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Laurent Destailleur
1f30f9b179
Update list.php
2018-01-29 19:46:46 +01:00
De Coninck Laurent
857c03eeb9
fix issue on Big book
2018-01-28 21:04:13 +01:00
Laurent Destailleur
fd48ce11f9
Merge pull request #8085 from Darkjeff/Fixing-Lettering
...
Fixing lettering
2018-01-24 11:14:19 +01:00
Laurent Destailleur
39c4df723a
Fix error management when setting product accounts
2018-01-22 21:07:10 +01:00
Darkjeff
f47f0357d3
Fixing Subledger account in lettering
2018-01-22 15:57:17 +01:00
Laurent Destailleur
7a1a2cf90d
Fix send into ledger for bank line record. Show accounted status.
2018-01-22 04:13:29 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Laurent Destailleur
e4c02152b3
Fix navigation in bookeeping view grouped by account
2018-01-15 12:14:18 +01:00
Laurent Destailleur
04a5dc79e9
Merge pull request #8054 from artis-auxilium/accounting_searchdate_fiscalyear
...
Accounting searchdate fiscalyear
2018-01-15 11:38:04 +01:00
Laurent Destailleur
28207ad4cb
Clean var
2018-01-12 14:57:02 +01:00
Laurent Destailleur
e152e81d18
Fix close code
2018-01-11 18:24:40 +01:00
Laurent Destailleur
15ed7584b8
Fix navigation in accounting account card
2018-01-11 17:06:06 +01:00
dev2a
60c508b1c4
Get start date from fiscal year
...
if start date is empty, get date from current accounting fiscal year, else from company fiscal month setting
2018-01-11 15:52:45 +01:00
dev2a
415d7574eb
Fix PHP notices adding empty($page)
2018-01-11 15:35:34 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu
...
fix #7963
2018-01-11 00:44:45 +01:00
Laurent Destailleur
9b448459c9
Fix dispatching replacement invoice into bookkeeping (not used by most
...
countries in europe)
2018-01-09 19:12:08 +01:00
florian HENRY
fdedd6f75b
fix 7963
2018-01-08 20:54:40 +01:00
Laurent Destailleur
f25b2ebc51
Merge pull request #8026 from c3do/patch-3
...
Fix #8026 Remove PHP Warning adding empty($page)
2018-01-04 21:04:33 +01:00
Laurent Destailleur
460bdd441a
Merge pull request #8025 from c3do/patch-2
...
Fix #8025 Remove PHP Warning adding empty($page)
2018-01-04 21:04:22 +01:00
Laurent Destailleur
055d0e138e
Merge pull request #8024 from c3do/patch-1
...
Fix #8024 Remove PHP notices adding empty($page)
2018-01-04 21:04:12 +01:00
Laurent Destailleur
01cde59608
Fix filter on bookkeeping group view
2018-01-04 19:16:53 +01:00
Laurent Destailleur
56b27a3a11
Fix: do no lose filter when deleting a bookeeping transaction
2018-01-04 19:03:01 +01:00
Laurent Destailleur
ebc76b5f27
Fix tooltips on thirdparty and invoice
2018-01-04 18:29:12 +01:00
Cédric
4ed86c830a
Fix PHP Warning
...
Warning: A non-numeric value encountered in dolibarr/htdocs/accountancy/bookkeeping/list.php on line 89
2018-01-04 17:42:23 +01:00
Cédric
777ed43e75
Remove PHP notices adding empty($page)
2018-01-04 17:31:59 +01:00
Cédric
41fec45daf
Fix PHP notices adding empty($page)
2018-01-04 16:23:25 +01:00
Laurent Destailleur
59ed23069c
Fix debug accounting module
2018-01-04 15:52:07 +01:00
Laurent Destailleur
534cbcb941
Debug translation
2018-01-03 20:59:35 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Alexandre SPANGARO
7b935a96bf
FIX : Various payment
2017-12-11 07:03:37 +01:00
Laurent Destailleur
c6c248fa28
Merge pull request #7930 from aspangaro/7.0-7
...
Fix : Accountancy some cleaning
2017-12-10 21:10:30 +01:00
Alexandre SPANGARO
ac95ccd872
FIX : Debug various_payment
2017-12-10 14:05:36 +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
9b5f7099f7
Code comment
2017-12-03 19:50:15 +01:00
Laurent Destailleur
33032a5474
Look and feel v6
2017-11-29 18:13:22 +01:00
Laurent Destailleur
682afe8918
Fix scrutinizer
2017-11-29 16:25:12 +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
Laurent Destailleur
b63fb1f854
Support of VAT NPR in accounting module
2017-11-27 22:18:10 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
Laurent Destailleur
533a82187a
NEW Add a protection so we can't journalize non balanced transactions
2017-11-27 17:12:48 +01:00
Laurent Destailleur
57d4f28cba
Enhance usability of accounting module
2017-11-27 15:51:28 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
aaf08ade2f
Fix bug reported by scrutinizer
2017-11-25 11:21:31 +01:00
Laurent Destailleur
06de67cb8a
Update purchasesjournal.php
2017-11-24 16:37:19 +01:00
John
d8f18e18ce
Add new doActions hook
2017-11-23 12:08:33 +01:00
Laurent Destailleur
1509a4f125
Merge pull request #7840 from frederic34/bankjournal
...
align export bankjournal on others
2017-11-22 11:57:27 +01:00
Frédéric FRANCE
6d33cc3980
align export bankjournal on others
2017-11-20 15:02:11 +01:00
elarifr
c7129cdd71
quadra format date is wrong
...
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
2017-11-19 19:42:16 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
Laurent Destailleur
6608dd72bd
Merge pull request #7776 from frederic34/exportadmin
...
correct merge
2017-11-11 17:23:42 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
d938a56282
Clean code
2017-11-11 01:10:17 +01:00
Frédéric FRANCE
fe3ce78ae4
Update card.php
2017-11-08 11:24:33 +01:00
Frédéric FRANCE
45afbae49c
some change
2017-11-07 10:47:58 +01:00
Laurent Destailleur
2ab943f85a
Fix size of image by using fa picto
2017-11-07 00:18:55 +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
Laurent Destailleur
a329f7dc75
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
2017-11-05 18:50:14 +01:00
Laurent Destailleur
d4d370d8c4
Merge pull request #7769 from aspangaro/7.0-7
...
Small code improve on bookkeeping card movement
2017-11-05 18:40:49 +01:00
Frédéric FRANCE
bb252846e3
accounting export admin config
2017-11-05 11:48:41 +01:00
Alexandre SPANGARO
7d524f3364
Small code improve on bookkeeping card movement
2017-11-05 08:45:05 +01:00
Philippe GRAND
c31f852f67
fix : Warning: A non-numeric value encountered
2017-11-03 19:37:54 +01:00
florian HENRY
bd68b94411
fix : missing hook in accountancy
2017-11-02 13:27:09 +01:00
Laurent Destailleur
417642ba39
Standardize interface (search on date modification)
2017-11-02 10:33:04 +01:00
Alexandre SPANGARO
f9e801b4a7
Update works
2017-11-01 08:42:17 +01:00
Alexandre SPANGARO
7c0ff3a32f
Merge remote-tracking branch 'uptream/develop' into 7.0-general_ledger
2017-11-01 07:58:20 +01:00
Alexandre SPANGARO
7a719c6be6
NEW General ledger : Add field and selected field
2017-10-29 05:37:50 +01:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
2187cfeee9
Merge pull request #7693 from aspangaro/7.0-label_operation_on_general_ledger
...
Update balance export
2017-10-24 12:51:14 +02:00
Alexandre SPANGARO
67b2646dcc
Update balance export
2017-10-24 05:35:46 +02: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
florian HENRY
c258e229c8
fix accountancy index display
2017-10-23 10:00:22 +02:00
Laurent Destailleur
efb369f857
Merge pull request #7497 from atm-florian/dev_accountancy
...
NEW : lettrage in accountancy
2017-10-22 15:28:53 +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
florian HENRY
b5fc559889
travis
2017-10-18 14:48:58 +02:00
florian HENRY
4273e507c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
...
dev_accountancy
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
htdocs/accountancy/class/lettering.class.php
2017-10-18 09:52:56 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
82348cc1e9
NEW Can filter on date on the page showing existing bindings
2017-10-16 10:17:57 +02:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
d12019d1b5
Fix from scrutinizer
2017-10-13 13:10:36 +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
304828c37f
Merge pull request #7569 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2017-10-06 12:41:52 +02:00
Laurent Destailleur
7871498724
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 11:03:03 +02:00
Laurent Destailleur
7b1fe6e5af
Look and feel v6
2017-10-06 11:02:44 +02:00
Scrutinizer Auto-Fixer
f59d87f06d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-06 00:42:32 +00:00
Alexandre SPANGARO
2f49b00f6c
Fix : some small problems on accountancy
2017-10-05 06:56:13 +02:00
Alexandre SPANGARO
f1b7b36a11
Fix : problem on column in customer to bind index
2017-10-05 05:38:02 +02:00
Alexandre SPANGARO
9993e796ee
Merge remote-tracking branch 'uptream/develop' into 7.0-label_operation_on_general_ledger
2017-10-05 05:12:56 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Alexandre SPANGARO
0acb391b36
Fix : label_operation on general ledger
2017-10-03 05:27:08 +02:00
florian HENRY
18bd2c4445
fix travis
2017-10-02 09:04:22 +02:00
Alexandre SPANGARO
6a05645295
Fix : Accountancy export model for Agiris Isacompta
2017-09-30 06:58:31 +02:00
florian HENRY
6fcfe89565
NEW : lettrage in accountancy
2017-09-26 13:02:29 +02:00
Laurent Destailleur
1e33495f42
Fix remove warnings
2017-09-19 00:31:51 +02:00
Kjeld Borch Egevang
ee99483b0d
Changed "Solde" to "Balance".
2017-09-18 22:30:08 +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
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +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
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +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
2cdea7e37c
Fix bug reported by scrutinizer
2017-09-12 19:21:26 +02:00
Laurent Destailleur
c5bf5c7e67
Minor fixes
2017-09-12 15:26:44 +02:00
Laurent Destailleur
dc61c53d39
Balance automatically set on good year according to fiscal start month
2017-09-12 15:22:23 +02:00
Laurent Destailleur
85cad6d537
Add TODO
2017-09-12 15:10:51 +02:00
Laurent Destailleur
5dcbebbd46
NEW Add filters on month/year on the accountancy binding tools
2017-09-12 13:48:45 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
16092bc9f0
Clean code
2017-09-12 13:13:57 +02:00
Laurent Destailleur
c498ce3c41
FIX journalization for bank journal should not rely on a label.
2017-09-08 17:50:39 +02:00
Laurent Destailleur
8b20c5edab
FIX Remove warning when using log into syslog
2017-09-08 15:46:06 +02:00
Laurent Destailleur
a6a142753a
Fix bad label when account not set
2017-09-08 15:24:27 +02:00
Laurent Destailleur
87126343a6
Fix new menu
2017-09-08 15:03:08 +02:00
Laurent Destailleur
59721bf8ed
Fix code comment
2017-09-08 13:33:52 +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
48c526f87d
Debug report for accounting module
2017-09-05 12:53:25 +02:00
Laurent Destailleur
f23a681dc0
Clean code
2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da
Standardize code
2017-09-05 09:43:22 +02:00
Laurent Destailleur
4b11332927
Debug edit accounting groups
2017-09-05 09:42:05 +02:00
Laurent Destailleur
c1d31c34cd
Work on reports per date
2017-09-05 02:26:23 +02:00
Laurent Destailleur
e1fa37f7ff
Work on reports per date
2017-09-05 02:13:02 +02:00
Laurent Destailleur
c15454e62b
Fix method to delete a bookkeeping record
2017-09-04 13:09:26 +02:00
Laurent Destailleur
4c8945e460
Fix bad use
2017-09-04 12:59:54 +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
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Regis Houssin
ad39c30c21
Fix: change old email
2017-08-23 21:23:18 +02:00
Laurent Destailleur
b3d1cdf84c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-08-22 10:11:32 +02:00
Laurent Destailleur
9be342bd25
Fix missing $form
2017-08-22 10:02:45 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
6902960d07
Fix sign of amount debit/credit/montant
2017-07-25 21:03:30 +02:00
Laurent Destailleur
c5267154b9
Merge branch 'develop' into Bookkeeping-V6
2017-07-25 20:54:37 +02:00
florian HENRY
d6d454edc8
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:32:27 +02:00
Laurent Destailleur
149e1f9c67
Merge pull request #7195 from atm-florian/6.0
...
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:31:40 +02:00
florian HENRY
b9d5f4ba10
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-24 09:02:32 +02:00
Laurent Destailleur
75ec7a309c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-15 21:25:14 +02:00
Laurent Destailleur
bab963ec07
FIX Pagination on the ledger page.
2017-07-15 19:19:12 +02:00
Laurent Destailleur
d671421b8b
Fix journalization of vat payments
2017-07-15 18:29:18 +02:00
Laurent Destailleur
fa00373e56
Fix remove log
2017-07-15 17:52:30 +02:00
Laurent Destailleur
a20bf05c64
Debug journalization
2017-07-15 17:32:22 +02:00
Laurent Destailleur
c6dcccba18
Fix better warning when record will be saved into a waiting account.
2017-07-15 14:55:04 +02:00
Laurent Destailleur
03d9cbb170
Fix refresh of list when change were done
2017-07-15 13:31:56 +02:00
Laurent Destailleur
248717ccac
Fix refresh of list when change were done
2017-07-15 13:31:14 +02:00
Laurent Destailleur
0763d15b4c
Debug journalization
...
Debug edition of user BAN.
2017-07-15 12:37:31 +02:00
Laurent Destailleur
ab6646d16b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-07-15 03:54:50 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +02:00
Laurent Destailleur
201db3b720
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/tasks/task.php
2017-07-14 00:24:49 +02:00
Laurent Destailleur
652d715fdc
Better translation
2017-07-13 18:18:56 +02:00
Laurent Destailleur
cd3d18cb4d
Fix detection of payment for credit note
2017-07-13 14:16:51 +02:00
Laurent Destailleur
f5995cadef
Fix detection of payment for credit note
2017-07-13 14:16:26 +02:00
Laurent Destailleur
9127892c71
Fix several minor bugs
2017-07-13 02:33:48 +02:00
Laurent Destailleur
bb828f5c9c
Fix vat src code must be visible into bind step
2017-07-13 01:14:27 +02:00
Laurent Destailleur
3fd505d98f
Fix error management when making
2017-07-13 01:02:35 +02:00
Laurent Destailleur
3fae3a9eda
Fix typo
2017-07-13 00:44:04 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Laurent Destailleur
a562e5a919
Maxi debug of accountancy ledger page.
2017-07-08 20:52:53 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
4f75b6d656
Fix phpcs
2017-07-08 14:58:19 +02:00
Laurent Destailleur
eff4282cc2
Clean files
2017-07-07 22:19:01 +02:00
Laurent Destailleur
5ad6d70397
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-07 22:05:01 +02:00
Laurent Destailleur
4bae65bedc
Fix travis
2017-07-07 22:04:29 +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
441c4b9b71
Merge pull request #7115 from atm-florian/dev_fix_accountancy
...
FIX accountancy right management on setup pages
2017-07-07 20:08:21 +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
Laurent Destailleur
be493b78ba
Merge pull request #7093 from Darkjeff/Fix-Accoutancy
...
Fix accoutancy
2017-07-07 19:14:35 +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
florian HENRY
7f869b4840
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
2017-07-03 14:36:50 +02:00
Darkjeff
30153f8c2e
add in bookkeeping date lim reglement
...
Date lim reglement for export Sage and Iris
correct avoir when write in bookkeeping
2017-07-03 07:21:15 +02:00
Laurent Destailleur
c5aed0c333
Fix phpcs
2017-07-01 14:25:46 +02:00
Laurent Destailleur
b186fa8759
Fix pgsql compatibility
2017-07-01 13:31:44 +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
Darkjeff
180467ba56
add lettering
2017-06-30 11:53:15 +02:00
Darkjeff
32729adfae
Journal correct negatif amount
2017-06-30 11:49:03 +02:00
Darkjeff
f978b0795a
Fix action in journal
2017-06-30 11:31:24 +02:00
Darkjeff
2c795da664
Fix Binding Supplier
2017-06-30 11:30:20 +02:00
Darkjeff
11cd4e1164
Fix Binding Customer
2017-06-30 11:29:37 +02:00
florian HENRY
7556a604e3
fix travis
2017-06-29 16:30:57 +02:00
florian HENRY
6e8c83b2a9
fix class error (given by eclipse Oxygen version)
2017-06-29 15:47:33 +02:00
Laurent Destailleur
ab0a730d4a
Fix bad GETPOST on 'action'
2017-06-29 02:54:56 +02:00
Darkjeff
0955b355e9
update result
2017-06-28 16:50:29 +02:00
Darkjeff
ef5e38b0d3
correct bug result
2017-06-28 16:45:44 +02:00
Darkjeff
97da70e583
bug lines supplier
2017-06-28 16:38:06 +02:00
Darkjeff
8182f5fb2a
update journal and supplier lines
2017-06-28 16:35:14 +02:00
Laurent Destailleur
d186aed96c
Fix: date must be stored into a date field (error with pgsql).
...
import_key is reserved for "import" process.
2017-06-27 18:26:17 +02:00
Laurent Destailleur
5dd8d1c4ef
Rename button to make clear for user that the export is not the real
...
journal but a temporary situation.
2017-06-27 17:56:45 +02:00
Laurent Destailleur
9c64ba6ad6
Fix closing }
2017-06-27 17:52:50 +02:00
Darkjeff
8146049b4d
update bank journal
...
add in bookkeeping
add export control
correct some bug with salary
2017-06-27 12:12:25 +02:00
Darkjeff
618334ac42
update purchase journal
...
add in bookkeeping
add export control
2017-06-27 11:58:26 +02:00
Darkjeff
2e64db2556
update sells journal
...
add in bookkeeping
add export control
2017-06-27 11:44:18 +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
459fac4753
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
...
# Conflicts:
# htdocs/accountancy/customer/index.php
2017-06-22 05:30:21 +02:00
Alexandre SPANGARO
c381c213a5
Fix : Accountancy
2017-06-20 06:52:41 +02:00
Laurent Destailleur
8d23ffd6d2
Fix show vat rates
2017-06-20 02:05:42 +02:00
Laurent Destailleur
fcdc7b1a0d
Fix pgsql compatibility
2017-06-20 01:53:34 +02:00
Laurent Destailleur
d78d5d60c4
Fix pgsql
...
Fix missing vat rate info.
2017-06-20 01:45:44 +02:00
Alexandre SPANGARO
95573e8608
Fix : Accountancy - Debug
2017-06-19 21:39:43 +02:00
Laurent Destailleur
6fe96b322a
Fix PHPCS
2017-06-19 16:18:07 +02:00
Laurent Destailleur
8f6e756249
Fix PHPCS
2017-06-19 15:37:22 +02:00
Alexandre SPANGARO
e9b6afd2aa
Add last session coding - Add temporaly ledger
2017-06-18 22:17:32 +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
b416b22bcc
Fix phpcs
2017-06-16 01:27:28 +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
ac708a8ee9
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-15 23:58:56 +02:00
Laurent Destailleur
f39fb5187a
Fix component to select journal
2017-06-15 20:27:40 +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
Laurent Destailleur
20fb12bc7d
Merge pull request #6959 from aspangaro/6.0-fec2
...
NEW : Accountancy - Activate multi-journal everywhere & Add journal_label information to database (FEC)
2017-06-08 10:56:53 +02:00
Alexandre SPANGARO
5e3a2e06d4
NEW : Accountancy - Activate multi-journal & Add journal_label to database (FEC)
2017-06-08 06:35:09 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +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
0486a18972
Fix: use dolGetFirstLastname
2017-06-06 11:07:35 +02:00
Laurent Destailleur
63920930bf
Merge branch 'develop' into 6.0-salary
2017-06-06 11:01:28 +02:00
Laurent Destailleur
4b6bd2b6eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-06 10:54:17 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Alexandre SPANGARO
2281850abf
Fix label and name
2017-06-05 14:56:14 +02:00
Alexandre SPANGARO
806d25ae41
Activate multi-journal on expensereport journal
2017-06-05 06:44:53 +02:00
Regis Houssin
a25facef7c
Fix: use 0 instead false
2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Alexandre SPANGARO
90c1a38486
Accountancy - Activate multijournal on bank_journal
2017-06-03 07:23:14 +02:00
Alexandre SPANGARO
9d83746935
Fix : Book entry in general ledger for salaries
2017-06-01 04:44:05 +02:00
Laurent Destailleur
6837312041
Merge branch 'develop' into 6.0-vat2
2017-05-31 19:28:41 +02:00
Alexandre SPANGARO
21183f91a3
FIX : Vat payment - Sql error / Add information in tooltip / Correct writting in general ledger
2017-05-31 05:27:39 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Alexandre SPANGARO
a0de94ae09
Fix : Correct donation when we write operation in general ledger
2017-05-30 06:28:19 +02:00
Laurent Destailleur
b74a0dd5fd
Look and feel v6
2017-05-29 12:06:26 +02:00
Laurent Destailleur
cce05a4070
Merge branch 'develop' into 6.0-d2
2017-05-29 11:45:13 +02:00
Laurent Destailleur
395d361d66
Look and feel v6
2017-05-29 11:38:23 +02:00
Laurent Destailleur
425192ef84
Merge branch 'develop' into 6.0-multijournal
2017-05-29 10:23:46 +02:00
Alexandre SPANGARO
b0f2e95c7b
Debug
2017-05-28 22:11:57 +02:00
Alexandre SPANGARO
095545e8d9
Fix : Correct bank transfert when we write operation on general ledger
2017-05-28 21:56:18 +02:00
Alexandre SPANGARO
db6d7d9e21
Spaces
2017-05-25 07:15:36 +02:00
Alexandre SPANGARO
e4f5d45c45
Remove old code (selectjournal_accountancy_bookkepping)
2017-05-25 07:10:09 +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
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
94353deb75
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-10 23:25:11 +02:00
Laurent Destailleur
cf361e1ed2
Fix html syntax
2017-05-10 23:10:09 +02:00
Alexandre SPANGARO
a3602ff6b4
Add journal list in new movement card
2017-05-08 06:20:17 +02:00
Alexandre SPANGARO
8113e6c2f2
Update Accounting journal getNomUrl
2017-05-06 08:11:07 +02:00
Alexandre SPANGARO
68aaef2f66
Add list to select journal in bank
2017-05-06 08:06:01 +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
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +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
dfa81bc806
Merge pull request #6792 from aspangaro/6.0-agiris
...
New : Accountancy - Add export model towards Agiris
2017-05-05 14:15:51 +02:00
Laurent Destailleur
0a1ec514d2
Merge pull request #6772 from aspangaro/6.0-1
...
Add option on accounting account getNomUrl
2017-05-05 10:02:27 +02:00
Laurent Destailleur
7ec46b3bd6
Finished work to have substitution keys code mutualized.
2017-05-04 12:35:45 +02:00
Alexandre SPANGARO
76f2cc3f1e
False operation
2017-05-04 06:52:07 +02:00
Alexandre SPANGARO
29bede28f0
New : Accountancy - Add export model towards Agiris
2017-05-04 06:49:29 +02:00
Alexandre SPANGARO
94b69844f2
Add option no url
2017-05-01 20:39:46 +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
e11254a9bf
Add option on accounting account getNomUrl
2017-04-30 15:04:51 +02:00
Alexandre SPANGARO
fed1b152d9
Correct multi-journals
2017-04-30 07:41:47 +02:00
Laurent Destailleur
ff0f40ab37
Look and feel v6
2017-04-29 16:07:34 +02:00
Laurent Destailleur
04c05efafe
FIX Several bugs in accounting module.
2017-04-29 15:16:36 +02:00
Laurent Destailleur
c9bfb6e945
FIX Several bugs in accounting module.
2017-04-29 15:07:50 +02:00
Laurent Destailleur
04b1535b12
FIX Found duplicate line when it is not.
2017-04-29 14:59:40 +02:00
Laurent Destailleur
faddcb28ac
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:53:29 +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
1758b83604
Clean explanation for accounting module setup.
2017-04-27 13:50:13 +02:00
Philippe Grand
c18e7e8816
Merge branch 'develop' into testing
2017-04-19 11:27:36 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
philippe grand
4d31759ff9
Update code using new css class
2017-04-11 14:35:10 +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
Laurent Destailleur
cab944a1a1
Merge pull request #6602 from aspangaro/6.0-multijournal
...
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
aca1c1944d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Alexandre SPANGARO
06c2f04927
Finish work on multijournal admin part
...
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Laurent Destailleur
ad3b54b93a
Fix regression
2017-03-28 21:09:15 +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
Alexandre SPANGARO
3148841ecf
Fix : integration of expense report in accounatncy bank journal
2017-03-26 21:26:05 +02:00
Alexandre SPANGARO
0987f19707
Fix : Bad page title of bind card
2017-03-26 06:20:55 +02:00
Alexandre SPANGARO
8f915bc593
Fix : Problem with type_fees_label in accountancy module
2017-03-26 06:20:05 +02:00
Alexandre SPANGARO
3bde8a575e
Fix : Ref of expense report and date are inverted in list of expense report to bind
2017-03-26 05:48:31 +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
Alexandre SPANGARO
b09398a68e
Update works
2017-03-19 15:23:35 +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
02d9a41e77
Use placeholder for %
2017-03-02 01:25:11 +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
3e2c0d26f2
Fix MVC
2017-02-20 11:59:58 +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
020ceacb46
Fix search criterias
2017-02-20 10:36:03 +01:00
Laurent Destailleur
501f118f92
Fix style
2017-02-19 22:53:29 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
c2ec6d5946
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-17 10:30:29 +01:00
a-schild
cea25ecb28
Use correct numeric format for all soldes
2017-02-17 10:23:00 +01:00
a-schild
2083d88609
Use correct numeric format for all soldes
2017-02-17 10:22:56 +01:00
Alexandre SPANGARO
66ff7fab34
Remove one step in accountancy index
2017-02-14 06:50:57 +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
cd6f5fb8cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:26:09 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +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
Charlie Root
c0b4667713
NEW: Use the expense repport author account instead of the default account, if exists
2017-01-27 10:50:50 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
1d291ee0e8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-07 17:07:29 +01:00
Laurent Destailleur
e6cdcfca00
Close #6240
2017-01-07 16:47:11 +01:00
Laurent Destailleur
8ee838c9c4
Minor fixes in accounting module.
2017-01-07 16:17:15 +01:00
Laurent Destailleur
4907f9581f
Fix warning
2017-01-03 11:35:07 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
0aaedcc68c
Merge pull request #6197 from aspangaro/5.0-b13
...
Fix: Accountancy Expense report index
2016-12-23 00:44:43 +01:00
aspangaro
d53a238b49
Fix: Accountancy - Problem on quadratus export
2016-12-22 06:12:42 +01:00
aspangaro
0fae7ecd5a
Fix: Accountancy Expense report index
2016-12-19 07:43:33 +01:00
aspangaro
e1773249c3
Fix: Traduction on index accountancy page & improvements
2016-12-19 05:56:47 +01:00
Laurent Destailleur
fc401a9c68
Fix more security fixes
2016-12-18 17:27:06 +01:00
Laurent Destailleur
ac44aa6d81
FIX security bugs
2016-12-18 13:24:06 +01:00
Laurent Destailleur
6c4f15df63
Fix lot of fix in css look to match v5 rules.
2016-12-11 16:11:42 +01:00
Jean-Pierre Morfin
b13cf15b8c
Use current chart of accounts to get accountancy labels in journals view and export
2016-12-10 12:59:10 +01:00
florian HENRY
b17480928e
fix default account selection (when cache is use)
2016-12-10 10:40:38 +01:00
Laurent Destailleur
5353aa6efe
Better error management when creating bookkeepin entries
2016-12-10 02:38:07 +01:00
Laurent Destailleur
37d0e7a2e8
Doxygen
2016-11-30 16:17:54 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
4eb397557f
Debug accounting module
2016-11-28 19:30:55 +01:00
Laurent Destailleur
663f7938f8
Fxi responsive design
2016-11-27 20:02:57 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
839f30bea9
Fix scrutinizer warnings
2016-11-22 19:45:28 +01:00
Laurent Destailleur
2043c279b0
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:47:40 +01:00
Laurent Destailleur
77337fe0cc
Fix scrutinizer warning
2016-11-19 16:23:50 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
0af0aa89bb
Debug
2016-11-17 19:49:33 +01:00
Laurent Destailleur
979632fdc8
Uniformize code
2016-11-17 19:27:29 +01:00
Laurent Destailleur
dafd7f9c55
Uniformize code
2016-11-17 19:16:37 +01:00
Laurent Destailleur
9b88ae145b
Fix mass action when using no javascript
2016-11-17 19:04:10 +01:00
Laurent Destailleur
5816c86e07
Debug accountancy module
2016-11-17 17:51:10 +01:00
Laurent Destailleur
7686ac3564
Fix missing date
2016-11-17 17:22:48 +01:00
Laurent Destailleur
b73a164256
Work on accounting module
2016-11-17 16:32:19 +01:00
Laurent Destailleur
4768017662
Debug of module accountancy
2016-11-16 19:23:32 +01:00
Laurent Destailleur
e5cedafdc0
Fix search on accounts
2016-11-16 18:00:37 +01:00
Laurent Destailleur
b928bbea7d
Fix pagination
2016-11-15 12:20:01 +01:00
Laurent Destailleur
cd2a963d80
Fix sql syntax error
2016-11-15 12:14:34 +01:00
Laurent Destailleur
06865b65e9
Debug accountancy module
2016-11-15 11:59:16 +01:00
Laurent Destailleur
206970b82c
Fix management of multientity
2016-11-15 11:42:01 +01:00
aspangaro
fd09bdfb15
Fix #5973 : EBP export uses simple cote instead of double cote
2016-11-11 14:06:33 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Laurent Destailleur
e39e20b1a4
Uniformize length of search fields
2016-11-07 12:04:47 +01:00
Laurent Destailleur
d96681bcef
Id line at first column
2016-11-07 12:01:17 +01:00
Laurent Destailleur
5fb8ba8ee7
Better help to explain suggested account
2016-11-07 11:42:20 +01:00
Laurent Destailleur
8cb7d508d2
Fix missing length_account in output
2016-11-07 10:41:45 +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
Juanjo Menent
a59cf0e13b
Merge pull request #5935 from aspangaro/5.0-p32
...
Accountancy - Add binding and journal for expense reports
2016-10-28 11:25:21 +02:00
aspangaro
029fa1ed8a
Finishing works
2016-10-27 06:04:23 +02:00
Laurent Destailleur
d47fc281b0
Better accountancy tutorial
2016-10-26 11:15:25 +02:00
aspangaro
8800bf8b25
Update works
2016-10-26 07:46:48 +02:00
aspangaro
6e7f104c5f
Update works
2016-10-25 07:41:01 +02:00
aspangaro
6314df035a
Work on expense report accountancy integration
2016-10-24 07:16:26 +02:00
Laurent Destailleur
ab3cdfa16d
Clean code
2016-10-24 00:33:39 +02:00
Laurent Destailleur
60ba6164e4
Merge pull request #5883 from aspangaro/5.0-p22
...
Accountancy - Add loan module in step to configure the accountancy
2016-10-24 00:17:09 +02:00
Laurent Destailleur
d002648733
Alignement
2016-10-22 14:25:56 +02:00
Laurent Destailleur
a057cb93c9
Debug accounting module
2016-10-22 14:23:33 +02:00
Laurent Destailleur
14c9cd4490
Fix help with new menu
2016-10-22 13:57:47 +02:00
Laurent Destailleur
f0365e49e2
Fix book keeper can edit accounting account of taxes
2016-10-21 18:05:26 +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
cef43bf4b6
Better support of multicompany
2016-10-21 11:10:11 +02:00
aspangaro
53c8649629
Merge remote-tracking branch 'Upstream/develop' into 5.0-p22
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2016-10-16 13:44:09 +02:00
aspangaro
1af1e4dc9c
Accountancy - Add loan module in step to configure the accountancy
2016-10-16 13:38:29 +02:00
Laurent Destailleur
30e6dd93a6
Missing perf key on the most important table
2016-10-15 17:10:05 +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
a7c6ecc177
Fix better compatibility with multicompany
2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f
Debug accountancy module
2016-10-14 15:44:33 +02:00
Laurent Destailleur
ca46ff8eb5
Fix pagination/navigation on general ledger page
2016-10-14 13:46:04 +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
f7f56132b2
Fix sql errors
2016-10-06 20:15:36 +02:00
Laurent Destailleur
28e4c17730
Debug module accountancy expert
2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7
Complete help
2016-10-06 19:03:40 +02:00
Laurent Destailleur
539ee1ace2
Uniformize code
2016-10-06 18:06:40 +02:00
Laurent Destailleur
49e7e4901d
Add page index for accountancy module
2016-10-06 17:43:31 +02:00
Laurent Destailleur
93c848fcc5
Add page index for accountancy module
2016-10-06 17:43:10 +02:00
Laurent Destailleur
35e568f715
Fix php error
2016-10-05 21:50:39 +02:00
Laurent Destailleur
9ad96c2be3
Debug module accountancy expert
2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9
Better terminology
2016-10-05 18:31:55 +02:00
Laurent Destailleur
5a8a0fb79a
Debug
2016-10-04 21:33:47 +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
6efbae0731
Fix title
2016-10-04 19:52:00 +02:00
Laurent Destailleur
bd5116cb52
Debug of accountancy expert module
2016-10-04 19:43:12 +02:00
Laurent Destailleur
31ce725d73
Maxi debug of accountancy expert module
2016-10-04 19:31:05 +02:00
Laurent Destailleur
1e3038d634
Debug reports
2016-10-04 13:57:25 +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
ea0687f613
FIX Vat not visible in dictionnary
2016-10-01 18:22:39 +02:00
Laurent Destailleur
aae4524fe2
Debug module accountancy
2016-09-30 18:38:48 +02:00
Laurent Destailleur
2f557fc09b
Several fix on module accountancy expert
2016-09-30 17:03:09 +02:00
Laurent Destailleur
e6503c0d36
Better explanation
2016-09-29 12:52:28 +02:00
Laurent Destailleur
fee47f7583
Fix for multicompany management
2016-09-29 12:36:59 +02:00
Laurent Destailleur
bac1f95e30
Fix consistency on permission. Missing the getLibStatut function.
2016-09-29 12:11:57 +02:00
Laurent Destailleur
b412baa880
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-29 10:49:47 +02:00
Laurent Destailleur
ccd7100b7f
Minor code fix
2016-09-29 10:43:53 +02:00
Laurent Destailleur
78c0945fe7
Fix menu switch on accountancy and picto of product not using correct
...
type.
2016-09-28 23:59:47 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
448acbf7a1
Merge pull request #5766 from atm-florian/4.0
...
fix customer accountancy lines ventilaled bad href link
2016-09-22 09:15:52 +02:00
aspangaro
9a3305abf9
Fix: Accountancy - Problem on Cegid Export Format & presentation
2016-09-20 21:12:28 +02:00
florian HENRY
278bef8767
fix customer accountancy lines ventilaled bad href link
2016-09-20 16:48:32 +02:00
aspangaro
37c7d49537
Presentation of fiscal year
2016-09-06 22:42:15 +02:00
Laurent Destailleur
64ab02234b
Fix not return in a constructor
2016-08-31 20:03:54 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +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
florian HENRY
e9962bb887
fix export
2016-08-10 17:22:58 +02:00
aspangaro
43ffb061ef
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
2016-08-10 08:07:27 +02:00
florian HENRY
beadb19fea
fix list
2016-08-08 15:31:06 +02:00
florian HENRY
95a66e7e63
Work on accoutancy PgSQL comptatiblity and other stuff
2016-08-08 14:52:19 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +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
Laurent Destailleur
36641533cb
Merge pull request #5437 from Oeris/oeris-bookkeeping
...
NEW|Display bookkeeping by accounting account
2016-07-14 23:10:03 +02:00
Neil Orley
8a8771534f
Indentation dolibarr style
2016-07-11 10:24:06 +02:00
Neil Orley
348a95604e
Trailling white space removed on all lines
2016-07-08 15:15:55 +02:00
BENKE Charlie
8a5a5a9899
Add : new param accounting export
...
We keep the old export format with no date
2016-07-07 11:48:22 +02:00
Neil Orley
59d96fdc07
ut8_encode() removed from balance.php and listbyaccount.php
2016-07-07 09:52:59 +02:00
Laurent Destailleur
f39558ebb0
Fix ĉonf not defined
2016-07-06 11:24:51 +02:00
Laurent Destailleur
0af555126c
Fix PHPCS
2016-07-06 11:23:32 +02:00
Scrutinizer Auto-Fixer
a8b1699abb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-07-02 18:26:31 +00:00
Neil Orley
14deae77b7
NEW|Display bookkeeping by accounting account
...
- Bookkeeping ordered by accounting account
- Link with customers and suppliers invoices
- Sub Total by accounting account
- Ability to display more than 25 lines and filter by customer/supplier, invoice and accounting account
2016-07-01 11:36:33 +02:00
Neil Orley
0cab1a16d9
NEW|Display bookkeeping by accounting account
...
- Bookkeeping ordered by accounting account
- Link with customers and suppliers invoices
- Sub Total by accounting account
- Ability to display more than 25 lines and filter by customer/supplier, invoice and accounting account
2016-07-01 11:21:55 +02:00
florian HENRY
34fddbf3bc
addd export cogilog
2016-06-29 17:30:47 +02:00
florian HENRY
9b044ec5ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_compta
2016-06-29 16:55:59 +02:00
florian HENRY
ea3e851ec0
Fix stuff in accoutancy
2016-06-29 16:54:37 +02:00
Laurent Destailleur
8bcd2e581f
Fix of bugs reported by scrutinizer
2016-06-29 11:20:48 +02:00
florian HENRY
dfc4f3e7fe
on going accountacy working
2016-06-29 11:06:02 +02:00
Laurent Destailleur
d0f03d9ff6
Merge pull request #5376 from atm-florian/develop
...
FIX php warning method declaration
2016-06-23 10:02:13 +02:00
Laurent Destailleur
00749b2a65
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/imports/import.php
htdocs/includes/odtphp/odf.php
htdocs/product/stock/product.php
htdocs/projet/list.php
2016-06-22 20:22:22 +02:00
florian HENRY
dfba0638ab
continue accoutancy and PG SQL compatibility
2016-06-22 11:28:21 +02:00
florian HENRY
93417a08b3
FIX : Add comment because accoutancy cannot work with PgSQL
2016-06-17 13:49:44 +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
Frédéric FRANCE
5234e8fc8f
Update index.php
2016-06-14 15:32:55 +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
florian HENRY
cb1192aba5
check spelling
2016-05-17 09:03:27 +02:00
florian HENRY
67da7ab945
d
2016-05-17 08:50:54 +02:00
florian HENRY
5d4db68b87
fix travis
2016-05-16 17:07:36 +02:00
florian HENRY
f8ac6c96e0
fix accountancy export
2016-05-16 17:05:34 +02:00
florian HENRY
b8d452596c
Fix : Advanced Accountancy module
2016-05-16 16:37:07 +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
aspangaro
d0b2068ab1
FIX: Accountancy - Upgrade Cegid Bank export
2016-04-24 14:41:14 +02:00
aspangaro
f5c1406beb
FIX: Accountancy - Fix on bank journal to support subcription
2016-04-24 06:10:15 +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
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +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
Laurent Destailleur
30f7d4cd52
Merge pull request #5027 from marcosgdf/refactor-option
...
Refactored Form classes to use Form::selectarray instead of HTML code
2016-04-21 01:15:59 +02:00
aspangaro
19b594ee9d
Correct travis
2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056
NEW: Accountancy - Add Result page
...
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
3722fc1014
Refactored FormVentilation class
2016-04-16 20:16:38 +02:00
Laurent Destailleur
83644dcb93
Fix errors reported by scrutinizer
2016-04-09 15:38:15 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00:00
Juanjo Menent
2388887e99
Merge pull request #4938 from aspangaro/4.0-p15
...
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 17:38:02 +02:00
aspangaro
e79c6c1439
Correct travis error
2016-04-03 17:09:22 +02:00
Juanjo Menent
ba1c029723
Merge pull request #4904 from aspangaro/4.0-p10
...
FIX: Accountancy Add informations to show in journal & correct problems to export in bookkee…
2016-04-03 16:16:30 +02:00
aspangaro
f8bc456807
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 15:32:46 +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
f6f7dc8e86
Try to correct travis II
2016-03-30 05:41:44 +02:00
aspangaro
29c4971d5a
Try to correct travis
2016-03-29 21:14:19 +02:00
aspangaro
e43043edcb
Merge remote-tracking branch 'Upstream/develop' into 4.0-p10
2016-03-29 21:02:46 +02:00
aspangaro
1f31163e5e
Correct travis
2016-03-28 21:36:57 +02:00
aspangaro
a1d95e11ed
Correct table
2016-03-28 21:33:49 +02:00
aspangaro
a67b9afb6c
FIX: Add informations to show & correct problems to export in bookkeeping
2016-03-28 21:31:23 +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
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
aspangaro
3dc991974c
FIX: Accountancy Bank journal Fix some problem with other module
2016-03-25 15:57:46 +01: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
aspangaro
8aed039ad3
FIX: Accountancy Bank journal Fix some problem with other module
2016-03-22 22:32:02 +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
72b9b9876f
travis
2016-03-15 10:15:45 +01:00
Florian HENRY
6fd218c9aa
accoutancy
2016-03-15 09:01:02 +01:00
Florian HENRY
c380faacce
Accountancy
2016-03-15 08:58:53 +01:00
Laurent Destailleur
543f5cef63
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
f345ff7300
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-13 01:11:42 +01:00
Laurent Destailleur
1b30c1adb4
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-12 20:49:38 +01:00
Florian HENRY
d7065751a1
fix error messages
2016-03-11 17:18:25 +01:00
Florian HENRY
33c5658209
fix error return
2016-03-11 17:17:06 +01:00
Florian HENRY
bb06356afb
qs
2016-03-10 11:43:07 +01:00
Florian HENRY
e40de3ce28
fix accoutancy
2016-03-10 11:39:26 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
aspangaro
ae472b932c
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-04 20:45:47 +01:00
Laurent Destailleur
4ea00fe1c5
Merge pull request #4725 from aspangaro/3.9-p15
...
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
2016-03-04 15:31:25 +01:00
aspangaro
8536841ada
Fix: 3.9rc2 Show accountancy account ventilated instead of the orwid of the account.
2016-03-04 10:27:34 +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
0136a1742e
Spaces !!!
2016-02-27 16:21:59 +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
aspangaro
c907cd139c
Lot of corrections
2016-02-27 08:15:58 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Florian HENRY
4401995540
Accountancy feature
2016-02-09 19:22:52 +01:00
Florian HENRY
44e39519b0
add accountancy balance
2016-02-09 19:20:03 +01:00
Florian HENRY
05d7b14786
Accoutancy
2016-02-09 19:11:19 +01:00
Florian HENRY
61dc17f280
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-09 19:07:04 +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
Florian HENRY
2991084061
fx accountancy
2016-02-08 10:50:40 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
3a5846ea7f
Fix bad link to bank account
2016-02-07 14:45:49 +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
c1f084b448
Fix accountancy
2016-02-02 11:11:08 +01:00
Florian HENRY
eb7b71e3ab
Fix accountancy
2016-02-02 11:10:38 +01:00
Florian HENRY
2887eb8c70
fix accountancy
2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac
Fix journal
2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7
Fix accountancy
2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff
Fix tuff into accountancy
2016-02-01 15:08:01 +01:00
Florian HENRY
fb5aba6de2
Accountancy
2016-02-01 15:07:12 +01:00
Florian HENRY
65162ae8e9
Accountancy modules
2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79
Format code
2016-02-01 14:50:25 +01:00
Florian HENRY
7d374c2b02
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/core/class/link.class.php
2016-01-30 17:32:01 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
c4d8c20abb
Fix missing include
2016-01-30 14:32:20 +01:00
Laurent Destailleur
c6a6889d79
Merge pull request #4389 from aspangaro/3.9-p6
...
Fix: Some problems presentation on accountancy module
2016-01-30 13:04:22 +01:00
bobby
87284ef9be
accoutancy module enhancement
2016-01-28 13:37:09 +01:00
bobby
6aa6c067fb
fix travis
2016-01-28 13:24:38 +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
bobby
c286c4c6ec
Accoutancy update
2016-01-25 12:39:21 +01:00
bobby
50d2665b0e
Fix travis
2016-01-23 19:42:40 +01:00
bobby
71a46567ac
DEV : Accounting module
2016-01-15 10:44:16 +01:00
bobby
19bec6b0b3
Manual merge from 3.8 backported
2016-01-14 18:24:02 +01:00
aspangaro
cf6be40922
New: #3292 Make sure each and every page displays a title
2016-01-11 22:03:26 +01:00
aspangaro
a88773cb81
Fix: Some problems presentation on accountancy module
2016-01-10 15:44:14 +01:00
Juanjo Menent
c7ae943e57
Merge pull request #4311 from FHenry/develop
...
NEW : if nb total of lines provided in print barre_liste, display beside title
2016-01-09 17:52:05 +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
Juanjo Menent
095ee47724
Merge pull request #4268 from aspangaro/develop-a7
...
Accountancy Review page to init accountancy on product/service
2016-01-09 17:45:42 +01:00
Juanjo Menent
2bb2f22955
Merge pull request #4252 from aspangaro/develop-a4
...
Accountancy Add a list to select accounting account on product card
2016-01-09 17:41:43 +01:00
aspangaro
2c1ff3ca47
Merge remote-tracking branch 'Upstream/develop' into develop-a7
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2015-12-31 06:07:08 +01:00
bobby
46532ccb55
FIX/NEW : Accountancy
2015-12-28 11:08:14 +01:00
aspangaro
6114606c11
Accountancy Add a list to select accounting account on accoutancy admin
2015-12-26 06:26:18 +01:00
Florian HENRY
9441d98890
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-23 14:01:16 +01:00
aspangaro
61208537d8
Merge remote-tracking branch 'Upstream/develop' into develop-a4
2015-12-22 07:13:56 +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
Florian HENRY
8006baf592
ry
2015-12-21 13:09:22 +01:00
aspangaro
c7b25ec497
Review page init accountancy
2015-12-21 06:51:46 +01:00
aspangaro
51640c19bb
Merge remote-tracking branch 'Upstream/develop' into develop-a4
...
Conflicts:
htdocs/product/card.php
2015-12-19 05:43:22 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
aspangaro
85f87d45df
Add select account in product card
2015-12-17 12:57:08 +01:00
aspangaro
c34e698d59
Merge remote-tracking branch 'Upstream/develop' into develop-a4
2015-12-17 06:17:32 +01:00
aspangaro
b064d1106b
Accountancy Add a list to select accounting account on product card
2015-12-17 06:16:29 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
aspangaro
dfbc2814e7
Fix: Add an empty field for list of parent account - This value can be null
2015-12-15 21:10:53 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
1a58624775
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-11 17:05:38 +01:00
philippe grand
9b0dd8159e
[Qual] Close database handler should be after Footer
2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6
work on accounting
2015-12-11 11:46:22 +01:00
Florian HENRY
b80518efb4
fix travis
2015-12-09 14:26:04 +01:00
Florian HENRY
96a95d6ae1
Debug accountancy on 3.9
2015-12-09 12:55:08 +01:00
Florian HENRY
ea1a81f5f4
FIX : Comptability when multiple account charts
2015-12-09 11:53:38 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
aspangaro
b1122b55d4
Fix : accountancy code on finance journal is not a constant
2015-11-30 21:07:27 +01:00
aspangaro
37da315af6
Remove old code
2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681
Correct button 'Export' and 'Write bookkeeping' on finance journal
2015-11-26 06:19:24 +01:00
aspangaro
0899e7392b
Fix: typo on finance journal
2015-11-22 22:11:22 +01:00
aspangaro
06f752b250
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
2015-11-16 06:50:04 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
b3be7f65cd
Fix syntax error . = instead of .=
2015-11-13 11:12:49 +01:00
aspangaro
f0a3bca4c2
Fix: Accountancy compatibility with subtotal & jalon module
2015-11-08 04:22:49 +01:00
aspangaro
337643e53e
Accountancy : Correct errors of display in bank journal
2015-11-04 22:31:24 +01:00
Laurent Destailleur
7d8fab73e1
Merge pull request #3792 from grandoc/develop
...
[Qual] Uniformize code
2015-10-26 23:03:30 +01:00
Philippe Grand
8fffdae1fb
Update index.php
2015-10-23 19:01:50 +02:00
philippe grand
3767ab437e
[Qual] Uniformize code
2015-10-23 12:58:30 +02:00
Laurent Destailleur
a5912d1909
Merge pull request #3778 from grandoc/develop
...
[Qual] Uniformize code
2015-10-22 10:39:55 +02:00
Jean-Pierre Morfin
6f37fef05e
fix test against empty amount on book update
...
- amount < 1 was considered as 0
- 0.00 was not considered as empty so $book->sens was always C
2015-10-20 14:44:20 +02:00
philippe grand
72491db6b4
[Qual] Uniformize code
2015-10-20 09:31:33 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
aspangaro
f8ade01f0e
New : Add payment donation in accountancy expert
2015-10-07 21:48:46 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
1ad2aeaf2a
Removed baf cut and paste
2015-09-10 01:28:39 +02:00
Laurent Destailleur
a4d0e50175
Merge pull request #3489 from AlainRnet/patch-1
...
Update lines.php
2015-09-10 01:23:13 +02:00
Laurent Destailleur
7fd01d4aa3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-09 12:45:22 +02:00
aspangaro
393d528be7
Merge remote-tracking branch 'Upstream/develop' into develop-64
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-08 21:17:54 +02:00
aspangaro
710e9327bf
Update works
2015-09-07 21:42:12 +02:00
aspangaro
671018c5cc
New Accountancy Uniformize code & rename a constant
2015-09-06 21:53:28 +02:00
aspangaro
a4a72d64c0
New: Accountancy Add message when general ledger is witten
2015-09-06 06:43:40 +02:00
aspangaro
b268ccf064
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
2015-09-06 04:52:03 +02:00
aspangaro
ef7df3f261
New: Accountancy rename llx_accountingaccount in llx_accounting_account
...
Fix: language key
2015-09-05 08:03:06 +02:00
AlainRnet
587a193a4d
Update lines.php
...
- pagination
- prise en compte des filtres lors d'un changement de page
2015-09-03 16:03:04 +02:00
Laurent Destailleur
ce2e5e7862
Little debug of accounting module
2015-09-03 11:54:03 +02:00
Florian HENRY
a916b75ad8
FIX : Better const usage in accountancy module
2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4
Fix TYPE_SITUATION on sell journals
2015-08-13 11:23:27 +02:00
Florian HENRY
6806e2b36b
FIX : Accountancy expert module filter on column must not launch ventil
...
ventil
2015-08-13 10:27:35 +02:00
Laurent Destailleur
418a609b73
Fix PHPCS
2015-08-13 03:06:25 +02:00
Florian HENRY
17146fdef7
fix stuff
2015-08-12 16:11:00 +02:00
Florian HENRY
adccd5d04f
fix some feature on accountancy modules
2015-08-12 15:53:17 +02:00
Florian HENRY
f2c59405d4
Merge branch 'develop' into develop_darkjeff
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
2015-08-12 14:23:51 +02:00
Darkjeff
2500e26072
update product account
...
clean sql if buy or sell
2015-08-10 10:29:05 +02:00
Darkjeff
b185cfb85f
Update product account
...
choose between code sell or code buy
cleaning code
need some tests
2015-08-06 21:23:02 +02:00
Darkjeff
977b12fac0
clean code customer and supplier accountancy
...
celan code add VAT research
2015-07-28 19:26:46 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
eec1f4dcdf
Merge pull request #3267 from Dolibarr/3.8
...
fix user role and uk_user_api_key if api module not enabled
2015-07-18 23:51:51 +02:00
aspangaro
b9b6abd7a8
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-18 05:29:57 +02:00
aspangaro
7b1976040d
Error
2015-07-17 05:26:32 +02:00
aspangaro
5ce419922d
Fix : #3253 #3252 #3251 Remove print_r
2015-07-17 05:22:29 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Darkjeff
fbf9e6b4b8
Clean Customer list
...
Clean code
Add VAT research
If red line no case check
Remove comments
2015-07-14 10:06:44 +02:00
Juanjo Menent
f9757bf072
Merge pull request #3176 from aspangaro/develop-patch55
...
Fix #3166 : An accounting account can be alphanumeric (Need for EBP)
2015-07-09 09:45:59 +02:00
aspangaro
600354e057
Update formventilation with elarifr modification
2015-07-09 07:48:09 +02:00
aspangaro
9fdc2991c7
Correct
2015-07-09 07:47:31 +02:00
aspangaro
0b19f2e068
Update list.php with elarifr modification
2015-07-09 07:46:58 +02:00
aspangaro
d286c18148
Update lines.php with elarifr modification
2015-07-09 07:11:08 +02:00
aspangaro
dbb5d3d386
Fix #3166 : An accounting account can be alphanumeric (Need for EBP)
2015-07-08 21:47:45 +02:00
aspangaro
a283d0ce93
Update from elarifr
2015-07-08 07:46:26 +02:00
aspangaro
4c72567c6b
Update bookkeeping
2015-07-08 07:19:23 +02:00
aspangaro
787d2310c1
Correct language key
2015-07-07 05:57:35 +02:00
aspangaro
fc3995c0be
Accountancy: Bank journal - Show user on salary payment & user new account to pay vat
2015-07-04 16:39:52 +02:00
Laurent Destailleur
97524687c7
Merge pull request #3113 from aspangaro/develop-patch44
...
Add getNomUrl on accounting for an account
2015-07-04 03:40:30 +02:00
aspangaro
a762910f11
Add getNomUrl on accounting for account
2015-06-29 21:16:30 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Juanjo Menent
0f6aaf1461
Merge pull request #3094 from aspangaro/develop-patch41
...
Accounting - Add field to edit in admin
2015-06-25 20:42:37 +02:00
aspangaro
e20da5511d
Accounting - Add field to edit in admin
2015-06-25 06:54:19 +02:00
aspangaro
452733263d
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
2015-06-25 06:37:26 +02:00
aspangaro
2ab454e757
Presentation
2015-06-21 14:32:00 +02:00
aspangaro
0f450edfcd
Debug
2015-06-21 08:32:37 +02:00
aspangaro
0934860ce5
Accountancy list: Use print_liste_field_titre
2015-06-21 08:26:42 +02:00
Laurent Destailleur
694481ae5e
Merge pull request #3071 from aspangaro/develop-patch35
...
Review accountancy
2015-06-19 11:29:01 +02:00
aspangaro
ceaa71649c
Review customer list ventilation page
2015-06-19 06:56:21 +02:00
aspangaro
14ad53848d
Remove $linkback, lang & html
2015-06-19 06:32:51 +02:00
aspangaro
d959c552f2
Fix: Accountancy - SQL error
2015-06-19 06:01:42 +02:00
Laurent Destailleur
4e5ed08ff8
Clean code
2015-06-12 13:21:21 +02:00
aspangaro
27c0b84a13
Typo on search
2015-05-29 06:54:16 +02:00
aspangaro
fd988ab1f3
Review card of supplier/customer ventilation
2015-05-29 06:43:40 +02:00
aspangaro
47045e0746
Accountancy: Review presentation
2015-05-28 21:34:35 +02:00
aspangaro
58e942681d
NEW Forms are using the tab look, even in creation mode
2015-05-20 07:03:17 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
aspangaro
10a895f1bd
Accountancy: add a button to purge search criteria on list
2015-05-05 22:36:48 +02:00
aspangaro
1174c67b07
Accountancy - Add key language & prepare journal for expense report
2015-05-02 06:42:06 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
BENKE Charles
e7ed8ce95b
Update purchasesjournal.php
2015-03-11 10:23:33 +01:00
BENKE Charles
9fc83ca011
Update sellsjournal.php
2015-03-11 10:23:13 +01:00
BENKE Charles
f91127c92a
Update purchasesjournal.php
2015-03-10 21:48:47 +01:00
BENKE Charles
bf86693dcb
Update sellsjournal.php
2015-03-10 21:47:39 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
aspangaro
4ba095cb5c
FIXED: Bankjournal is generated from id_account now
2015-02-22 15:04:18 +01:00
aspangaro
cda6e7adf9
Delete cash journal
2015-02-22 14:20:42 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
271bcb5313
Merge pull request #2354 from aspangaro/3.7-patch2
...
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
2015-02-18 23:27:47 +01:00
aspangaro
ebdb96b18c
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
2015-02-13 06:20:08 +01:00
Marcos García de La Fuente
0d150b1d32
Removed unused code, misc corrections and corrected PHPDoc problems.
2015-02-10 10:25:59 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
aspangaro
14a078c9a7
FIXED Accountancy clean code
2015-02-03 06:39:44 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
aspangaro
68764ccea3
Debug
2015-01-25 15:35:34 +01:00
aspangaro
94a9d0159d
Align module with 3.7 & contrary
2015-01-25 15:24:16 +01:00
aspangaro
ae11ab12f6
FIXED Accounting module - Align core & module 3.6
2015-01-25 06:54:17 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
Marcos García de La Fuente
be3527abd1
Fixed some errors of Bookkeeping class
2015-01-18 03:23:00 +01:00
Laurent Destailleur
1664b89cef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 19:26:19 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Philippe GRAND
3d510ef346
closing tag twice
2014-12-15 11:19:14 +01:00
Philippe GRAND
fedd05cbcc
button should be within form
2014-12-15 11:05:47 +01:00
Laurent Destailleur
c3734b1a88
Merge pull request #2103 from grandoc/develop
...
add default payment mode select
2014-12-08 00:03:05 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
3de0702f2b
Fixed: All sql requests are now logged
2014-12-04 01:29:01 +01:00
Philippe GRAND
e18196eac6
to avoid undefined method
2014-12-01 16:50:27 +01:00
Philippe GRAND
d7dcd153f0
missing close form
2014-12-01 12:21:54 +01:00
Philippe GRAND
b33612d231
close form should be outside button
2014-12-01 12:09:05 +01:00
Philippe GRAND
9118ef7c8f
form should be outside table and close form was twice
2014-12-01 12:03:23 +01:00
Philippe GRAND
cef835cd2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2014-12-01 11:27:46 +01:00
Philippe GRAND
d156e1ba82
form should be outside table
2014-11-28 12:51:08 +01:00
Philippe GRAND
15311fb643
form should not be inside table
2014-11-28 12:41:53 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Frédéric FRANCE
199239ac8b
Update /accountancy/bookeeping/list.php
2014-11-23 17:44:53 +01:00
Frédéric FRANCE
b6824877e5
Update /accountancy/admin/account.php
2014-11-23 17:44:49 +01:00
Frédéric FRANCE
e1addea6db
Update /accountancy/bookeeping/list.php
2014-11-23 09:59:05 +01:00
Frédéric FRANCE
5f11354547
Update /accountancy/admin/account.php
2014-11-23 09:58:19 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
31f987706c
Fix: bugs reported by scrutinizer
2014-11-17 15:13:23 +01:00
Laurent Destailleur
8d4fc263c5
Fix: Var not defined
2014-11-16 18:37:09 +01:00
Laurent Destailleur
ad661256c0
Fix: Bugs reported by scrutinizer
2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
aspangaro
4951feeb8f
Correct rights & presentation
2014-11-01 07:59:52 +01:00
aspangaro
e43de8b815
Update module accounting
2014-10-31 07:37:59 +01:00
Laurent Destailleur
13090ed778
Merge pull request #1944 from aspangaro/develop-accounting
...
Fix :: Button on/off for account in chart of accounts
2014-10-12 01:38:40 +02:00
Marcos García de La Fuente
f7a44347cb
Lowecased booleans to fit with PSR-2 specification.
2014-10-12 00:23:19 +02:00
aspangaro
b8a40a1b32
Presentation
2014-10-08 06:24:46 +02:00
aspangaro
95dc569fe2
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-10-07 20:51:59 +02:00
aspangaro
e8ac6567b7
Fix :: Button on/off for account in chart of accounts
2014-10-07 20:50:57 +02:00
Juanjo Menent
75eb61702e
Fix: Showing accounting account fails
2014-10-07 12:46:05 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
cb302c16e7
Bad place of code
2014-09-29 16:22:00 +02:00
Laurent Destailleur
d0da5ef047
Merge pull request #1910 from FHenry/develop
...
Better accountancy auto find accountancy code feature (work with several
2014-09-22 23:48:32 +02:00
aspangaro
1bcc2c92a3
compta_mode -> accounting_mode
2014-09-21 20:42:46 +02:00
aspangaro
e147259e95
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6
2014-09-21 20:30:55 +02:00
Florian HENRY
7aecce526a
Better accountancy auto find accountacty code feature (work with several
...
accountacy plan)
2014-09-20 09:11:50 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
Juanjo Menent
cbe64bf09d
Trad: Replace ACCOUNTINGEX by ACCOUNTING
2014-09-19 16:19:38 +02:00
Juanjo Menent
f426b9dcd2
Minor accountancy updates
2014-09-19 15:04:36 +02:00
Raphaël Doursenaud
e87b1d68b6
FIX: Replaced deprecated property
2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
a7964c4a9a
FIX: Replaced deprecated call
2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
eea9a76589
FIX: Variable might not be traversable
2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
cc68966d72
FIX: Missing declaration
2014-09-19 03:05:20 +02:00
Raphaël Doursenaud
9a141215bb
FIX: Moved code to where the variable is defined
2014-09-19 03:05:20 +02:00
Raphaël Doursenaud
64da1b1dc0
FIX: Removed HTML file preventing PHP service
2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
b1ad7af527
FIX: Missing extends
2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
7b300b0a9d
FIX: Missing variable declaration
2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
bab1dd13e2
FIX: missing extends
2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
d0f83141fb
FIX: Bad variable usage
2014-09-19 03:05:19 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
9da597d56e
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-18 20:18:56 +02:00
