Commit Graph

366 Commits

Author SHA1 Message Date
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
395d361d66 Look and feel v6 2017-05-29 11:38:23 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Alexandre SPANGARO
a086b82f84 Removed old code (Function select_pcgtype/subtype) 2017-05-25 05:40:41 +02:00
Alexandre SPANGARO
ba7e754174 Remove old code (journal) 2017-05-25 05:32:13 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
4343f93c00 Remove a lot of useless code 2017-05-13 19:36:28 +02:00
Laurent Destailleur
553f5b990c Fix scrutinizer errors 2017-05-13 18:50:55 +02:00
Laurent Destailleur
fc5f4007a1 Debug accountancy module. Page for bank journalization is still KO. 2017-05-05 16:54:05 +02:00
Laurent Destailleur
885a636351 Debug new journal list page 2017-05-05 16:35:05 +02:00
Laurent Destailleur
b7f7683e5a Merge pull request #6774 from aspangaro/6.0-multijournal
Finish to move accountancy journals list to page like dictionnary
2017-05-05 14:21:55 +02:00
Laurent Destailleur
7ec46b3bd6 Finished work to have substitution keys code mutualized. 2017-05-04 12:35:45 +02:00
Alexandre SPANGARO
6afd0d642a Finish to move accountancy journals list to page like dictionnary 2017-05-01 08:16:09 +02:00
Alexandre SPANGARO
fed1b152d9 Correct multi-journals 2017-04-30 07:41:47 +02:00
Laurent Destailleur
b87eb07b08 Look and feel v6 2017-04-27 17:51:11 +02:00
Laurent Destailleur
2f23b36ca1 Fix typo in var name picto 2017-04-27 14:20:06 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
3907c30ee3 Merge branch 'develop' of https://github.com/grandoc/dolibarr into
grandoc-develop

Conflicts:
	dev/skeletons/skeleton_list.php
2017-04-11 11:06:26 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
philippe grand
3715fcdd5f Update code using new css class 2017-04-07 14:25:33 +02:00
Laurent Destailleur
d975e7f442 Work on 6.0 look and feel 2017-04-01 12:46:47 +02:00
Alexandre SPANGARO
06c2f04927 Finish work on multijournal admin part
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Alexandre SPANGARO
fc2b9a858b New : [FP17] Add multijournals in accountancy admin 2017-03-28 06:35:03 +02:00
Laurent Destailleur
0838953ef7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-27 00:49:24 +02:00
Laurent Destailleur
278bbf184c Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Alexandre SPANGARO
6116145d8a Fix : Missing language file in accountancy configuration 2017-03-24 06:23:40 +01:00
Alexandre SPANGARO
6d5578a876 Reactivated constant BANK_DISABLE_DIRECT_INPUT 2017-03-19 20:47:30 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
16b12b33fc First step : remove BANK_DISABLE_DIRECT_INPUT 2017-03-18 07:24:55 +01:00
Laurent Destailleur
39c8f9a15a Fix country not preselected 2017-03-15 00:04:09 +01:00
Laurent Destailleur
c72e7c1057 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
fda84995e8 If manage zero is set, we must NOT set length. So we can here make a
shortcut to avoid useless code.
2017-03-10 11:50:57 +01:00
Laurent Destailleur
6cd53cb471 Merge pull request #6482 from aspangaro/5.0-27
Fix : Language & revert a description of the function
2017-03-10 11:12:42 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
4cd82fc2c2 Fix a list was filled if a record was created but we need the field
filled to create the record.
2017-03-03 18:27:14 +01:00
Laurent Destailleur
6c91cb4f90 Fix it was not possible to create/edit a new chart of account 2017-03-03 17:59:49 +01:00
Laurent Destailleur
bef5f2c236 FIX #6465 2017-03-03 15:06:17 +01:00
Alexandre SPANGARO
19ce0b0d89 Fix : Language & revert a description of the function 2017-03-03 06:22:12 +01:00
Laurent Destailleur
4804cc47bd Clean and uniformize code 2017-02-24 15:16:53 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not
admin user.
2017-02-20 11:21:38 +01:00
Laurent Destailleur
501f118f92 Fix style 2017-02-19 22:53:29 +01:00
Laurent Destailleur
d72e5a3646 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
Alexandre SPANGARO
4126dcff03 [FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed. 2017-02-08 06:51:42 +01:00