Commit Graph

1549 Commits

Author SHA1 Message Date
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 &acute -> é) 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