Commit Graph

128 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
b80ba1179f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/expensereport/lines.php
	htdocs/accountancy/supplier/lines.php
2020-08-21 13:19:28 +02:00
Alexandre SPANGARO
fbd4323dd8 Fix Accountancy - Show label account in page already bind 2020-08-19 06:01:10 +02:00
Laurent Destailleur
07b2053a4b Fix regression 2020-07-10 03:59:28 +02:00
Laurent Destailleur
1ed3b385fa
Update lines.php 2020-05-23 19:19:28 +02:00
Laurent Destailleur
558a441b41
Update lines.php 2020-05-23 19:18:13 +02:00
Alexandre SPANGARO
1f46c57c0b NEW Add employee in expense report binding page 2020-05-19 09:36:07 +02:00
Laurent Destailleur
dc24738f93 Group columns about thirdparty data together 2020-05-01 22:34:49 +02:00
Laurent Destailleur
16e4c25caf
Merge pull request #13761 from aspangaro/12.0_a26
NEW: Accountancy add column thirdparty on binding page
2020-05-01 22:25:49 +02:00
Laurent Destailleur
483935493c Fix look and feel 2020-04-28 18:08:26 +02:00
Alexandre SPANGARO
1f6c959b72 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:55:54 +02:00
Alexandre SPANGARO
b3efa4f793 Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-04-28 04:45:24 +02:00
Alexandre SPANGARO
31583c9b63 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:45:06 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +02:00
Laurent Destailleur
82825f143b FIX Look and feel v11 2020-03-26 01:24:05 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
f5ce0fc811 Fix seach on country 2020-01-28 17:22:26 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-17 02:00:52 +00:00
Laurent Destailleur
646587a9cf Value "None" To unbind is more visible. 2019-12-16 11:50:25 +01:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
9b1385ee86 FIX If country not defined keep value empty 2019-10-21 03:37:44 +02:00
Laurent Destailleur
3bf6fac505 NEW Can filter on label on invoice in accounting vendor binding pages 2019-10-10 22:05:34 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
94f0634492 Fix empty link 2019-07-19 21:45:11 +02:00
Alexandre SPANGARO
ec7523d3d2 Nowrap on amount 2019-06-19 09:01:37 +02:00
Laurent Destailleur
d4aa0bfa94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-12 15:42:58 +02:00
Laurent Destailleur
47610d0323 Look and feel v10 2019-06-12 15:42:48 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
ba2b07917b Fix look and feel v10 2019-06-04 02:11:03 +02:00
Alexandre SPANGARO
d4e2fab983 Replace term "Advanced accountancy" by Accountancy (Double entries) 2019-05-13 22:25:15 +02:00
Frédéric FRANCE
a836c75d70
replace html by html5 in accountancy 2019-03-03 10:31:46 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
b9dc803911
Merge pull request #10432 from grandoc/new_branch_27_01_2019
update with html5 compliant code
2019-02-01 15:50:49 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Philippe GRAND
dfd188a863 update with html5 compliant code 2019-01-27 19:08:43 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
1f3be71d8b update with html5 compliant code 2019-01-21 21:22:12 +01:00
Laurent Destailleur
8d9f6aad3f css 2018-10-10 19:20:10 +02:00
Laurent Destailleur
b13088849b CSS 2018-10-10 18:58:28 +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
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +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