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
UT from dolibit
46c23807e9
Update document.php
...
$helpurl -> $help_url
2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f
Update card.php
...
$helpurl -> $help_url
2021-03-19 09:36:49 +01:00
UT from dolibit
6e6609d876
Update document.php
...
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
2021-03-19 09:33:10 +01:00
UT from dolibit
e5f8ca77a9
Update card.php
...
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
2021-03-19 09:30:28 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
3522af926a
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
...
invoice list - add new standard hooks
2021-03-18 22:58:18 +01:00
Laurent Destailleur
43494df56c
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
...
add invoice getNomUrl hook
2021-03-18 22:57:37 +01:00
Laurent Destailleur
9ba568eb25
Fix security check
2021-03-18 20:57:50 +01:00
Laurent Destailleur
461d748f97
Fix #yogosha235
2021-03-18 20:27:36 +01:00
Alexandre SPANGARO
18d247026d
NEW: Add a sub table to manage product/societe
2021-03-18 17:08:55 +01:00
Alexis LAURIER
5b72193f0d
invoice list - ajust hooks
2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5
invoice list - ajust hooks
2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614
Add group by and having hooks on invoice list
2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397
invoice list - add new standard hook
2021-03-18 16:21:54 +01:00
Laurent Destailleur
640f5f6051
FIx #yogosha5661
2021-03-18 14:41:48 +01:00
Laurent Destailleur
46972ec669
FIx #5660
2021-03-18 14:34:44 +01:00
Laurent Destailleur
d2ef4b0506
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
htdocs/opensurvey/card.php
htdocs/opensurvey/index.php
htdocs/opensurvey/results.php
2021-03-18 12:24:34 +01:00
Alexis LAURIER
b416223194
fix
2021-03-18 11:16:49 +01:00
Alexis LAURIER
c33347b461
add invoice getNomUrl hook
2021-03-18 11:10:43 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning
2021-03-17 23:55:46 +01:00
Laurent Destailleur
73e55f1b73
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-17 18:44:47 +01:00
Laurent Destailleur
0da5c89973
Look and feel v14
2021-03-17 18:24:37 +01:00
Laurent Destailleur
1f9d4eca3d
Merge pull request #16746 from frederic34/patch-8
...
fix php8 warnings
2021-03-17 17:00:22 +01:00
Laurent Destailleur
22ed95a629
Look and feel v14
2021-03-16 19:09:56 +01:00
Laurent Destailleur
26dc3ef1b0
FIX Filter on debit/credit
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
2021-03-16 18:59:28 +01:00
Laurent Destailleur
9ea7c92b1b
FIX Filter on debit/credit
2021-03-16 18:56:10 +01:00
Frédéric FRANCE
519b08b782
fix php8 warnings
2021-03-16 18:25:25 +01:00
Laurent Destailleur
e366d2c379
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
2021-03-16 14:50:06 +01:00
Laurent Destailleur
26931a7e52
Merge pull request #16705 from dolibit-ut/patch-86
...
Update card.php
2021-03-16 10:36:27 +01:00
Laurent Destailleur
8a23d515e9
Merge pull request #16715 from frederic34/patch-12
...
fix php8 warning
2021-03-16 10:31:09 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
...
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25
Uniformize translation
2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197
Uniformize translation
2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
Frédéric FRANCE
50cd8274a5
fix php8 warning
2021-03-15 21:07:30 +01:00
UT from dolibit
7b8d2e55b7
Update card.php
...
$helpurl = "EN:Module_Banks_and_Cash";
2021-03-15 19:46:51 +01:00
Laurent Destailleur
dfda1bfa0d
Merge pull request #16686 from frederic34/patch-5
...
fix php8 warning
2021-03-15 17:16:52 +01:00
Frédéric FRANCE
99cd866eba
fix php8 warning
2021-03-15 15:12:10 +01:00
Frédéric FRANCE
691b8d5976
fix php8 warning
2021-03-15 14:05:05 +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
a1cfacfa9e
Merge pull request #16652 from frederic34/patch-9
...
fix php8 warnings
2021-03-15 11:09:23 +01:00
Laurent Destailleur
6de5ef286d
Merge pull request #16668 from frederic34/patch-23
...
fix php8 warning
2021-03-15 11:00:07 +01:00
Laurent Destailleur
c2c434ab7f
Update quadri_detail.php
2021-03-15 10:59:41 +01:00
Laurent Destailleur
909653c65e
Update byratecountry.php
2021-03-15 10:56:10 +01:00
Frédéric FRANCE
c15f2ea4dc
fix php8 warning
2021-03-15 00:26:50 +01:00
Laurent Destailleur
382b810ba1
Fix phpcs
2021-03-15 00:18:26 +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
Frédéric FRANCE
f5ae12f4dc
fix php8 warnings
2021-03-14 09:41:53 +01:00
Laurent Destailleur
c75fade649
Fix regression
2021-03-10 17:07:44 +01:00
Adrien Raze
83b06734a2
FIX : Travis return
2021-03-10 15:34:43 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php
2021-03-10 15:29:05 +01:00
stickler-ci
3a9c1613bf
Fixing style errors.
2021-03-10 14:12:29 +00:00
Adrien Raze
0bd4b132a4
FIX : Update pencil should be shoxn only when no payment has been entered
2021-03-10 14:39:04 +01:00
atm-lena
b798535af9
FIX create sociales : keep values error form
2021-03-10 14:15:03 +01:00
Alexandre SPANGARO
b5c84bfc4f
Resolve some mistakes
2021-03-09 05:02:37 +01:00
Laurent Destailleur
c3a047ee06
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
2021-03-08 19:27:34 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation
...
FIX : Add "Now" link on social charges creation card
2021-03-08 16:31:41 +01:00
Laurent Destailleur
20c30bade8
Update card.php
2021-03-08 16:30:32 +01:00
Adrien Raze
67c6577177
FIX : Add "Now" link on social charges card creation
2021-03-08 15:47:02 +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
Adrien Raze
cbb7751a15
FIX : rounding amount on card updating
2021-03-08 11:51:18 +01:00
x
e087c6ffe0
FIX : Rounding amount on card updating
2021-03-08 11:35:59 +01:00
Laurent Destailleur
ab89d85095
Fix for php8
2021-03-08 11:33:07 +01:00
Alexandre SPANGARO
2f86971f84
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-08 09:56:57 +01:00
Laurent Destailleur
4d409e23f5
Missing declaration of properties
2021-03-08 09:16:33 +01:00
Laurent Destailleur
a1d97274fb
Clean code for php8
2021-03-08 09:14:23 +01:00
Alexandre SPANGARO
339af419bc
Fix strftime
2021-03-07 21:59:28 +01:00
Laurent Destailleur
1affaa8c87
fix phpunit
2021-03-07 20:26:36 +01:00
Laurent Destailleur
1ca3e433d2
Fix phpunit
2021-03-07 19:55:09 +01:00
Laurent Destailleur
0f7085154b
Fix phpunit
2021-03-07 19:47:55 +01:00
Laurent Destailleur
91245e22d4
Fix phpunit phpv8
2021-03-07 19:16:09 +01:00
Laurent Destailleur
63aa2f4ec2
Fix phpunit
2021-03-06 12:50:38 +01:00
Laurent Destailleur
7959bc99d7
Fix phpcs
2021-03-06 10:39:51 +01:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
6eafc3b774
Clean code
2021-03-04 17:23:12 +01:00
Laurent Destailleur
10a6774ede
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries
...
Bank Entries : Error order by user/thirdparty
2021-03-04 17:08:12 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
atm-lena
cd1c1c54d4
Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries
2021-03-04 11:50:08 +01:00
atm-lena
0cce782a21
No orderby for user/thirdparty in bankentries list
2021-03-04 11:42:47 +01:00
Laurent Destailleur
31845e1dae
Fix phpcs
2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47
FIX #16530
2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec
FIX #16530
2021-03-03 22:52:02 +01:00
Laurent Destailleur
71370bd558
Fix links in cheque receipt pages
2021-03-03 21:18:14 +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
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule
...
Add rule
2021-03-02 12:52:03 +01:00
stickler-ci
35cb48d649
Fixing style errors.
2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php
2021-03-02 12:37:24 +01:00
Florian HENRY
d063533efb
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-03-02 09:46:05 +01:00
Florian HENRY
d7500b1609
fix php warning
2021-03-02 09:45:49 +01:00
Laurent Destailleur
0670a00b83
Fix phpcs
2021-03-02 02:06:09 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Frédéric FRANCE
c54a61bb67
fix
2021-03-01 23:54:03 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule
2021-03-01 21:22:34 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Laurent Destailleur
222012da37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
0abe576fdc
FIX: Various payment - Missing fields for check transmitter & bank name
2021-03-01 04:49:06 +01:00
Alexandre SPANGARO
94a861c1c8
Code enhanced - Standardize field name
2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
706aad3b68
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 21:33:59 +01:00
Alexandre SPANGARO
7a3dfda8ee
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 21:30:25 +01:00
Laurent Destailleur
886cbc61c8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
2ce76133f4
FIX #16487
2021-02-28 12:59:58 +01:00
Laurent Destailleur
0832c25b5b
Look and feel v14
2021-02-28 11:48:35 +01:00
Alexandre SPANGARO
ca7958f273
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 07:32:23 +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
9cf4222d3a
Look and feel v14
2021-02-27 17:15:40 +01:00
daraelmin
739cd0466d
Fix Dolibarr#16418 missing title in "iNew cCash Fence"
2021-02-26 17:24:39 +01:00
daraelmin
1b6bc8b132
Fix #16418 missing in "Tags of transactions"
2021-02-26 17:18:09 +01:00
daraelmin
0749585687
Fix #16418 title in "Transaction list by category"
2021-02-26 17:11:18 +01:00
daraelmin
ea18a47113
Fix #16418 missing title in "internal transfer"
2021-02-26 17:01:53 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +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
Gauthier PC portable 024
c996871f98
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 11:50:18 +01:00
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax
...
code syntax compta directory
2021-02-26 10:21:22 +01:00
Alexandre SPANGARO
e177ac566c
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-25 05:02:03 +01:00
Laurent Destailleur
d4a78bf7c6
Removed useless field
2021-02-24 10:24:54 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory
2021-02-23 21:09:01 +01:00
Laurent Destailleur
2642e1d1b3
Code syntax
2021-02-23 15:35:16 +01:00
Gauthier PC portable 024
c0160a5f3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:20:15 +01:00
Laurent Destailleur
888c072af0
NEW Can set a percentage when creating an invoice from another object
2021-02-23 14:48:54 +01:00
Laurent Destailleur
8c1902be1b
Missing space
2021-02-22 18:40:15 +01:00
Gauthier PC portable 024
10008360e2
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:29:47 +01:00
Gauthier PC portable 024
bc1d06e5cc
FIX : wrong payment salary object on accounting-files.php
2021-02-22 09:19:03 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
d04b04c10f
Fix
2021-02-22 06:22:47 +01:00
Alexandre SPANGARO
70dddd9bdf
Index & module
2021-02-22 05:58:46 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20
2021-02-21 20:28:06 +01:00
Laurent Destailleur
1bb27f8f18
Responsive
2021-02-21 13:12:16 +01:00
Alexandre SPANGARO
3dcfe40e71
Code enhanced - Standardize field name #14697
2021-02-20 08:00:27 +01:00
Laurent Destailleur
71f537e4c1
Responsive
2021-02-19 22:12:03 +01:00
Laurent Destailleur
712c2f20df
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7
FIX date selector when using reduced year (like on smartphone)
2021-02-19 22:00:44 +01:00
Laurent Destailleur
0ede8c2b9c
Merge pull request #16356 from atm-lena/develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct
...
Develop bank entries fix search user thirdparty reconstruct
2021-02-19 17:48:37 +01:00
Laurent Destailleur
0dabbcd7f5
Update bankentries_list.php
2021-02-19 17:48:15 +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
Laurent Destailleur
3ff80ac1f8
FIX #16304
2021-02-19 14:15:58 +01:00
Laurent Destailleur
b6211a7990
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 14:12:00 +01:00
Laurent Destailleur
3285dd3199
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
ChangeLog
htdocs/compta/bank/various_payment/list.php
2021-02-19 14:11:08 +01:00
Laurent Destailleur
dc3377f0f0
Merge pull request #16348 from ptibogxiv/patch-416
...
Fix multientity in cash fence report
2021-02-19 13:51:44 +01:00
Laurent Destailleur
556651a3ae
Update report.php
2021-02-19 13:51:15 +01:00
Laurent Destailleur
5340c30db3
FIX missing security test on payment page
...
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
stickler-ci
af32ef266c
Fixing style errors.
2021-02-19 09:05:04 +00:00
atm-lena
a6999a2be7
Clean code
2021-02-19 09:54:51 +01:00
atm-lena
12dce74a47
Merge branch 'BankEntries_FIX_SearchUSerThirdparty_Reconstruct' of github.com:atm-lena/dolibarr into develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct
2021-02-19 09:46:55 +01:00
atm-lena
687d0556aa
Clean code
2021-02-19 09:39:06 +01:00
atm-lena
d7c59edd11
Clean code
2021-02-19 09:36:15 +01:00
atm-lena
a4d9e3b9d3
WIP final
2021-02-19 09:33:28 +01:00
Iván Mestre
57e9277376
Fixed Bank Account filter resets on payment various
...
Changed GET search bank account GET parameter from search_amount to search_account
2021-02-18 16:23:18 -03:00
ptibogxiv
cafc6a3da2
Fix multientity in cash fence report
...
it make no sense to merge cash fence in différent entity with same terminal number.
2021-02-18 20:04:09 +01:00
atm-lena
9cdb6ce31c
WIP
2021-02-18 17:35:09 +01:00
Gauthier PC portable 024
134d7e00ec
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-17 16:56:50 +01:00
Laurent Destailleur
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
Laurent Destailleur
96a213ced7
Fix escaping html
2021-02-17 11:54:34 +01:00
atm-lena
9f9b7554ed
FIX error commit : only type user
2021-02-17 11:00:14 +01:00
Laurent Destailleur
a41be55251
FIx #16306
2021-02-16 20:11:51 +01:00
Laurent Destailleur
b5c75ecbd5
FIx #16306
2021-02-16 20:10:03 +01:00
Laurent Destailleur
4fbf0628a6
Merge pull request #16318 from ATM-Consulting/NEW/14.0_new_payments_on_vat_default_checkbox_value
...
New/14.0 new payments on vat default checkbox value
2021-02-16 19:57:58 +01:00
Laurent Destailleur
6cae96900b
Merge pull request #16317 from atm-lena/develop_FIX_BankEntries_SearchType_Salary
...
Fix bank entries search type salary
2021-02-16 19:45:25 +01:00
Laurent Destailleur
c8824ccea0
Look and feel v14
2021-02-16 17:05:38 +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
atm-lena
84c259d87a
Merge branch 'FIX_BankEntries_SearchType_Salary' of github.com:atm-lena/dolibarr into develop_FIX_BankEntries_SearchType_Salary
2021-02-16 16:26:18 +01:00
atm-lena
aceefa2de1
FIX search type salary too for bank entries users
2021-02-16 16:19:35 +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
Laurent Destailleur
d16276ea2c
Clean code
2021-02-16 11:15:42 +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
dabf9d796a
FIX Rename title of template invoice
2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf
FIX Rename title of template invoice
2021-02-15 22:15:14 +01:00
Laurent Destailleur
be3703a05b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/bank/various_payment/list.php
2021-02-15 16:45:17 +01:00
Laurent Destailleur
1d6893e928
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-15 16:43:46 +01:00
Laurent Destailleur
6132843586
FIX Filter on date of next generation on template invoices
2021-02-15 16:43:24 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
stickler-ci
6f7a223a8d
Fixing style errors.
2021-02-12 10:17:03 +00:00
atm-lena
b3c1bb9706
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
2021-02-12 11:13:14 +01:00
atm-lena
1f56166801
FIX ret : fetch user instead of search with main sql request
2021-02-12 11:05:15 +01:00
Laurent Destailleur
3b5e6b1140
Update bankentries_list.php
2021-02-11 18:45:06 +01:00
stickler-ci
84e17753eb
Fixing style errors.
2021-02-11 10:35:15 +00:00
atm-lena
a1356718c0
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
2021-02-11 11:14:24 +01:00
atm-lena
7fbf0b56d5
NEW Bank Entries : add verif fk_user addPaymentToBank Social Contribution
2021-02-11 11:13:12 +01:00
atm-lena
b83e2dc77a
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
2021-02-11 09:52:59 +01:00
Iván Mestre
a2051fc01e
V13 Fix #16241 Date filter resets on Miscellaneous Payments
...
Changed $search_datep_start, $search_datep_end, $search_datev_start and $search_datev_end variables to get values from search_datep_start, search_datep_end, search_datev_start and search_datev_end GET parameters if their value is empty after checking POST parameters
2021-02-10 15:20:10 -03:00
Iván Mestre
a249f4f35a
Fix #16241 Date filter resets on Miscellaneous Payments
...
Changed $search_date_start and $search_date_end variables to get values from search_date_start and search_date_end GET parameters if no their value is empty after checking POST parameters
2021-02-10 15:03:17 -03:00
Iván Mestre
cb4cfbd27d
Fixed Bank Account filter resets on payment various
...
Changed GET search bank account GET parameter from search_amount to search_account
2021-02-10 14:43:19 -03:00
atm-lena
2e14b9832d
Clean code
2021-02-10 17:00:50 +01:00
atm-lena
3aef987f3f
Display or not users in terms of user rights
2021-02-10 16:24:45 +01:00
atm-lena
8f8f5058de
Add link 'user' in bank_url for payment_sc
2021-02-10 16:04:29 +01:00
Laurent Destailleur
0849ce288c
Fix phpcs
2021-02-10 14:04:06 +01:00
atm-lena
64ab2fa3b1
Bank Entries : add user search
2021-02-10 12:19:50 +01:00
atm-lena
c0354c5e93
NEW Bank Entries : display user linked to salary and social taxes
2021-02-10 12:07:09 +01:00
LAURIER Alexis
608a7152cf
Correct missing semi column
2021-02-10 08:15:16 +01:00
LAURIER Alexis
653b0d6090
Add mass action on direct debit request list
...
Add mass action on direct debit request list into direct debit voucher create page
2021-02-10 08:11:28 +01:00
Laurent Destailleur
4c3a96da08
FIX #16150
2021-02-10 02:57:08 +01:00
Laurent Destailleur
92a1235066
Fix summary of report
2021-02-09 23:34:42 +01:00
Laurent Destailleur
6ceaa02abe
Fix total in summary section was empty for income.
2021-02-09 23:08:59 +01:00
Laurent Destailleur
1b129831a9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
4d4a92b567
Merge pull request #16226 from frederic34/patch-2
...
remove deprecated
2021-02-09 13:31:36 +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
e2d2048522
deprecate non camelCaps functions
2021-02-09 13:25:55 +01:00
Laurent Destailleur
a5386246cd
Merge pull request #16225 from frederic34/facturerec
...
clean deprecated modelpdf to model_pdf
2021-02-09 13:23:25 +01:00
Laurent Destailleur
842e112c5b
Merge pull request #16229 from frederic34/patch-3
...
doxygen
2021-02-09 13:22:15 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions
2021-02-09 13:10:11 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions
2021-02-09 10:26:17 +01:00
Gauthier PC portable 024
d106fe7e90
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 09:50:46 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions
2021-02-09 09:49:37 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions
2021-02-09 09:40:07 +01:00
Frédéric FRANCE
5f8b70b772
use camelCaps name
2021-02-09 09:03:29 +01:00
Laurent Destailleur
c9f34cc0d4
Prepare button to the bank conciliation pages
2021-02-08 22:42:21 +01:00
Laurent Destailleur
401b4f641d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Frédéric FRANCE
bca986d924
Merge branch 'develop' into patch-2
2021-02-08 21:05:05 +01:00
Florian HENRY
dbbebba497
this->errors is set on triggers action must be set by callers
2021-02-08 20:44:40 +01:00
Frédéric FRANCE
b602a1b4a7
Update paiement_vat.php
2021-02-08 20:29:09 +01:00
Frédéric FRANCE
1a4c627ad8
doxygen
2021-02-08 20:25:51 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec
2021-02-08 20:21:46 +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
Frédéric FRANCE
f8f3a27b6f
remove deprecated
2021-02-08 19:18:30 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
...
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
2021-02-08 17:19:40 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly
2021-02-08 15:29:36 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +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
Florian HENRY
fcb5b3900d
FIX : #16189 , fix download/see check deposit PDF
2021-02-06 12:39:40 +01:00
Laurent Destailleur
fd3354142b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/compta/prelevement/card.php
2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/product/price.php
2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/card.php
2021-02-06 01:03:31 +01:00
Laurent Destailleur
bee0849290
Fix when nothing found, we should show message nothing found
2021-02-06 00:42:53 +01:00
Laurent Destailleur
c15deff817
FIX #16185
2021-02-06 00:30:44 +01:00
Laurent Destailleur
f0e1c02caa
Look and feel v14 - Use placeholder on combolists
2021-02-06 00:05:24 +01:00
stickler-ci
9bfb7a5cbd
Fixing style errors.
2021-02-05 12:08:05 +00:00
Gauthier PC portable 024
24b26b8980
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 12:49:23 +01:00
Gauthier PC portable 024
bed723aec0
FIX : getNomUrl()
2021-02-05 12:47:20 +01:00
Laurent Destailleur
c441b54521
NEW If not logo defined, can use squarred logo on login page
2021-02-05 12:07:39 +01:00
Florian Mortgat
3f862bf43e
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
2021-02-05 11:34:39 +01:00
Laurent Destailleur
54be4f282b
Fix bad function name
2021-02-05 10:56:33 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Laurent Destailleur
48be1f24d7
Reduce size required to store blockedlogs
2021-02-05 00:43:58 +01:00
Laurent Destailleur
59faccbc60
Load note_private
2021-02-05 00:34:15 +01:00
Laurent Destailleur
964fa7a72d
Look and feel v14
2021-02-04 20:29:57 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
445e7a1e0c
Clean code
2021-02-04 10:58:07 +01:00
stickler-ci
149d2a1d55
Fixing style errors.
2021-02-04 08:52:16 +00:00
Florian HENRY
ec41bf58e5
always ajax now
2021-02-04 09:48:17 +01:00
Florian HENRY
2d77787bba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly
2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79
no inner join
2021-02-04 09:05:58 +01:00
Laurent Destailleur
3e2b1370dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-03 21:02:46 +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
9ac2dc1a6e
Fix phpcs
2021-02-03 20:42:30 +01:00
Laurent Destailleur
fb75da809b
Merge pull request #16145 from prietojc/patch-15
...
FIX generating SEPA file
2021-02-03 19:58:00 +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
Laurent Destailleur
2e7de1d137
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
test/phpunit/ExportTest.php
2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb
FIX Must not be able to edit vat of all lines if not draft
2021-02-02 16:12:03 +01:00
JC Prieto
f11037c6bf
Update bonprelevement.class.php
...
Bad sender ICS_transfer
2021-02-02 13:40:09 +01:00
Laurent Destailleur
4d029194d3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
2021-02-02 13:22:23 +01:00
Laurent Destailleur
7ff5cd50c3
Fix responsive
2021-02-02 11:41:32 +01:00
Laurent Destailleur
c94ecb8a42
Limit list of draft element in home sections
2021-02-02 11:34:34 +01:00
Laurent Destailleur
2e9656a5b2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8
FIX #16118 Timezone problem on some fields
2021-02-02 00:19:41 +01:00
Gauthier PC portable 024
1eb4968a29
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-01 12:00:04 +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
Laurent Destailleur
dad6778570
Prepare removal of libelle and lib into label
2021-01-31 13:07:41 +01:00
Laurent Destailleur
b349290cd1
Fix test for date in future
2021-01-31 12:57:54 +01:00
Laurent Destailleur
7887d4cc8e
Fix price2num on all GETPOST('remise_percent')
2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/expedition/list.php
2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c
FIX #14290 #15900
2021-01-30 18:09:13 +01:00
Laurent Destailleur
58dec39f94
Fix start and end month for turnover report.
2021-01-30 17:07:13 +01:00
Gauthier PC portable 024
b55cb826e7
Merge branch 'NEW_develop/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge
2021-01-29 09:33:06 +01:00
Gauthier PC portable 024
2915bf89d9
FIX : stickler feedback on br tag
2021-01-29 09:32:00 +01:00
stickler-ci
b4d0668cea
Fixing style errors.
2021-01-28 16:27:55 +00:00
Gauthier PC portable 024
0c43ea1e9b
Merge branch 'NEW/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge
2021-01-28 17:16:24 +01:00
Gauthier PC portable 024
cce38a9e6d
NEW : fk_user on social charge
2021-01-28 16:58:55 +01:00
Laurent Destailleur
9ec5ba46fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-28 14:47:06 +01:00
Gauthier PC portable 024
8a5588e518
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-28 10:28:36 +01:00
Laurent Destailleur
f462e353e9
FIX #16079
2021-01-28 09:59:13 +01:00
Laurent Destailleur
0b393676e6
Fix group by
2021-01-28 09:30:01 +01:00
Gauthier PC portable 024
42e28941d0
FIX : sql db escape missing
2021-01-25 10:22:31 +01:00
Laurent Destailleur
21dccadb3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/banks.lang
htdocs/stripe/class/stripe.class.php
2021-01-24 15:32:39 +01:00
Laurent Destailleur
7365974594
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/langs/en_US/banks.lang
htdocs/stripe/class/stripe.class.php
2021-01-24 15:24:56 +01:00
Frédéric FRANCE
5820758968
fix class name Tva
2021-01-23 20:59:23 +01:00
Laurent Destailleur
9b6b1e055c
Fix trans
2021-01-23 12:20:18 +01:00
Laurent Destailleur
86e853f27d
Look and feel v12
2021-01-23 12:18:07 +01:00
Laurent Destailleur
2acf2353a3
Fix bad link
2021-01-23 12:16:25 +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
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +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
Laurent Destailleur
03d8c6bfd6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement_charge.php
2021-01-19 10:59:42 +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
Florian HENRY
a8cdecf1b8
better fix
2021-01-18 19:17:23 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
Laurent Destailleur
4d42fa2a37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formaccounting.class.php
2021-01-17 11:34:19 +01:00
Laurent Destailleur
314cc45c81
Fix message
2021-01-17 11:24:24 +01:00
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines
...
add missing translation
2021-01-16 17:28:20 +01:00
Laurent Destailleur
62a5c8b6da
FIX Bad balance of begin commit
2021-01-15 15:34:24 +01:00
Laurent Destailleur
8e1128ef10
FIX Bad balance of begin commit
2021-01-15 15:33:12 +01:00
Laurent Destailleur
828f1c8314
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058
Look and feel v13
2021-01-15 14:02:18 +01:00
Laurent Destailleur
e5126885fb
Fix css
2021-01-15 13:27:45 +01:00
Laurent Destailleur
3e85aec9a5
Fix url
2021-01-15 13:24:37 +01:00
Laurent Destailleur
d7a776ad8a
Fix url
2021-01-15 13:23:59 +01:00
Laurent Destailleur
4c50f25c12
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 11:41:45 +01:00
Laurent Destailleur
0d704b0714
FIX error managent and db transaction balance
2021-01-14 19:09:57 +01:00
Florian HENRY
0fa7134bd1
better fix
2021-01-14 13:04:02 +01:00
Frédéric FRANCE
271378fb87
add translation
2021-01-13 18:09:57 +01:00
Frédéric FRANCE
a5678147dd
add missing translation
2021-01-13 16:52:32 +01:00
Laurent Destailleur
8d65dff93d
Fix missing param
2021-01-13 11:16:48 +01:00
Laurent Destailleur
db8ca42da2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-13 11:15:51 +01:00
Laurent Destailleur
ffc936fff3
Fix missing param
2021-01-13 11:15:30 +01:00
Florian HENRY
7e30812529
fix review
2021-01-12 22:01:53 +01:00
Florian HENRY
d856b0149d
Merge branch '13_backport' into develop
2021-01-12 10:08:12 +01:00
Florian HENRY
33d7998a96
fix: date auto fill date paiement tax
2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628
fix: date auto fill date paiement tax
2021-01-11 19:46:08 +01:00
Laurent Destailleur
d2c0dd35b0
Merge pull request #15937 from aspangaro/13b5
...
Various payment - Add Amount & direction in clone mode
2021-01-11 15:58:42 +01:00
Laurent Destailleur
d2c86578fa
Update card.php
2021-01-11 15:58:20 +01:00
Laurent Destailleur
e3a1cabd87
Merge pull request #15942 from bb2a/add_alias_on_lists
...
NEW Add column "alias" of company in list of proposal, order, invoice
2021-01-11 15:56:22 +01:00
Laurent Destailleur
e2598f5af3
NEW Add check to avoid invoice date in future
2021-01-11 15:34:25 +01:00
Laurent Destailleur
0c34543145
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 15:20:15 +01:00
Laurent Destailleur
d859072202
Fix GETPOST
2021-01-11 15:19:47 +01:00
Laurent Destailleur
4a919a8c6a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 15:16:33 +01:00
Laurent Destailleur
25a703526e
Fix GETPOST
2021-01-11 15:16:01 +01:00
Laurent Destailleur
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee
FIX GETPOST of qty with wrong parameters
...
Conflicts:
htdocs/bom/bom_card.php
2021-01-11 13:11:40 +01:00
Laurent Destailleur
f3e28c2dd0
FIX GETPOST of qty with wrong parameters
2021-01-11 13:00:29 +01:00
Anthony Berton
59ea907b18
Update list.php
2021-01-10 22:47:30 +01:00
Alexandre SPANGARO
004ee952d9
Various payment - Add Amount & Sens in clone mode
2021-01-10 08:16:19 +01:00
Laurent Destailleur
f411b29b28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/accountancy.lang
2021-01-09 02:34:43 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Alexandre SPANGARO
1f87bbbd01
Typo
2021-01-07 06:26:24 +01:00
Laurent Destailleur
b553dbb9d2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:23:07 +01:00
Adrien Raze
6f05ba4db9
NEW : Added of doActions hooks in bank/line.php and bank/transfer.php
2021-01-06 14:26:40 +01:00
Frédéric FRANCE
554fbcb577
Merge remote-tracking branch 'upstream/develop' into api_bank_account
2021-01-05 12:03:20 +01:00
Laurent Destailleur
a93227ac2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:14 +01:00
Frédéric FRANCE
ff25003025
fix unknown variable
2021-01-05 08:59:46 +01:00
Laurent Destailleur
64b4f1079d
Close #15870 manually
2021-01-05 02:23:38 +01:00
Laurent Destailleur
7141fa315e
Debug v13
2021-01-04 15:32:18 +01:00
Laurent Destailleur
8df5928e9c
Fix selection must depends on enabled modules
2021-01-04 13:32:43 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Laurent Destailleur
150b338764
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f
FIX Bad cleaning of VAT rate when numbers are into code
2021-01-02 16:51:34 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe
Debug v13
2021-01-02 16:18:16 +01:00
Aisuko
2d22c1d5d1
Fix wrong cast for pos_change
...
The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
2021-01-02 15:59:43 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
715d3499ff
Clean code
2021-01-01 21:06:47 +01:00
Laurent Destailleur
7c74a71305
Fix regression
2021-01-01 21:03:44 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4
Fixing style errors.
2020-12-31 09:49:27 +00:00
JC Prieto
af82bf2fee
Update create.php
2020-12-31 10:47:30 +01:00
jcp
e187e77acb
ICS and ICS_transfer hide if module not enabled
2020-12-31 10:12:03 +01:00
Laurent Destailleur
020caf8809
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-30 23:52:36 +01:00
Laurent Destailleur
60d1b08f84
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/takepos/invoice.php
2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3
FIX Visible date of payment
2020-12-30 22:53:21 +01:00
Laurent Destailleur
42ca3bcdc7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/salaries/class/paymentsalary.class.php
2020-12-30 13:23:50 +01:00
Laurent Destailleur
cb4a293020
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/webservices/server_productorservice.php
2020-12-30 13:22:43 +01:00
Laurent Destailleur
5a097b21e4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
2020-12-30 13:21:33 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Alexandre SPANGARO
a336e45098
FIX : #15751 Miscellaneous payment type change to 0 after updating subledger
2020-12-30 08:11:20 +01:00
Alexandre SPANGARO
0e2b7d8b3c
Remove typo
2020-12-30 07:23:26 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
lvessiller
d4a19e5968
NEW add total margin in invoice list
2020-12-28 16:20:59 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
...
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Florian HENRY
f03574d061
bank ok
2020-12-24 14:56:26 +01:00
Laurent Destailleur
88e441412c
CSS
2020-12-24 01:35:59 +01:00
Laurent Destailleur
b66ec5bc64
Fix css
2020-12-23 23:16:27 +01:00
Laurent Destailleur
4471d7d1da
FIX debug report expense/income
2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Laurent Destailleur
bac2ae0d5f
Fix warnings
2020-12-22 17:33:17 +01:00
Laurent Destailleur
58b4de8bc3
More complete fix for #15712
2020-12-21 19:27:42 +01:00
Laurent Destailleur
8d901d03fd
Fix link
2020-12-21 16:01:47 +01:00
Laurent Destailleur
4ed14d4903
Fix title not saved
2020-12-19 18:52:05 +01:00
Laurent Destailleur
832db82fce
Fix warnings
2020-12-18 14:40:45 +01:00
Laurent Destailleur
3b8947dadd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
5facd49a6c
Fix warnings
2020-12-16 11:33:31 +01:00
Laurent Destailleur
c6f83aaed7
Fix warning
2020-12-16 11:21:48 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790
Fix warning
2020-12-16 10:55:33 +01:00
atm-lena
cb2c1f3ece
FIX Facture Situation Out : status condition
2020-12-16 10:54:32 +01:00
Laurent Destailleur
479e742d0c
FIX #15753
2020-12-15 13:46:13 +01:00
Laurent Destailleur
b991badb8c
Fix warning
2020-12-14 13:03:43 +01:00
Laurent Destailleur
d4167fb06c
Fix link
2020-12-14 11:35:45 +01:00
Laurent Destailleur
e1e8d76eb9
Fix bad filter
2020-12-14 11:30:39 +01:00
Laurent Destailleur
07cf81be17
Fix search and navigation
2020-12-14 11:28:18 +01:00
Laurent Destailleur
b0e3f1678f
Debug v13
2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b
Fix code
2020-12-14 10:44:51 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Frédéric FRANCE
870f2073ad
fix warning
2020-12-11 22:13:30 +01:00
Laurent Destailleur
be163c684f
Fix phpcs
2020-12-10 12:54:13 +01:00
Laurent Destailleur
dac0267a38
Fix debug various payment module.
...
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
Laurent Destailleur
51738e7e60
Fix links into translation strings
2020-12-09 17:02:26 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template
...
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
2c094fe847
Merge pull request #15673 from frederic34/compta_stats_index
...
fix trans removing html
2020-12-07 22:32:12 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
a87ef49172
Fix remove warning
2020-12-06 17:59:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Frédéric FRANCE
7099dbbb05
fix trans removeing html
2020-12-05 18:17:04 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho
2020-12-05 15:35:52 +01:00
Laurent Destailleur
0db72852fb
Fix height of graph
2020-12-03 20:18:37 +01:00
Laurent Destailleur
d8d825f615
FIX #15519
2020-12-03 14:40:14 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
fd56f5fa21
Merge pull request #15621 from Hystepik/develop#1
...
Fix a bug in bank's graph with option and mode
2020-12-02 18:31:16 +01:00
Laurent Destailleur
9e18997e64
FIX #15595
2020-12-02 16:35:43 +01:00
lmarcouiller
8a86593b13
Fix a bug in bank's graph with option and mode
2020-12-02 16:24:01 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66
PR toggle FCKeditor on public/private notes
2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f
FIX #15572
2020-11-29 20:27:40 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
85a6a296c8
Fix links
2020-11-28 19:13:17 +01:00
Laurent Destailleur
59b445a103
Clean dead code
2020-11-28 14:47:39 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
69b06a25e8
Fix code of deletion of objects
2020-11-26 09:16:16 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
...
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
Laurent Destailleur
0ad0035f19
Update list.php
2020-11-25 12:47:10 +01:00
Florian HENRY
73d6266151
continue fix banktransfert supplier
2020-11-25 11:22:31 +01:00
Florian HENRY
12ef03f06d
fix banck tranfert supplier
2020-11-25 10:58:34 +01:00
Florian HENRY
4a316f06d5
fix : finish bank transfert fourn from list
2020-11-25 10:24:44 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
...
FIX Dol print error : conf usage thirdparty propagate extrafields to
2020-11-23 21:43:03 +01:00
ATM john
fbc911aea1
Fix conf usage thirdparty propagate extrafields to
2020-11-23 16:40:31 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
f2cd2570b9
Fix link
2020-11-22 12:03:44 +01:00
Laurent Destailleur
3d2da45f84
Remove warning
2020-11-22 11:36:07 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
7195760ade
Restore lost param
2020-11-18 18:20:40 +01:00
Laurent Destailleur
1708874306
Merge branch 'develop' into develop
2020-11-18 18:16:29 +01:00
Laurent Destailleur
928330c44b
Fix link to reconciliation page
2020-11-16 12:42:59 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Frédéric FRANCE
52b4e2fbc5
doxygen
2020-11-14 22:25:25 +01:00
Laurent Destailleur
3c5ef18b36
FIX #15390
2020-11-14 00:47:28 +01:00
lmarcouiller
304e4ac8e6
FIX : #15373 Reset invalid email script
2020-11-13 11:07:35 +01:00
lmarcouiller
a1f26f2b55
FIX :15373 Reset invalid email script
2020-11-13 11:03:49 +01:00
