Laurent Destailleur
|
2af8b7078c
|
Fix turnover calculation was wrong. We must include only
|
2021-03-31 19:50:43 +02:00 |
|
Laurent Destailleur
|
e01b6b6789
|
FIX filter on date on invoice list
|
2021-03-31 18:39:59 +02:00 |
|
Laurent Destailleur
|
2e3af575be
|
Look and feel v14
|
2021-03-31 18:12:26 +02:00 |
|
Laurent Destailleur
|
27bc05a039
|
Debug report accountancy
|
2021-03-31 17:59:42 +02:00 |
|
Laurent Destailleur
|
32f9a04776
|
FIX Must use the server TZ for accounting report
|
2021-03-31 17:37:45 +02:00 |
|
Laurent Destailleur
|
cf57826a5e
|
Trans
|
2021-03-31 16:57:58 +02:00 |
|
Laurent Destailleur
|
f2f0e4a6fd
|
css
|
2021-03-31 16:47:36 +02:00 |
|
Laurent Destailleur
|
d5cc006250
|
Look and feel v14
|
2021-03-31 16:45:53 +02:00 |
|
Laurent Destailleur
|
8be7ffb519
|
Merge pull request #17043 from dolibit-ut/patch-198
Update card.php
|
2021-03-31 13:42:09 +02:00 |
|
Laurent Destailleur
|
7641f7258b
|
Merge pull request #17044 from aspangaro/14a27
FIX: Add a sub table to manage accountancy on product/company
|
2021-03-31 13:39:17 +02:00 |
|
Gauthier PC portable 024
|
c27c52331a
|
FIX : default value
|
2021-03-31 10:34:21 +02:00 |
|
Gauthier PC portable 024
|
19265179ca
|
FIX : last uniformizations
|
2021-03-31 10:11:51 +02:00 |
|
Alexandre SPANGARO
|
38d47c184e
|
FIX: Add a sub table to manage accountancy on product/company
|
2021-03-30 22:12:57 +02:00 |
|
UT from dolibit
|
ba84a36282
|
Update card.php
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
|
2021-03-30 22:12:13 +02:00 |
|
Laurent Destailleur
|
47e9f7c458
|
Merge pull request #17032 from atm-gauthier/fix_develop
FIX : several fix after lists uniformization
|
2021-03-30 19:20:15 +02:00 |
|
Laurent Destailleur
|
fb7cfe6c50
|
Fix sql error
|
2021-03-30 19:15:20 +02:00 |
|
Laurent Destailleur
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Laurent Destailleur
|
fae3cca494
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 17:45:15 +02:00 |
|
Gauthier PC portable 024
|
3259d70e72
|
FIX : several fix after lists uniformization
|
2021-03-30 17:23:05 +02:00 |
|
Laurent Destailleur
|
6e422d26f3
|
FIX #yogosha5746 - next step (wip)
|
2021-03-30 16:20:18 +02:00 |
|
Laurent Destailleur
|
d61f61ab45
|
Clean $_GET
|
2021-03-30 03:55:17 +02:00 |
|
Laurent Destailleur
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Laurent Destailleur
|
32bec56529
|
Using " for html is better
|
2021-03-29 23:14:42 +02:00 |
|
Laurent Destailleur
|
b702d2b534
|
Fix CSRF for more GET
|
2021-03-29 22:58:44 +02:00 |
|
Laurent Destailleur
|
0740633ec8
|
Update facture-rec.class.php
|
2021-03-29 20:42:59 +02:00 |
|
Laurent Destailleur
|
a4987c6e4f
|
Merge branch 'develop' into 14a22
|
2021-03-29 20:35:35 +02:00 |
|
Laurent Destailleur
|
5bbfe7ed19
|
Merge pull request #16930 from aspangaro/14a27
NEW: Add a sub table to manage accountancy on product/company
|
2021-03-29 20:11:02 +02:00 |
|
Laurent Destailleur
|
93627012cd
|
Merge pull request #16995 from atm-gauthier/fix_list_uniformization
FIX : display debug if !$conf->banque->enabled
|
2021-03-29 18:02:58 +02:00 |
|
Laurent Destailleur
|
f4b0723f30
|
Update list.php
|
2021-03-29 17:41:19 +02:00 |
|
Laurent Destailleur
|
b732a82c3d
|
Update list.php
|
2021-03-29 17:40:36 +02:00 |
|
stickler-ci
|
e1e3bcbf28
|
Fixing style errors.
|
2021-03-29 15:26:24 +00:00 |
|
Gauthier PC portable 024
|
139a1ba70d
|
FIX : if $conf->banque->enabled
|
2021-03-29 17:22:19 +02:00 |
|
Laurent Destailleur
|
36dfcc0646
|
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
|
2021-03-29 17:18:17 +02:00 |
|
Gauthier PC portable 024
|
28620fe8d8
|
Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization
|
2021-03-29 16:27:59 +02:00 |
|
Gauthier PC portable 024
|
53ae1f9d5b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization
|
2021-03-29 16:27:44 +02:00 |
|
stickler-ci
|
caa56729b3
|
Fixing style errors.
|
2021-03-29 14:25:36 +00:00 |
|
Gauthier PC portable 024
|
c8e40727c2
|
FIX : uniformization
|
2021-03-29 16:22:22 +02:00 |
|
Laurent Destailleur
|
5c2ee240b2
|
FIX #yogosha5752
|
2021-03-29 15:59:37 +02:00 |
|
Laurent Destailleur
|
3a4bb69c05
|
FIX #yogosha5749
|
2021-03-29 15:32:09 +02:00 |
|
Laurent Destailleur
|
ce1f8289a4
|
FIX #yogosha5746
|
2021-03-29 15:07:23 +02:00 |
|
Laurent Destailleur
|
6bc56b7671
|
Look and feel v14
|
2021-03-29 13:41:28 +02:00 |
|
Laurent Destailleur
|
b929641fe1
|
Look and feel v14
|
2021-03-29 13:00:17 +02:00 |
|
Laurent Destailleur
|
a5d84200dc
|
Clean code for invoice list
|
2021-03-28 19:22:04 +02:00 |
|
Alexandre SPANGARO
|
2a1cc04b66
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-28 06:16:33 +02:00 |
|
Alexandre SPANGARO
|
22f809c517
|
Move to _PERENTITY
|
2021-03-27 05:23:20 +01:00 |
|
Alexandre SPANGARO
|
6422b0a6c0
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-27 05:02:55 +01:00 |
|
stickler-ci
|
895c6efc14
|
Fixing style errors.
|
2021-03-26 15:26:05 +00:00 |
|
Gauthier PC portable 024
|
f553ad3fc8
|
FIX : orders columns
|
2021-03-26 16:14:00 +01:00 |
|
Gauthier PC portable 024
|
3fe1a05f26
|
FIX : employee must be after label as well as sociale charges list + social charges payments list must use INNER JOIN instead of LEFT JOIN
|
2021-03-26 10:23:44 +01:00 |
|
Gauthier PC portable 024
|
f5bf26e5d0
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization
|
2021-03-26 09:59:27 +01:00 |
|
Laurent Destailleur
|
d9108362ba
|
War against $_POST
|
2021-03-25 16:59:47 +01:00 |
|
Florian Mortgat
|
d17256bde5
|
NEW 14.0 - hook printFieldListTitle for cabyprodserv.php
|
2021-03-25 16:14:44 +01:00 |
|
Florian Mortgat
|
3c8e15a87c
|
NEW 14.0 - SQL-altering hooks in the turnover by product report
|
2021-03-25 15:12:25 +01:00 |
|
Laurent Destailleur
|
663138328e
|
Merge pull request #16962 from atm-gauthier/fix_autofill_amount_payment_salary
FIX : autofill payment salary amount + several fixes
|
2021-03-25 13:03:38 +01:00 |
|
Gauthier PC portable 024
|
014ae0a8da
|
FIX : lists uniformization
|
2021-03-25 11:59:22 +01:00 |
|
Gauthier PC portable 024
|
368bad1943
|
FIX : autofill payment salary amount + several fixes
|
2021-03-25 10:39:12 +01:00 |
|
Gauthier PC portable 024
|
155978f2d2
|
FIX : Must be a left join here to be able to see vat declarations even if no payments are done
|
2021-03-25 09:29:53 +01:00 |
|
Gauthier PC portable 024
|
a20bb3d66e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_special_expense_index
|
2021-03-25 09:15:42 +01:00 |
|
Laurent Destailleur
|
ce422f514f
|
Fix title of reports
|
2021-03-25 00:47:05 +01:00 |
|
Laurent Destailleur
|
eeba9e4d50
|
Code comment
|
2021-03-24 21:58:06 +01:00 |
|
Laurent Destailleur
|
21a9779fe2
|
FIX inconsistency in margin recording with option "Force to sale price"
|
2021-03-24 21:49:45 +01:00 |
|
Laurent Destailleur
|
047471c220
|
Remove $_POST war
|
2021-03-24 19:06:44 +01:00 |
|
Gauthier PC portable 024
|
8ffb40035f
|
FIX : old query using tva object for payments list
|
2021-03-24 17:29:16 +01:00 |
|
Laurent Destailleur
|
2d5fbfc105
|
Fix php8
|
2021-03-22 23:43:28 +01:00 |
|
Laurent Destailleur
|
146706bafa
|
Fix label
|
2021-03-22 19:11:29 +01:00 |
|
Laurent Destailleur
|
ca0a04fb61
|
Fix missing payment ref
|
2021-03-22 18:56:02 +01:00 |
|
Laurent Destailleur
|
cce4ebdb8c
|
Clean code
|
2021-03-22 18:50:47 +01:00 |
|
Laurent Destailleur
|
f405505e0f
|
Do not load each invoice of payment for tooltip
|
2021-03-22 18:34:01 +01:00 |
|
Laurent Destailleur
|
010b084444
|
Do not load each invoice of payment for tooltip
|
2021-03-22 18:32:36 +01:00 |
|
Laurent Destailleur
|
5a8d757a30
|
Add missing data
|
2021-03-22 18:23:29 +01:00 |
|
Laurent Destailleur
|
5d6fb0cfea
|
Perf: Enhance performance of VAT report
|
2021-03-22 18:11:44 +01:00 |
|
Laurent Destailleur
|
897d653144
|
Debug default date for vat reports
|
2021-03-22 16:09:18 +01:00 |
|
Laurent Destailleur
|
4ff26bd8c5
|
Removed deprecated code
|
2021-03-22 13:39:34 +01:00 |
|
Laurent Destailleur
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +01:00 |
|
Laurent Destailleur
|
6a0e0f4c06
|
Fix #ygosha5698
|
2021-03-22 12:10:51 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
stickler-ci
|
5af4b4673c
|
Fixing style errors.
|
2021-03-21 22:12:36 +00:00 |
|
Alexandre SPANGARO
|
0c2ada4299
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-21 23:08:01 +01:00 |
|
Laurent Destailleur
|
1c6585f06b
|
Fix deprecated function
|
2021-03-21 22:37:24 +01:00 |
|
Laurent Destailleur
|
eeb1c5d884
|
Replace deprecated code
|
2021-03-20 21:46:10 +01:00 |
|
Laurent Destailleur
|
f95aa9c6e1
|
Merge pull request #16612 from atm-adrien/FIX/develop_update_pencil
FIX : Update pencil
|
2021-03-20 19:54:47 +01:00 |
|
Laurent Destailleur
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Laurent Destailleur
|
d8aa5f5eab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-20 12:43:07 +01:00 |
|
Laurent Destailleur
|
3d3a7bfd37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2021-03-20 12:42:46 +01:00 |
|
Laurent Destailleur
|
7f6044c52e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
|
2021-03-20 12:18:40 +01:00 |
|
Laurent Destailleur
|
4c811d462c
|
Merge pull request #16837 from dolibit-ut/patch-129
Update document.php
|
2021-03-20 11:50:20 +01:00 |
|
Laurent Destailleur
|
668519e7f5
|
Merge pull request #16836 from dolibit-ut/patch-128
Update card.php
|
2021-03-20 11:49:57 +01:00 |
|
Laurent Destailleur
|
827a952dca
|
Merge pull request #16839 from dolibit-ut/patch-130
Update card.php
|
2021-03-20 11:49:18 +01:00 |
|
Laurent Destailleur
|
3edeb8b4aa
|
Merge pull request #16840 from dolibit-ut/patch-131
Update document.php
|
2021-03-20 11:49:06 +01:00 |
|
Laurent Destailleur
|
ba6f97acbc
|
Merge pull request #16865 from frederic34/uniformisecomment
uniformise comments to remove nested comments
|
2021-03-20 11:24:39 +01:00 |
|
Laurent Destailleur
|
11a7420b59
|
Merge pull request #16877 from frederic34/patch-27
fix doxygen
|
2021-03-20 11:12:33 +01:00 |
|
Frédéric FRANCE
|
3d3715f55d
|
fix doxygen
|
2021-03-20 10:37:51 +01:00 |
|
Frédéric FRANCE
|
81c885dbf1
|
fix doxygen
|
2021-03-20 10:36:53 +01:00 |
|
Frédéric FRANCE
|
bae1770176
|
uniformise comments to remove nested comments
|
2021-03-20 10:00:24 +01:00 |
|
Frédéric FRANCE
|
2de2f1ce4d
|
fix nested comments for doxygen
|
2021-03-20 09:02:29 +01:00 |
|
Alexandre SPANGARO
|
17d3b85ec4
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-20 07:47:54 +01:00 |
|
Alexandre SPANGARO
|
00e21caa42
|
NEW: Add a sub table to manage accountancy on product/company
|
2021-03-20 07:42:16 +01:00 |
|
Laurent Destailleur
|
ae7261c0a7
|
FIX #yogosha5677
|
2021-03-19 14:12:08 +01:00 |
|
Laurent Destailleur
|
d83d005284
|
FIX #yogosha5674
|
2021-03-19 12:44:59 +01:00 |
|
Laurent Destailleur
|
ebf409f831
|
FIX #yogosha5668
|
2021-03-19 12:08:40 +01:00 |
|