Laurent Destailleur
|
c187b41714
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-29 13:10:39 +01:00 |
|
Laurent Destailleur
|
ee4a827627
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/list.php
htdocs/core/db/DoliDB.class.php
|
2020-10-29 13:10:10 +01:00 |
|
Laurent Destailleur
|
2a386b6fea
|
Fix set subledger account
|
2020-10-29 11:13:18 +01:00 |
|
Laurent Destailleur
|
91cf5de54d
|
Fix bad sort order
|
2020-10-29 11:06:18 +01:00 |
|
Laurent Destailleur
|
b1b7a7c725
|
Fix missing transaction
|
2020-10-29 10:40:50 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
6fa174d13f
|
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
|
2020-10-25 14:56:08 +01:00 |
|
Laurent De Coninck
|
1d62834b2c
|
use the second version for default bank account
|
2020-10-24 17:15:48 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent De Coninck
|
d2e2cad028
|
select by default, remove the show empty everywhere the field is required
|
2020-10-17 21:15:52 +02:00 |
|
Alexandre SPANGARO
|
973502bb1e
|
Fix
|
2020-10-07 09:36:29 +02:00 |
|
Alexandre SPANGARO
|
503f190fd4
|
Fix
|
2020-10-06 14:39:10 +02:00 |
|
Alexandre SPANGARO
|
050a4770d3
|
WIP NEW Add clone functionality on miscellaneous payment
|
2020-10-06 10:04:15 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Tobias Sekan
|
a72519f353
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-23 09:09:42 +02:00 |
|
Laurent Destailleur
|
6c06d2f0aa
|
Look and feel v13
|
2020-09-22 15:26:29 +02:00 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Tobias Sekan
|
b2a953ed5b
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-18 12:21:41 +02:00 |
|
Sekan, Tobias
|
ae8c302c19
|
merge variable declaration
|
2020-09-18 10:52:17 +02:00 |
|
Sekan, Tobias
|
dc4250aed7
|
Make button visiblity identical on most lists
|
2020-09-18 10:46:23 +02:00 |
|
Sekan, Tobias
|
1b04ef8aad
|
Add function to all list that support $socid
|
2020-09-18 10:36:40 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +02:00 |
|
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
|
73915d51c8
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-14 02:30:04 +00:00 |
|
Laurent Destailleur
|
22edd650d3
|
Fix phpcs
|
2020-09-14 04:24:35 +02:00 |
|
Sekan, Tobias
|
25d6af2b86
|
Add global search for misc payments +TODO
|
2020-09-11 09:55:34 +02:00 |
|
Sekan, Tobias
|
849a5ed865
|
Merge branch 'SelectableColumnsOnExtraPayments' of https://github.com/TobiasSekan/dolibarr into SelectableColumnsOnExtraPayments
|
2020-09-09 13:27:47 +02:00 |
|
Sekan, Tobias
|
8fa001d98d
|
Fix to short summary line
|
2020-09-09 13:27:41 +02:00 |
|
stickler-ci
|
32d77cc143
|
Fixing style errors.
|
2020-09-09 09:46:46 +00:00 |
|
Sekan, Tobias
|
870443a099
|
Add selectable columns for extra payments
|
2020-09-09 11:34:47 +02:00 |
|
Laurent Destailleur
|
5ea47f3ade
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
|
2020-07-08 18:11:58 +02:00 |
|
Laurent Destailleur
|
9b1163cfb8
|
Fix menu organisation.
|
2020-07-06 11:52:28 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
f5688b2eec
|
add new rule
|
2020-05-21 01:52:25 +02:00 |
|
Laurent Destailleur
|
cadb52c5b3
|
Look and feel v12
|
2020-04-20 19:39:34 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Laurent Destailleur
|
98f370034a
|
Look and feel v12
|
2020-04-20 14:53:17 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Laurent Destailleur
|
178dd518cf
|
Merge branch 'develop' into scrutinizer-patch-5
|
2020-01-18 19:36:36 +01:00 |
|
Scrutinizer Auto-Fixer
|
8744f6ab7b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-18 15:17:07 +00:00 |
|
Laurent Destailleur
|
73d56358e1
|
Fix bad param
|
2020-01-18 16:13:10 +01:00 |
|
Laurent Destailleur
|
4e4a810484
|
Merge pull request #12368 from aspangaro/11.0_a5
NEW Various payment list - Add search date start & date end & subledger account
|
2020-01-15 17:51:59 +01:00 |
|
Laurent Destailleur
|
9ebdd82edb
|
Fix We must refuse to delete a various payment if payment was dispatched
in accountancy.
|
2020-01-10 02:43:24 +01:00 |
|
Laurent Destailleur
|
675ce3b32f
|
Fix sql error on update of subledger account on a various payment
Fix warning message that was not accurate
|
2020-01-10 02:20:08 +01:00 |
|
Laurent Destailleur
|
8202a67e4e
|
Fix look and feel v11
|
2019-12-25 23:15:56 +01:00 |
|
Alexandre SPANGARO
|
ab0f77b467
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
|
2019-12-23 21:15:17 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Frédéric FRANCE
|
9357bfd98e
|
doxygen
|
2019-12-12 08:17:14 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
Alexandre SPANGARO
|
0f6de0049c
|
Fix
|
2019-11-26 21:17:22 +01:00 |
|
Alexandre SPANGARO
|
d910b05a38
|
Look & Feel v11
|
2019-11-26 20:28:24 +01:00 |
|
Laurent Destailleur
|
f9092b1b8e
|
Fix responsive
|
2019-11-20 13:22:40 +01:00 |
|
Alexandre SPANGARO
|
1e2fd1f25a
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
|
2019-11-17 21:55:25 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Laurent Destailleur
|
2ccef4e469
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
|
2019-11-11 19:10:35 +01:00 |
|
Laurent Destailleur
|
5a4a421a8e
|
FIX #12372
|
2019-11-07 13:07:40 +01:00 |
|
Alexandre SPANGARO
|
b85dc0c5e5
|
NEW Various payment list - Add search date start & date end & subledger_account
|
2019-11-07 09:19:48 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
79825e2193
|
start clean indent in compta directory
|
2019-10-26 14:42:25 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
76691925a4
|
FIX Missing div for buttons in tax, loan, various payment modules
|
2019-08-26 15:35:20 +02:00 |
|
Laurent Destailleur
|
d47cf87c00
|
Look and feel v10
|
2019-06-20 17:59:28 +02:00 |
|
Laurent Destailleur
|
bc030561ac
|
Debug various payment
|
2019-05-29 13:48:00 +02:00 |
|
Laurent Destailleur
|
280a034199
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-05-29 13:15:57 +02:00 |
|
Laurent Destailleur
|
cafb3840b7
|
Fix look and feel v10
|
2019-05-29 12:56:11 +02:00 |
|
Laurent Destailleur
|
6a84dfe29e
|
Update card.php
|
2019-05-29 12:34:54 +02:00 |
|
Alexandre SPANGARO
|
19b275f2d1
|
Fix bankline cat with various payment
|
2019-05-26 22:33:35 +02:00 |
|
Alexandre SPANGARO
|
ea13657617
|
Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2
|
2019-05-26 14:23:47 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Alexandre SPANGARO
|
9210a39f6a
|
Merge branch 'develop' into 10.0_accountancy2
|
2019-04-24 21:49:41 +02:00 |
|
Laurent Destailleur
|
6da42941a8
|
NEW Add attached document on bank account visible in automatic ECM.
|
2019-04-21 19:54:30 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Alexandre SPANGARO
|
ad485b55b6
|
NEW: Add category to bank transaction in various payment
|
2019-03-10 20:01:39 +01:00 |
|
Frédéric FRANCE
|
4f341ea022
|
replace html code by html5
|
2019-02-23 22:56:38 +01:00 |
|
Alexandre SPANGARO
|
7e60c3bf84
|
FIX: In various payment, subledger & accout may be alphanumeric
|
2019-02-12 16:27:25 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Laurent Destailleur
|
6f6a767255
|
Merge pull request #10520 from aspangaro/develop
NEW: Add subledger in various payment
|
2019-02-12 13:20:58 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Alexandre SPANGARO
|
2ba8ae00e4
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-02-06 21:56:01 +01:00 |
|
Alexandre SPANGARO
|
a28c926f03
|
Fix
|
2019-02-06 21:43:16 +01:00 |
|
Philippe GRAND
|
b7605e233e
|
update with html5 compliant code
|
2019-02-04 13:40:00 +01:00 |
|
Alexandre SPANGARO
|
13cf3b1d7f
|
Add subledger in various payment
|
2019-02-01 15:50:12 +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
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +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 |
|