lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

375 Commits

Author SHA1 Message Date
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
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
24703b8fe7
Merge pull request #14487 from aspangaro/13a4 
NEW Add a start date to begin binding in accountancy
 2020-08-17 22:20:46 +02:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
f6c444c235 css 2020-08-17 05:03:44 +02:00
Laurent Destailleur
07b2053a4b Fix regression 2020-07-10 03:59:28 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler 
<sak1.s3curity@gmail.com>
 2020-06-15 15:08:52 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Alexandre SPANGARO
e5f8f38fbf FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon 2020-06-05 17:24:59 +02:00
Frédéric FRANCE
67b8ab13c9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 21:45:18 +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
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +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
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
c9f242406c Look and feel v12 2020-04-25 02:44:24 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +02:00
Alexandre SPANGARO
b607c83b8a Fix : Accountancy - Error on buy accountancy account suggest 2020-04-16 16:13:52 +02:00
Laurent Destailleur
a05f9fad33 FIX Look and feel v11 2020-03-26 01:25:10 +01:00
Laurent Destailleur
82825f143b FIX Look and feel v11 2020-03-26 01:24:05 +01:00
Laurent Destailleur
25b62646b6 Fix we must supplier codes 2020-03-18 20:26:28 +01:00
Laurent Destailleur
009746ab79 Invert seller and buyer 2020-03-18 19:59:18 +01:00
Laurent Destailleur
6298071f83 CSS 2020-03-18 19:55:49 +01:00
Laurent Destailleur
6e71bb8707 Look and feel v12: Use color of status for dotnuts 2020-03-14 02:17:08 +01:00
Laurent Destailleur
30bcf1d244 Uniformize code 2020-03-13 18:51:58 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Alexandre SPANGARO
fbd7dc66b2 Fix error 2020-03-03 05:06:31 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:51:32 +01:00
Laurent Destailleur
782be2ac37 FIX Invert isSellerInEEC and isBuyerInEEC 2020-01-28 17:50:08 +01:00
Laurent Destailleur
bffdc63ec6 FIX The "automatic bind" was linked EEC to export accountancy code 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:48:34 +01:00
Laurent Destailleur
e9de1e16e8 FIX The "automatic bind" was linked EEC to export accountancy code 2020-01-28 17:44:05 +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
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf Value "None" To unbind is more visible. 2019-12-16 11:50:25 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00: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
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
be3f0471ff Fix phpcs 2019-10-21 11:27:48 +02:00
Laurent Destailleur
febf9ccd04 FIX The Button "Automatic binding" did not use the account intracomm or 
export.
 2019-10-21 05:24:54 +02:00
Laurent Destailleur
776bfabfc4 FIX If country not defined keep value empty 2019-10-21 05:24:42 +02:00
Laurent Destailleur
6ebd9721da FIX The Button "Automatic binding" did not use the account intracomm or 
export.
 2019-10-21 03:50:57 +02:00
Laurent Destailleur
9b1385ee86 FIX If country not defined keep value empty 2019-10-21 03:37:44 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +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
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Laurent Destailleur
9da1d5025b FIX If product account not suggested during bind, it is not preselected 2019-10-09 03:15:29 +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
Laurent Destailleur
1053a9d955 Trans 2019-07-19 16:49:12 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Alexandre SPANGARO
ec7523d3d2 Nowrap on amount 2019-06-19 09:01:37 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +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
9fa6674e3f
Update list.php 2019-06-12 13:03:54 +02:00
Alexandre SPANGARO
b079a8ba64 Minwidth100 on amount 2019-06-11 05:03:48 +02:00
Alexandre SPANGARO
a96b10db62 Fix label country on bind list 2019-06-11 05:00:47 +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
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +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
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +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
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
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
Philippe Grand
98ebc0a667
Update index.php 2019-01-16 19:24:15 +01:00
Philippe GRAND
3168c76946 update with html5 compliant code 2019-01-16 17:39:40 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +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
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
Frédéric FRANCE
aab617aeb3
remove deprecated 2018-09-09 18:38:48 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Philippe GRAND
e755fde52a clean and update code 2018-07-23 17:35:30 +02:00
Laurent Destailleur
66f9153490 Fix css 2018-07-18 11:33:53 +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
Frédéric FRANCE
d986909109
loadlangs 2018-05-26 23:52:52 +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
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
187cc35786 Look and feel v8 2018-04-14 22:23:56 +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
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
88939a8469 FIX Draft invoice must be excluded from report 2018-03-27 11:10:12 +02:00
Laurent Destailleur
aa1ede6f74 FIX Search criteria on vat 2018-02-20 06:03:08 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
dev2a
415d7574eb Fix PHP notices adding empty($page) 2018-01-11 15:35:34 +01:00
florian HENRY
fdedd6f75b fix 7963 2018-01-08 20:54:40 +01:00
Laurent Destailleur
33032a5474 Look and feel v6 2017-11-29 18:13:22 +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
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +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
florian HENRY
bd68b94411 fix : missing hook in accountancy 2017-11-02 13:27:09 +01: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
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +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
a6a142753a Fix bad label when account not set 2017-09-08 15:24:27 +02:00
Laurent Destailleur
f29a4c1fb1 Make accountancy pages responsive 2017-09-05 20:42:34 +02:00