Laurent Destailleur
|
5cc86d2319
|
Fix #yogosha6370
|
2021-06-14 13:51:09 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
fa4786a3f6
|
Fix permission
|
2021-06-08 16:19:21 +02:00 |
|
stickler-ci
|
762378c044
|
Fixing style errors.
|
2021-04-28 11:12:01 +00:00 |
|
Gauthier PC portable 024
|
c25b044da5
|
FIX : several fixes on salary and vat
|
2021-04-28 11:56:07 +02:00 |
|
Laurent Destailleur
|
42938ffe31
|
FIX #yogosha5879
|
2021-04-24 21:15:09 +02:00 |
|
Laurent Destailleur
|
5e2bec9cad
|
Look and feel v14
|
2021-04-15 02:09:29 +02:00 |
|
Laurent Destailleur
|
e7d64d073a
|
Look and feel v14
|
2021-04-14 23:14:38 +02:00 |
|
Laurent Destailleur
|
358bb87ae2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
|
2021-04-13 20:19:05 +02:00 |
|
Alexandre SPANGARO
|
4b9bf40a8f
|
move include_once to include when it's a tpl
|
2021-04-12 21:25:58 +02:00 |
|
Laurent Destailleur
|
8a62d97b89
|
Remove one thousand of useless files
|
2021-04-12 15:57:16 +02:00 |
|
Alexandre SPANGARO
|
80995c34b5
|
FIX Write right on document
|
2021-04-12 07:13:05 +02:00 |
|
Alexandre SPANGARO
|
f64d0377c5
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-04-04 06:03:41 +02:00 |
|
Laurent Destailleur
|
231f441876
|
Look and feel v14
|
2021-04-03 02:11:16 +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 |
|
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
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Gauthier PC portable 024
|
3259d70e72
|
FIX : several fix after lists uniformization
|
2021-03-30 17:23:05 +02:00 |
|
Laurent Destailleur
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Laurent Destailleur
|
a4987c6e4f
|
Merge branch 'develop' into 14a22
|
2021-03-29 20:35:35 +02:00 |
|
Laurent Destailleur
|
f4b0723f30
|
Update list.php
|
2021-03-29 17:41:19 +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 |
|
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
|
b929641fe1
|
Look and feel v14
|
2021-03-29 13:00:17 +02:00 |
|
Alexandre SPANGARO
|
2a1cc04b66
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-28 06:16:33 +02:00 |
|
Gauthier PC portable 024
|
f553ad3fc8
|
FIX : orders columns
|
2021-03-26 16:14:00 +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 |
|
Gauthier PC portable 024
|
014ae0a8da
|
FIX : lists uniformization
|
2021-03-25 11:59:22 +01:00 |
|
Laurent Destailleur
|
047471c220
|
Remove $_POST war
|
2021-03-24 19:06:44 +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
|
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
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Alexandre SPANGARO
|
03481a0197
|
Uniformize translation
|
2021-03-16 04:22:43 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Laurent Destailleur
|
3964801d40
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2021-03-15 13:26:20 +01:00 |
|
Laurent Destailleur
|
85eaec48e1
|
Merge pull request #16307 from aspangaro/14a15
NEW: VAT report - Optimisation & collapse by rate
|
2021-03-15 11:56:06 +01:00 |
|
Laurent Destailleur
|
c2c434ab7f
|
Update quadri_detail.php
|
2021-03-15 10:59:41 +01:00 |
|
Frédéric FRANCE
|
bfd954b91e
|
fix php8 warning
|
2021-03-14 23:51:49 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Laurent Destailleur
|
c75fade649
|
Fix regression
|
2021-03-10 17:07:44 +01:00 |
|
Alexandre SPANGARO
|
b5c84bfc4f
|
Resolve some mistakes
|
2021-03-09 05:02:37 +01:00 |
|
Laurent Destailleur
|
7bd93aa3ad
|
Fix price format
|
2021-03-08 14:31:02 +01:00 |
|
Laurent Destailleur
|
8184e34de4
|
Merge pull request #16587 from ATM-Consulting/NEW/12.0_new_payments_on_vat
FIX : Rounding amount on VAT card updating
|
2021-03-08 14:29:29 +01:00 |
|
x
|
e087c6ffe0
|
FIX : Rounding amount on card updating
|
2021-03-08 11:35:59 +01:00 |
|
Alexandre SPANGARO
|
339af419bc
|
Fix strftime
|
2021-03-07 21:59:28 +01:00 |
|
stickler-ci
|
e1159f422a
|
Fixing style errors.
|
2021-03-03 13:11:01 +00:00 |
|
Alexandre SPANGARO
|
59a2fb8ed5
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-03-03 14:08:40 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Alexandre SPANGARO
|
94a861c1c8
|
Code enhanced - Standardize field name
|
2021-03-01 04:07:31 +01:00 |
|
stickler-ci
|
86c83ff72c
|
Fixing style errors.
|
2021-02-28 06:14:40 +00:00 |
|
Alexandre SPANGARO
|
ad95caac7e
|
Merge branch 'develop' into 14a15
|
2021-02-28 07:12:24 +01:00 |
|
Alexandre SPANGARO
|
6e1d67084d
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-02-28 07:09:30 +01:00 |
|
Laurent Destailleur
|
93f0754be9
|
Fix removed a bugged section (not used, was in develop mode only)
|
2021-02-26 14:33:27 +01:00 |
|
Alexandre SPANGARO
|
e177ac566c
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-02-25 05:02:03 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +01:00 |
|
Laurent Destailleur
|
2be6992916
|
Fix include_once into include for inc.php file. See comment in #16338
|
2021-02-19 16:10:19 +01:00 |
|
Florian Mortgat
|
186dcab1b7
|
Merge branch 'NEW/12.0_new_payments_on_vat' of github.com:ATM-Consulting/dolibarr into NEW/14.0_new_payments_on_vat_default_checkbox_value
|
2021-02-16 16:28:14 +01:00 |
|
Florian Mortgat
|
97052b035e
|
FIX: when form not completely filled, doesn't keep the checked state of checkbox
|
2021-02-16 16:05:19 +01:00 |
|
Florian Mortgat
|
363fe1f52f
|
NEW 12.0: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page
|
2021-02-16 15:44:24 +01:00 |
|
Alexandre SPANGARO
|
ffd60d2138
|
Merge branch '14a15' of https://github.com/aspangaro/dolibarr into 14a15
|
2021-02-16 04:53:24 +01:00 |
|
Alexandre SPANGARO
|
8ee1ec7944
|
NEW: VAT report - Optimisation & collapse by rate
|
2021-02-16 04:53:09 +01:00 |
|
stickler-ci
|
15c2dd483c
|
Fixing style errors.
|
2021-02-16 03:38:53 +00:00 |
|
Alexandre SPANGARO
|
8079105aaf
|
NEW: VAT report - Optimisation & collapse by rate
|
2021-02-16 04:28:55 +01:00 |
|
Laurent Destailleur
|
89bda722bf
|
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
|
2021-02-09 13:29:40 +01:00 |
|
Frédéric FRANCE
|
5f8b70b772
|
use camelCaps name
|
2021-02-09 09:03:29 +01:00 |
|
Frédéric FRANCE
|
1a4c627ad8
|
doxygen
|
2021-02-08 20:25:51 +01:00 |
|
Laurent Destailleur
|
d41edfc812
|
Fix responsive. Clean code
|
2021-02-08 19:52:29 +01:00 |
|
Laurent Destailleur
|
8f7c35a221
|
Enhance autofill of amount to pay for VAT
|
2021-02-08 19:35:04 +01:00 |
|
Gauthier PC portable 024
|
e2a73e6c88
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-08 09:46:48 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +01:00 |
|
Laurent Destailleur
|
29410cac6f
|
Fix phpcs
|
2021-02-02 16:22:16 +01:00 |
|
Gauthier PC portable 024
|
a9d4390a47
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-01 11:52:56 +01:00 |
|
Gauthier PC portable 024
|
509e9d597e
|
FIX : table name for VAT payments must be llx_payment_vat
|
2021-02-01 11:47:43 +01:00 |
|
Gauthier PC portable 024
|
42e28941d0
|
FIX : sql db escape missing
|
2021-01-25 10:22:31 +01:00 |
|
Gauthier PC portable 024
|
97d564afb6
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 17:21:49 +01:00 |
|
Gauthier PC portable 024
|
8b0a5d270b
|
FIX : group by
|
2021-01-19 17:18:22 +01:00 |
|
Gauthier PC portable 024
|
486102c8d1
|
Merge branch 'NEW/add_real_payments_on_vat_objects' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 13:42:50 +01:00 |
|
Gauthier PC portable 024
|
998aa8f943
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 13:40:13 +01:00 |
|
Gauthier PC portable 024
|
ae6e1db652
|
FIX : getNomUrl()
|
2021-01-19 13:32:08 +01:00 |
|
stickler-ci
|
694f65082f
|
Fixing style errors.
|
2021-01-19 11:25:45 +00:00 |
|
Gauthier PC portable 024
|
c1cd13aee3
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 12:12:58 +01:00 |
|
Gauthier PC portable 024
|
c35a13bad0
|
FIX : set paid button display test
|
2021-01-19 12:12:05 +01:00 |
|
Gauthier PC portable 024
|
b2eca0a314
|
FIX : VAT declaration list + migration script
|
2021-01-19 12:02:05 +01:00 |
|
Gauthier PC portable 024
|
e2abbbcece
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 08:57:24 +01:00 |
|