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

272 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
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