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
lmarcouiller
0e5b18a1e9
FIX : #14713 bank graph show all accounts
2020-11-13 10:05:28 +01:00
jcp
10ae18fe44
Update SQL migration
2020-11-12 19:42:20 +01:00
JC Prieto
615342aa77
Update account.class.php
...
Doc on ics_transfer var
2020-11-12 10:32:52 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
jcp
7e3ef08b25
ICS update
2020-11-10 19:17:11 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
jcp
eb0fd1674d
Update ICS
2020-11-09 18:40:57 +01:00
Florian Mortgat
bf27c56fa7
Following PR#15336: it should not be possible to modify the third party of an invoice
2020-11-09 17:09:06 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
jcp
50d530733e
NEW: ICS fields moved into bank account table
2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
e103503bb1
Fix warning php8
2020-11-08 12:34:45 +01:00
Laurent Destailleur
d04bbe09b7
Fix syntax error
2020-11-08 00:38:12 +01:00
Laurent Destailleur
a9fbe9dd6c
Fix remove warning
2020-11-08 00:18:41 +01:00
Laurent Destailleur
e2f5a302be
Fix warning
2020-11-07 23:04:23 +01:00
Laurent Destailleur
129c53342a
Fix warning
2020-11-07 20:01:28 +01:00
Laurent Destailleur
215ecafb32
Look adn feel v13
2020-11-07 15:54:58 +01:00
Laurent Destailleur
a46248ffe9
Merge pull request #15311 from frederic34/patch-6
...
doxygen
2020-11-06 18:45:34 +01:00
Laurent Destailleur
1649a8b5a6
Fix status
2020-11-06 16:41:54 +01:00
lvessiller
4ddff7173f
NEW include tpl for loading lang file for extra fields in list
2020-11-06 12:19:45 +01:00
Laurent Destailleur
ac6f8e4e7c
Debug v13
2020-11-06 11:52:48 +01:00
Laurent Destailleur
ed8a0093ff
Debug v13
2020-11-05 22:25:14 +01:00
Frédéric FRANCE
3f164f1a9b
doxygen
2020-11-05 20:13:13 +01:00
Laurent Destailleur
3295d37be2
Merge pull request #15284 from frederic34/patch-13
...
Update card.php
2020-11-04 20:31:46 +01:00
Laurent Destailleur
79a56571f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-04 18:51:06 +01:00
Laurent Destailleur
1a2d094ce7
Removed dead code
2020-11-04 18:50:49 +01:00
Laurent Destailleur
d6b25bd891
Revert "remove deprecated"
2020-11-04 18:45:50 +01:00
Laurent Destailleur
ef5b14d20f
Merge pull request #15285 from frederic34/patch-14
...
remove deprecated
2020-11-04 18:41:32 +01:00
Laurent Destailleur
6392a36489
Merge pull request #15282 from frederic34/patch-10
...
doxygen
2020-11-04 18:36:03 +01:00
Frédéric FRANCE
ce2e8407d5
remove deprecated
2020-11-03 21:28:57 +01:00
Frédéric FRANCE
6c3ecc600d
Update card.php
2020-11-03 21:02:57 +01:00
Frédéric FRANCE
73d01612d4
doxygen
2020-11-03 20:50:51 +01:00
Frédéric FRANCE
d80f614e20
doxygen
2020-11-03 20:43:42 +01:00
Laurent Destailleur
508683b9f0
Clean duplicated code
2020-11-03 14:52:04 +01:00
Laurent Destailleur
b0e2d40533
Debug and fix v13
2020-11-03 14:19:54 +01:00
Laurent Destailleur
9e967a578e
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
2020-11-03 02:17:51 +01:00
Laurent Destailleur
3df0d5dc22
FIX #15268
2020-11-02 20:05:06 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7
FIX #14979
2020-11-01 17:01:26 +01:00
Laurent Destailleur
ad922bfde6
FIX #15074
2020-11-01 16:08:09 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8daf0c168c
Update facture.class.php
2020-10-31 13:27:29 +01:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
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
Florian HENRY
4b7707cc7c
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 17:17:52 +01:00
Florian HENRY
d77a0b40a8
tested and approuve feaure #15036
2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs
2020-10-27 21:28:26 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36
Fix scrutinizer
2020-10-27 18:55:55 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
56903d3677
Fix trans
2020-10-27 10:35:22 +01:00
Laurent Destailleur
16ac8a9d52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-27 10:33:46 +01:00
Laurent Destailleur
8bcd704d9b
Disable notif as it is used as a frame
2020-10-27 10:32:25 +01:00
Laurent Destailleur
5943e784ec
Remove var_dump
2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18
Fix label
2020-10-27 10:26:30 +01:00
Laurent Destailleur
ffc961599c
FIX error 500 on cash fence
2020-10-27 10:19:00 +01:00
Laurent Destailleur
3f0a9cfce9
Fix var not defined
2020-10-27 02:03:13 +01:00
Florian HENRY
8c935661ee
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-26 10:29:35 +01:00
Laurent Destailleur
2638d4596a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
2020-10-25 21:09:43 +01:00
Florian HENRY
7c2b5b614f
NEW: preload product description on selection for customer propal/order/invoice
2020-10-25 19:13:09 +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 Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
a7b23dc4f6
Update chargesociales.class.php
2020-10-25 14:14:50 +01:00
Maxime Kohlhaas
309691f1e7
Fix #15143 selected lines on invoice creation
2020-10-25 09:28:41 +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
f4181a77cd
Update chargesociales.class.php
2020-10-24 13:53:00 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Laurent Destailleur
8d5d7f801c
Merge branch 'develop' into patch-7
2020-10-23 14:10:33 +02:00
Laurent Destailleur
d21ad72e4a
Fix phpcs
2020-10-23 13:58:19 +02:00
Laurent Destailleur
ffcf8edd19
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-23 13:55:42 +02:00
Laurent Destailleur
edbf4dc375
Fix doc
2020-10-23 13:55:14 +02:00
Frédéric FRANCE
0f1996759f
fix phpcs
2020-10-23 08:12:19 +02:00
Laurent Destailleur
3bab0a322d
Merge pull request #15110 from frederic34/dol_fiche_head
...
replace deprecated
2020-10-23 04:03:46 +02:00
Laurent Destailleur
254da6923b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/line.php
2020-10-23 04:00:45 +02:00
Laurent Destailleur
0e25843baa
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2020-10-23 03:59:11 +02:00
Laurent Destailleur
c9a73cc380
Fix phpcs
2020-10-23 03:55:18 +02:00
Laurent Destailleur
62420c5e7b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/facture/card.php
2020-10-23 03:51:22 +02:00
Laurent Destailleur
d9aa83e699
Fix phpcs
2020-10-23 03:41:26 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
a5e2ab2822
Merge pull request #15106 from frederic34/rejet
...
add type
2020-10-22 21:36:36 +02:00
Frédéric FRANCE
f4b42234ec
add space
2020-10-22 21:32:12 +02:00
Frédéric FRANCE
02403ba640
add type
2020-10-22 21:29:33 +02:00
Regis Houssin
cbb6e4effe
FIX sql syntax error
2020-10-22 19:32:32 +02:00
Laurent Destailleur
b4581b6af8
Better error management
2020-10-22 18:39:45 +02:00
Marc de Lima Lucio
594d9e321e
FIX: invoice payment terms edition: error management
2020-10-22 18:28:27 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Philippe GRAND
fae572d43a
fix : deprecated
2020-10-22 16:29:17 +02:00
Laurent Destailleur
2702bd023f
Merge pull request #15059 from frederic34/patch-6
...
Add ref instead id in bank check remittance
2020-10-22 16:12:31 +02:00
Laurent Destailleur
648efbc0cb
Merge pull request #15067 from prietojc/12.0
...
FIX: Payment by BankTransfer
2020-10-22 15:59:19 +02:00
Laurent Destailleur
ca93f732c8
Update line.php
2020-10-22 15:59:04 +02:00
Laurent Destailleur
b9e6b188bc
Update rejetprelevement.class.php
2020-10-22 15:58:24 +02:00
Laurent Destailleur
10a8ce82a9
Update bonprelevement.class.php
2020-10-22 15:57:25 +02:00
Laurent Destailleur
272caceab9
Merge pull request #15071 from joseplluis/patch-8
...
Add customer country information in popup
2020-10-22 15:53:12 +02:00
Laurent Destailleur
1a70c016c5
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights
...
Add rights on margin info on invoice list
2020-10-22 15:49:05 +02:00
Laurent Destailleur
b96a59b089
Merge pull request #15086 from ppenelon/develop
...
NEW Retrieve discount from invoice from API
2020-10-22 15:45:09 +02:00
lvessiller
b13ef34804
NEW add rights on margin info on invoice list
2020-10-22 14:56:53 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php
2020-10-22 09:56:13 +02:00
Pierre Penelon
b8cb080f0d
ADD Retrieve discount from invoice from API
...
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
2020-10-22 09:26:46 +02:00
Laurent Destailleur
351c8a5a2d
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-10-21 20:10:43 +02:00
Laurent Destailleur
409f8f9866
Update doc
2020-10-21 19:50:40 +02:00
lvessiller
9b423106dc
NEW add margin info in invoice list
2020-10-21 16:10:48 +02:00
John Botella
70790009a9
Fix display warranty fields on page load
2020-10-21 14:49:51 +02:00
stickler-ci
ff02bba5bf
Fixing style errors.
2020-10-20 15:18:29 +00:00
Josep Lluís
e51dd2919e
Add customer country information in popup
...
Add customer country information in popup of draft invoices.
In other boxes it's ok.
2020-10-20 17:15:03 +02:00
jcp
b09a618f38
Fix Bank Transfer
2020-10-20 13:19:47 +02:00
jcp
a2d242356a
Fix BankTransfer (V12.0.2)
2020-10-20 13:17:14 +02:00
Frédéric FRANCE
78bc3ecbfd
Add ref instead id in bank check remittance
2020-10-19 14:10:48 +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
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
cd9acd02a1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/loan/card.php
2020-10-15 20:51:30 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev
...
Fix : correction de commentaires
2020-10-15 20:15:12 +02:00
Laurent Destailleur
520645a02c
Renamed all methods valide() into validate()
2020-10-15 10:15:37 +02:00
Laurent Destailleur
d283e8f649
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb
Fix phpcs
2020-10-14 20:13:30 +02:00
Givriz
c50e288a07
Correction de commentaires
...
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
2020-10-14 18:26:05 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList
...
NEW Selectable columns on sales tax list
2020-10-14 17:37:23 +02:00
Laurent Destailleur
7838ca32ba
Fix sql injection reported by Jason Nordenstam
2020-10-14 01:52:53 +02:00
Laurent Destailleur
c539c6d00d
Responsive
2020-10-13 17:36:45 +02:00
stickler-ci
dcd8a88e72
Fixing style errors.
2020-10-13 13:28:23 +00:00
Sekan, Tobias
f28e1dc4fb
cleanup
2020-10-13 15:27:42 +02:00
Sekan, Tobias
dfff32f239
Selectable columns on sales tax list
2020-10-13 15:09:25 +02:00
Laurent Destailleur
d3b6ada4eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-10-13 15:08:53 +02:00
Laurent Destailleur
496d429dcd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-10-13 15:04:25 +02:00
Laurent Destailleur
32fe8a37b4
Merge pull request #14992 from TobiasSekan/SelectableColumnsOnSocialTaxesList
...
NEW Select-able columns on social taxes list
2020-10-13 11:11:06 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
stickler-ci
675b1e613b
Fixing style errors.
2020-10-12 12:05:38 +00:00
Sekan, Tobias
3b905bdcd5
Selectable columns on social taxes list
2020-10-12 14:00:33 +02:00
atm-lena
bf7d5b56fb
FIX subcat filter
2020-10-12 11:50:19 +02:00
Alexandre SPANGARO
ae64e513a8
FIX #14956 Add a possibility to modify date on credit note invoice
2020-10-10 07:19:13 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch
...
NEW: Add global search for customer payments and vendor payments
2020-10-09 13:56:52 +02:00
Laurent Destailleur
e24ec99c8f
Fix regression
2020-10-09 11:51:34 +02:00
Laurent Destailleur
4eaf2c0350
Fix regression
2020-10-09 11:49:45 +02:00
Laurent Destailleur
b6fc33c454
Fix avoid error when we sumbit form to change page on conciliation
2020-10-09 11:13:02 +02:00
Laurent Destailleur
5ac7d4dbac
Show last 12 bank receipts instead of 15
2020-10-09 10:02:13 +02:00
stickler-ci
6b3f20dc65
Fixing style errors.
2020-10-09 07:29:25 +00:00
Sekan, Tobias
35fbc602ee
Add global payment search
2020-10-09 09:22:26 +02:00
Laurent Destailleur
3cd953bc41
Fix colspan
2020-10-08 11:40:05 +02:00
atm-lena
74ae9a2618
FIX CA report by product/service : subcategory filter
2020-10-08 10:49:46 +02:00
Laurent Destailleur
eb41a72e27
Properties ->titre have been renamed into ->title
2020-10-07 17:41:36 +02:00
Laurent Destailleur
213cefb570
Merge pull request #14941 from aspangaro/13a22
...
WIP NEW Add clone functionality on miscellaneous payment
2020-10-07 15:31:09 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
4c87949be0
Fix scrutinizer
2020-10-07 14:53:10 +02:00
Alexandre SPANGARO
973502bb1e
Fix
2020-10-07 09:36:29 +02:00
Laurent Destailleur
31f4d99e19
css
2020-10-07 00:53:01 +02:00
Laurent Destailleur
e9bcd95c39
Add information column on page to export source of accounting document
2020-10-07 00:49:19 +02:00
Laurent Destailleur
663f149982
Better error management
2020-10-06 16:48:48 +02:00
Laurent Destailleur
a744abce94
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-06 16:30:12 +02:00
Laurent Destailleur
e247b2de61
FIX list of fields in list of recurring invoices was empty
2020-10-06 16:29:29 +02:00
Laurent Destailleur
4ea102f1de
css
2020-10-06 15:18:32 +02:00
Laurent Destailleur
95f67309e2
Clean code
2020-10-06 15:11:45 +02:00
Alexandre SPANGARO
503f190fd4
Fix
2020-10-06 14:39:10 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
ef2e531d34
Merge pull request #14928 from TobiasSekan/SelectableColumnsOnCustomerInvoicePaymentList
...
NEW Select-able columns on customer invoice paymnet list
2020-10-06 12:28:20 +02:00
Laurent Destailleur
38acd83f4d
Review some titles and tooltip help to be more clear.
2020-10-06 12:17:33 +02:00
Alexandre SPANGARO
050a4770d3
WIP NEW Add clone functionality on miscellaneous payment
2020-10-06 10:04:15 +02:00
Laurent Destailleur
9ada5c7427
Merge pull request #14938 from ppenelon/ppenelon-patch-1
...
FIX Require Discount class on markAsCreditAvailable API method
2020-10-06 09:55:28 +02:00
Laurent Destailleur
054c58df16
Add currency into the select
2020-10-06 09:53:29 +02:00
stickler-ci
8f542a8572
Fixing style errors.
2020-10-06 06:56:08 +00:00
Sekan, Tobias
33b7d06bb9
address feedback + tooltip + reduce indent
2020-10-06 08:46:53 +02:00
stickler-ci
b9cc780c3c
Fixing style errors.
2020-10-05 21:58:00 +00:00
Pierre Penelon
609a29219d
FIX|Missing require in API : markAsCreditAvailable
...
Quick fix of a problem I encountered earlier when using `markAsCreditAvailable` API method for invoice routes.
The method was using the `DiscountAbsolute` class without importing it resulting in a 500 HTTP error.
2020-10-05 23:54:37 +02:00
Laurent Destailleur
ee40aeecce
Standardize API
2020-10-05 12:21:54 +02:00
Sekan, Tobias
8447817f8c
fix swapped array entries
2020-10-05 11:38:07 +02:00
Sekan, Tobias
3984d8c2b8
Add selectable columns on cust. invoice pay. list
2020-10-05 11:27:44 +02:00
Laurent Destailleur
07e1646b3a
Minor fixes
2020-10-04 19:09:25 +02:00
Laurent Destailleur
2ca28c37b6
Merge pull request #14790 from c3do/patch-14
...
FIX API paymentsdistributed accept multicurrency part payment
2020-10-04 11:28:33 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
a3da2afe7a
Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES
2020-09-30 11:58:40 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146
...
new:bankline_prepare_head for bank lines
2020-09-29 16:40:51 +02:00
Laurent Destailleur
babcc3bc91
Update line.php
2020-09-29 16:39:47 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
bahfir abbes
9662c4110a
new:bankline_prepare_head for bank lines
2020-09-29 01:28:39 +01:00
Laurent Destailleur
9973ffab01
Fix sanitizing
2020-09-28 13:05:12 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
f851ce2f0f
Merge pull request #14741 from Tim-Otte/fix-zero-price-lines
...
FIX: Allow product price equal zero in new lines
2020-09-27 20:46:36 +02:00
Laurent Destailleur
0d797a793a
On technical error, return http code 500
2020-09-25 15:01:15 +02:00
root
fcbc48fa28
Bug fix last_gen should be date_last_gen
2020-09-25 14:24:26 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
Laurent Destailleur
d6ce6bb47f
Standardize code
2020-09-25 10:05:59 +02:00
Laurent Destailleur
2404856409
Fix sql inj
2020-09-24 15:38:27 +02:00
Laurent Destailleur
6f919f1dd0
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 20:02:48 +02:00
Laurent Destailleur
bb10379768
NEW Can change a product in line of recurring invoice or contract
2020-09-23 18:45:19 +02:00
stickler-ci
e037f2e5c7
Fixing style errors.
2020-09-23 07:11:59 +00:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Sekan, Tobias
638c586a05
Merge branch 'PreselectThirpartyOnNewFromList' of https://github.com/TobiasSekan/dolibarr into PreselectThirpartyOnNewFromList
2020-09-23 08:59:45 +02:00
Sekan, Tobias
ce6758657a
Fix visiblity when came from Extended POS + doc
2020-09-23 08:59:30 +02:00
stickler-ci
06d41c029d
Fixing style errors.
2020-09-22 14:41:28 +00:00
Cédric
2dc148eae0
$accepthigherpayment (tested and work)
...
Accept higher payments that it remains to be paid
2020-09-22 16:38:59 +02:00
Regis Houssin
fcfe5423f4
FIX missing field entity
2020-09-22 16:34:38 +02:00
Laurent Destailleur
6c06d2f0aa
Look and feel v13
2020-09-22 15:26:29 +02:00
Tim Otte
e373de91d9
Fixed a bug where a price equal zero would be replaced with the product price
2020-09-22 14:43:09 +02:00
Laurent Destailleur
e52559783f
Look and feel v13
2020-09-21 13:54:26 +02:00
Laurent Destailleur
b4b0d682b8
css
2020-09-20 20:35:22 +02:00
Laurent Destailleur
40d894a610
Merge pull request #14768 from atm-gauthier/develop_new_hooks_in_stats_pages
...
NEW : add hooks on stats pages
2020-09-20 17:17:44 +02:00
Laurent Destailleur
e5cca13ea0
Fix escaping
2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Cédric
a0313fdc52
Update api_invoices.class.php
2020-09-19 22:39:39 +02:00
stickler-ci
3deed42671
Fixing style errors.
2020-09-19 20:05:08 +00:00
Cédric
7306a949e3
Update api_invoices.class.php
2020-09-19 22:02:52 +02:00
Cédric
90d2dfcca7
FIX deleteContact
2020-09-19 22:01:48 +02:00
Laurent Destailleur
7dd69a2b2b
Fix escape
2020-09-19 20:11:04 +02:00
Cédric
fbc8fe1e0c
Update api_invoices.class.php
2020-09-19 15:14:29 +02:00
Cédric
a0efd47cce
Update api_invoices.class.php
2020-09-19 15:12:57 +02:00
Cédric
9f22882417
Update api_invoices.class.php
2020-09-19 15:05:28 +02:00
stickler-ci
e1751d4bfb
Fixing style errors.
2020-09-19 12:23:53 +00:00
Cédric
720a113125
Update api_invoices.class.php
2020-09-19 14:16:17 +02:00
Laurent Destailleur
b6c6473cce
Fix sql injection when forging requests with IN
2020-09-18 17:47:40 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +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
eac9e54e0b
fix more different button visibility
2020-09-18 11:48:53 +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
Sekan, Tobias
d1f70a37df
Preselect thirparty on new from list (part 1)
2020-09-18 07:56:13 +02:00
Laurent Destailleur
801712b423
Fix phpcs
2020-09-18 01:41:42 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Got2be
03f37f3c1f
NEW : add hooks on stats pages
2020-09-17 17:00:58 +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
Laurent Destailleur
afc6155783
FIX sign of amount with credit note and multicurrencies
2020-09-15 13:30:59 +02:00
Laurent Destailleur
cc24e9b155
Look and feel v13
2020-09-15 13:27:48 +02:00
Laurent Destailleur
7a28972c8a
FIX sign of amount of invoice lines for credit note with multicurrency
...
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
2020-09-15 11:18:21 +02:00
Laurent Destailleur
cc37f4b29c
Clean code. <input name="token" value="$_SESSION['newtoken']" is now
...
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Florian Mortgat
06d31e8b9a
FIX: missing entity check
2020-09-14 16:09:45 +02:00
Laurent Destailleur
604a807ac0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-14 12:48:00 +02:00
Laurent Destailleur
6117e0d8d7
Fix tooltip into tooltip
2020-09-14 12:47:43 +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
Laurent Destailleur
970995d728
Clean code. Replace num_paiement with num_payment everywhere.
2020-09-14 01:03:51 +02:00
Laurent Destailleur
a2df666d34
Standardize code
2020-09-14 00:41:31 +02:00
Laurent Destailleur
62b7a90ea3
Merge pull request #14723 from c3do/patch-13
...
NEW API Can update a payment
2020-09-14 00:29:10 +02:00
Laurent Destailleur
e9d0869383
Update api_invoices.class.php
2020-09-14 00:28:43 +02:00
Laurent Destailleur
dcdce246b1
Update api_invoices.class.php
2020-09-14 00:26:16 +02:00
stickler-ci
8d3bc3ee6f
Fixing style errors.
2020-09-13 13:18:42 +00:00
Cédric
929804f4d2
Update api_invoices.class.php
2020-09-13 15:12:22 +02:00
stickler-ci
2cfe740d85
Fixing style errors.
2020-09-12 17:08:44 +00:00
Cédric
d728d268ca
Update paiement.class.php
2020-09-12 18:49:52 +02:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
5c776ccf3f
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch
...
NEW Add global search for miscellaneous payments
2020-09-12 01:13:26 +02:00
Laurent Destailleur
c4383747a1
Look and feel v13
2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Sekan, Tobias
25d6af2b86
Add global search for misc payments +TODO
2020-09-11 09:55:34 +02:00
Laurent Destailleur
358f8357f9
FIX #14703
2020-09-10 18:25:38 +02:00
Laurent Destailleur
0cccaa7271
FIX look and feel v12
2020-09-10 18:02:49 +02:00
Laurent Destailleur
ed6a16a3c7
FIX look and feel v12
2020-09-10 17:17:31 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Laurent Destailleur
97ee96e0dc
Merge pull request #14683 from TobiasSekan/SelectableColumnsOnExtraPayments
...
NEW Select-able columns on miscellaneous payments + more data columns
2020-09-09 14:54:04 +02:00
Cédric
1d894f4b7c
FIX ref_ext for invoice lines from API
...
Add and update ref_ext in invoice lines
2020-09-09 13:38:42 +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
Laurent Destailleur
d236e21639
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-09 12:51:55 +02:00
Laurent Destailleur
05912b3b55
Fix sql error
2020-09-09 12:50:07 +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
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8
2020-09-04 23:11:00 +02:00
Laurent Destailleur
c8da9f97a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-04 19:51:22 +02:00
stickler-ci
1cff5e0e03
Fixing style errors.
2020-09-04 17:33:58 +00:00
Cédric
5f4ad2a9fa
NEW ref_ext for Facture lines
2020-09-04 19:32:42 +02:00
Cédric
b60f82966c
Update facture.class.php
2020-09-04 17:54:25 +02:00
Laurent Destailleur
2e609d448c
Fix error message
2020-09-04 16:30:34 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Laurent Destailleur
661e3c7a11
Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive
...
FIX: Show bank account only when bank module is active (on invoices)
2020-09-03 13:19:32 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
03d0ccc1cc
Merge pull request #14621 from TobiasSekan/ShowNumAndClickOnPaymentArea
...
NEW Show header number and make it clickable on payment area
2020-09-03 12:20:38 +02:00
Laurent Destailleur
1a33cd91c9
Update index.php
2020-09-03 12:20:20 +02:00
stickler-ci
06e8e62d38
Fixing style errors.
2020-09-03 09:49:35 +00:00
Sekan, Tobias
8f37f66470
Show number and allow click on payment area
2020-09-03 11:36:11 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
5eca65f673
css
2020-08-29 02:35:24 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Sekan, Tobias
9c54f8831f
Show bank only when active (on new)
2020-08-28 13:08:04 +02:00
Sekan, Tobias
216e22e505
Show bank only when bank module is active
2020-08-28 12:53:30 +02:00
Laurent Destailleur
30838f01d4
Fix warning
2020-08-27 22:03:52 +02:00
Laurent Destailleur
d40f90fecb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 22:00:38 +02:00
Laurent Destailleur
ad63434f3e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/prelevement/index.php
2020-08-27 22:00:10 +02:00
Laurent Destailleur
3b4508b44f
Update paiement.class.php
2020-08-27 19:59:46 +02:00
Florian Mortgat
9b3f13458f
FIX: missing entity check
2020-08-26 16:02:31 +02:00
andreubisquerra
a5ab711b27
Change variable to pos_change
2020-08-23 22:22:05 +02:00
andreubisquerra
e36eb42568
Fix travis
2020-08-22 18:46:39 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
2ca0d67072
Removed section of files to download into POS
2020-08-18 11:20:02 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Juanjo Menent
3eb23d3325
FIX: MySql Strict mode
2020-08-11 10:12:19 +02:00
Juanjo Menent
4e6b7289f2
FIX: MySql Strict mode
2020-08-11 10:07:38 +02:00
Juanjo Menent
b1735b0f80
FIX: MySql Strict mode
2020-08-11 10:02:46 +02:00
Laurent Destailleur
e69616110d
Fix permission on page
2020-08-07 16:59:27 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
8b4e153f81
Doc
2020-08-05 20:05:59 +02:00
Laurent Destailleur
24a9a5ac2d
CSS
2020-08-05 19:42:36 +02:00
Laurent Destailleur
76624122dd
Fix regression: Restore filter on "alerte"
2020-08-05 16:05:29 +02:00
Laurent Destailleur
0ada919f65
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2020-08-04 21:22:56 +02:00
Laurent Destailleur
eefa2bcaba
FIX List of invoice waiting for direct debit
2020-08-04 21:12:28 +02:00
Laurent Destailleur
9d4e672475
FIX Debug direct debit module and credit transfer module
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
2020-08-04 21:12:03 +02:00
Laurent Destailleur
a3f7cbd63d
css
2020-08-04 21:07:56 +02:00
Laurent Destailleur
84bdfc4bb7
FIX List of invoice waiting for direct debit
2020-08-04 21:06:38 +02:00
Laurent Destailleur
5189e8beea
FIX Debug direct debit module and credit transfer module
2020-08-04 20:26:57 +02:00
Laurent Destailleur
d8da007e0e
css
2020-08-04 18:50:57 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
Laurent Destailleur
063b63d348
Fix phpcs
2020-08-04 00:36:45 +02:00
Laurent Destailleur
da76775fbd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/factures.php
htdocs/compta/prelevement/fiche-rejet.php
2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a
FIX Debug module direct debit order. Solve conflict with credit transfer
2020-08-03 20:16:33 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
8c34acbf55
FIX Warning if no bank account defined
2020-08-03 14:11:15 +02:00
Laurent Destailleur
e64b8eaf40
Fix debug credit transfer module
2020-08-03 11:21:13 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
3bfd7644a4
Fix return link
2020-08-01 20:17:49 +02:00
Laurent Destailleur
364fb05ed3
Fix phpcs
2020-07-28 09:46:31 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d
Fix several trouble with diret debit module and credit transfer module
2020-07-27 19:33:24 +02:00
Laurent Destailleur
52f238a351
Fix label
2020-07-25 14:50:09 +02:00
Laurent Destailleur
2d45fd04fe
Doc
2020-07-25 14:47:43 +02:00
Laurent Destailleur
e3126ec999
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
John Botella
fc1de5b4f3
Fix multicurecy option not applied
2020-07-23 11:10:18 +02:00
VERDOL Gauthier
55298317e3
FIX : wrong link to third invoice templates
2020-07-20 16:22:48 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
a059154fdf
FIX reposition
2020-07-10 13:59:54 +02:00
Laurent Destailleur
f92f279527
FIX Navigation from bank receipts
2020-07-10 13:56:54 +02:00
Laurent Destailleur
db6ed7a646
FIX Navigation from bank receipts
2020-07-10 13:40:33 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +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
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8
Fix menu organisation.
2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851
Fix regression
2020-07-06 11:31:05 +02:00
Laurent Destailleur
053a1a2230
Fix duplicate code
2020-07-06 11:22:30 +02:00
Laurent Destailleur
9cd8c3738f
Fix trans
2020-07-05 23:18:19 +02:00
Laurent Destailleur
54a77a604c
FIX Missing token
2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e
Look and feel v12
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-07-05 12:54:42 +02:00
Laurent Destailleur
c9e5536fbc
FIX Missing token
2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85
Look and feel v12
2020-07-05 12:46:15 +02:00
Laurent Destailleur
93a3efac3a
Fix phpcs
2020-07-04 19:26:51 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
e256ce5c4b
Debug credit transfer module
2020-07-03 19:27:23 +02:00
Laurent Destailleur
b88e159495
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
59049cd047
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:32 +02:00
Laurent Destailleur
53c5ec51b8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:40:59 +02:00
Laurent Destailleur
18fa4c4105
Update card.php
2020-07-03 00:38:31 +02:00
Laurent Destailleur
16b327f106
Debug module credit transfer
2020-07-02 15:45:11 +02:00
Laurent Destailleur
ae0c738980
FIX Entry from stripe intent were reported into SEPA payments
...
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
gauthier
6553c40bea
FIX : create a deposit with amount using comma didn't work
2020-06-30 11:23:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
...
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
a11f7d1070
Update list.php
2020-06-28 21:11:25 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Alexandre SPANGARO
0c60c9fd0d
FIX: SQL Problem in social contribution list
2020-06-25 20:53:03 +02:00
Laurent Destailleur
e4922f38ab
Add missing extrafield and trigger in template invoice creation
2020-06-25 14:01:38 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5
FIX: SQL Problem in customer invoice list
2020-06-24 14:03:16 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
...
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
...
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php
2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
...
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
Laurent Destailleur
f24e73141e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc
FIX #13877
2020-06-19 14:50:33 +02:00
florian HENRY
07923e0baf
fix f.fk_user_author unknow because after stange join with coma
2020-06-19 10:08:19 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account
...
Related to :
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976
Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix).
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
2020-06-18 20:56:46 +02:00
florian HENRY
a705cc41ae
fix: same feature on invoice as on orders
2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949
fix: same feature on invoice as on orders
2020-06-18 19:42:23 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
fded55ddef
Fix sepa supplier count
2020-06-18 03:44:26 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Florian Mortgat
3d69a1dc70
FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3
FIX BlindBoolean SQL injection reported by Christian Weiler
...
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507
Fix escape fields
2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658
Fix rounding
2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174
Fix supplier sepa
2020-06-14 21:49:12 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
Laurent Destailleur
abb8cd260f
Fix escape fields
2020-06-14 21:22:44 +02:00
Laurent Destailleur
c22a9781d8
Fix rounding
2020-06-14 21:21:18 +02:00
Laurent Destailleur
f0ca29cc6e
Fix supplier sepa
2020-06-14 21:19:31 +02:00
Laurent Destailleur
a48f263af2
Fix phpcs
2020-06-11 13:58:12 +02:00
Laurent Destailleur
5bc9e656bf
Fix phpcs
2020-06-11 13:03:21 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
70bdd59548
Fix trans
2020-06-08 11:52:43 +02:00
Laurent Destailleur
c386f4b2e3
Maxi debug of direct debit order
2020-06-08 11:43:20 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
4020d97362
FIX Can create a credit note on situation invoice if previous is also
...
credit note
2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
Vaadasch
7b53ee2a6f
Update byratecountry.php
...
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
2020-06-07 14:13:57 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
5669eb81af
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 15:39:50 +02:00
Laurent Destailleur
919cc0da87
Fix num payment
2020-06-06 15:39:18 +02:00
Florian Mortgat
c393f8149c
FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date
2020-06-04 11:29:51 +02:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
6123596ec9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/fichinter/list.php
2020-05-31 00:28:40 +02:00
Laurent Destailleur
2b317120d3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
e8016a5e7e
Fix credit-transfer vs direct debit
2020-05-30 23:46:14 +02:00
kamel
1e208e537f
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:24:07 +02:00
kamel
a4800f7b9b
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:18:27 +02:00
Laurent Destailleur
791d147992
Merge branch 'NewCustomerInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:29:59 +02:00
Laurent Destailleur
537b291fab
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
2020-05-28 12:24:55 +02:00
Laurent Destailleur
f66555b396
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-27 23:38:46 +02:00
Laurent Destailleur
6881610892
Doxygen
2020-05-27 23:23:01 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
15f2165c12
Fix work on payment by bank transfer (avoid confusion between record)
2020-05-27 20:14:11 +02:00
Florian Mortgat
954c29786e
FIX 10.0 - pagination in prelevement/bons.php
2020-05-27 12:15:42 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
c67eeeaf6c
CSS
2020-05-25 11:30:52 +02:00
Laurent Destailleur
61545703d1
CSS
2020-05-25 10:58:18 +02:00
Laurent Destailleur
47465f4108
Fix for situation invoice (exclude credit not when searching last
...
invoice to use)
2020-05-25 00:20:00 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-24 17:58:18 +02:00
Laurent Destailleur
6056ed2755
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-24 01:02:08 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule
2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Laurent Destailleur
7bfbf3c88b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-23 20:20:53 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Tobias Sekan
58e32aa2ff
Fix not wokring default values for date (re...)
2020-05-23 14:22:30 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
...
FIX not working default date values for new invoices
2020-05-23 14:21:50 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices
...
FIX not working default values for payment on new invoices
2020-05-23 13:33:01 +02:00
stickler-ci
2873f4dacf
Fixing style errors.
2020-05-22 06:08:12 +00:00
Tobias Sekan
53080be245
fix not working default values for payment
2020-05-22 08:01:29 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Tobias Sekan
2efe3d7da0
Fix not wokring default values for date (re...)
2020-05-21 09:31:06 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
Laurent Destailleur
346082b153
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 19:59:24 +02:00
gauthier
f3582d891a
FIX : We must only rename current bank receipt
2020-05-19 15:35:37 +02:00
Laurent Destailleur
3e187f8ce0
Fix add check on size limit
2020-05-19 03:36:29 +02:00
Laurent Destailleur
88c40633d5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
2020-05-18 15:54:39 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled
2020-05-18 14:52:33 +02:00
Laurent Destailleur
bd564486ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-17 20:03:09 +02:00
Laurent Destailleur
106fe7bde6
Clean conflict between direct debit and direct credit orders.
2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Laurent Destailleur
5933aba38c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
91f87d6834
Fix bad param of getNomUrl
2020-05-15 13:52:35 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod
...
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +02:00
Laurent Destailleur
ab07330668
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
DEMAREST Maxime (Indelog)
ac0b735131
Fix use date_ech for social contributions in accounting-file.php
2020-05-13 18:01:00 +02:00
DEMAREST Maxime (Indelog)
ee6e717f46
Add payment loan in accounting-files.php
2020-05-13 17:47:30 +02:00
DEMAREST Maxime (Indelog)
872518a91f
Add total by credit/debit for accounting-file.php
2020-05-13 16:54:53 +02:00
DEMAREST Maxime (Indelog)
5f400d27b4
Add preview file in compta/accounting-files.php
2020-05-13 15:01:32 +02:00
DEMAREST Maxime (Indelog)
fcb3b112d9
Fix use datep field for various payment in accouting-files.php
2020-05-13 09:31:14 +02:00
stickler-ci
b7ae5ffa1d
Fixing style errors.
2020-05-13 06:12:45 +00:00
DEMAREST Maxime (Indelog)
0850570e95
Fix and imporve some points for compta/accounting-flles.php
...
* Fix zip generation for accouning-files if line has no document.
The zip file generated if $filesarray contain a line with empty 'files'
was unsustainable because it try to add empty files.
* Add clickable link to jump on card for other line than Invoice and
Supplier Invoice
* Add various payment
* Use label as ref for paiements of salaries line to display more explicit line
2020-05-13 08:00:06 +02:00
Laurent Destailleur
b5f3be4599
Clean phpcs rule file
2020-05-13 00:29:46 +02:00
gauthier
fc2f2c6da7
FIX : wrong url param
2020-05-12 17:41:21 +02:00
Laurent Destailleur
e4611f2950
Fix filter on categories
2020-05-12 03:36:33 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
...
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
f23451e1c9
Update facture.class.php
2020-05-07 23:04:52 +02:00
stickler-ci
7514a625fd
Fixing style errors.
2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php
...
Auto-update dates (if not empty) of services when cloning facture.
Actual code is only for month by month.
If empty (start or end) => do nothing
If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month
Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
2020-05-07 22:09:55 +02:00
Laurent Destailleur
03fddd48af
Clean some constructors
2020-05-07 12:14:45 +02:00
Laurent Destailleur
6c8d302dd9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/list.php
htdocs/compta/prelevement/rejets.php
htdocs/fourn/commande/index.php
2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/list.php
htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f
Fix blank line at end of control structure
2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a
Fix somes code formating errors
2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78
Add include various payments and loans in accounting report
...
For simplified accouning, behaviour not enable by default and must be
enabed in simplified accounting module admin page (or by global
settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
Tobias Sekan
3de77cff3f
fix lint errors
2020-05-06 12:11:54 +02:00
Tobias Sekan
d0efa79efa
Add customer invoice area
2020-05-06 11:34:31 +02:00
atm-quentin
b6aa766c72
FIX stickler
2020-05-06 09:37:17 +02:00
atm-quentin
eab69c3a59
NEW multiselect categorie client stats facturation
2020-05-05 16:15:33 +02:00
atm-quentin
1b35380dda
NEW stats invoice graph with 3 bars
2020-05-05 16:13:04 +02:00
Laurent Destailleur
797beef79f
Fix
2020-05-05 15:26:41 +02:00
Laurent Destailleur
b7fe2b31cd
Merge pull request #13813 from oscim/patch-38
...
Update list.php
2020-05-05 15:22:29 +02:00
kamel
db591cdcd8
FIX: show value of the extrafields in the bank list
2020-05-05 14:47:31 +02:00
gauthier
c14b6884e3
FIX : missing hook init + table class + $page not set
2020-05-05 10:03:19 +02:00
oscim
c7753dd2e0
Update list.php
2020-05-05 09:44:46 +02:00
stickler-ci
204c788dec
Fixing style errors.
2020-05-05 06:56:54 +00:00
oscim
d6de46cc05
Update list.php
...
Add massaction for payment invoice
2020-05-05 08:54:52 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype
...
Add possibility to filter stats by ThirdParty type and categorie
2020-05-01 22:05:06 +02:00
Laurent Destailleur
c27b3c5966
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
Laurent Destailleur
4c27ae6530
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce
FIX A variable was erased by a temporary variable
2020-04-30 18:45:00 +02:00
DEMAREST Maxime (Indelog)
790cffb7ae
Correct select label for categories in stats pages
2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
398b0234ea
Correct label for select thirdparty categorie in invoice stats
2020-04-29 14:10:06 +02:00
DEMAREST Maxime (Indelog)
1bd9372022
Forgot comments to document news params for the modified methods
2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0
Add possibility to filter stats by ThirdParty type and categorie
2020-04-29 09:17:44 +02:00
Laurent Destailleur
f8dfe886ac
Fix css
2020-04-28 20:52:24 +02:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
Laurent Destailleur
fb8bdefbaa
Look and feel v12
2020-04-28 02:10:26 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
31ba277da7
Fix phpcs
2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280
Enable more PHPCS rules
2020-04-25 19:27:42 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a
Removed useless translation keys
2020-04-25 12:43:41 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
54d641020f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php
2020-04-24 19:01:08 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
florian HENRY
a685026756
fix: remove php warning
2020-04-24 17:22:35 +02:00
Laurent Destailleur
b77892451f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552
FIX Situation invoice take into account the credit notes.
2020-04-24 15:57:08 +02:00
Laurent Destailleur
b2b580f6fb
Report error
2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad
Report error
2020-04-24 15:21:02 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
stickler-ci
2633e90890
Fixing style errors.
2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice
...
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a
Fixing style errors.
2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
...
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02:00
Laurent Destailleur
3a9add0e70
FIX #13663
2020-04-23 13:37:43 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php
2020-04-22 19:16:58 +02:00
Laurent Destailleur
1ef89eb1a1
Fix $mysoc global not loaded.
2020-04-21 14:14:49 +02:00
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +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
Laurent Destailleur
40b3db940c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-20 14:44:36 +02:00
Laurent Destailleur
b90217d860
Merge pull request #13655 from frederic34/patch-4
...
fix indent
2020-04-20 14:38:17 +02:00
Laurent Destailleur
78474af486
Link missing
2020-04-20 03:14:44 +02:00
Frédéric FRANCE
5992318af7
Update card.php
2020-04-19 21:49:37 +02:00
Frédéric FRANCE
61e76ef25e
Update api_bankaccounts.class.php
2020-04-19 21:47:30 +02:00
Laurent Destailleur
018cfdf54b
FIX Field balance before and after sometimes not visible in bank entries
2020-04-18 16:14:37 +02:00
Laurent Destailleur
de74c447cc
Fix sanitize amount
2020-04-18 16:05:26 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
...
NEW : Extend retained warranty to be available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
b0515c626b
Look and feel v12
2020-04-18 00:09:24 +02:00
Laurent Destailleur
ee26390f89
Look and feel v12
2020-04-17 19:15:22 +02:00
Laurent Destailleur
6fd34f592d
Fix default value
2020-04-17 19:07:30 +02:00
Laurent Destailleur
ea60d0be63
FIX #13618
2020-04-17 10:27:38 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
ptibogxiv
284f269213
Update api_bankaccounts.class.php
2020-04-15 19:32:45 +02:00
atm-quentin
f7c07640dd
viewstatut to search_status
2020-04-15 15:01:00 +02:00
ATM john
e6669348e1
Fix dom manipulation on creation
2020-04-15 11:09:34 +02:00
ATM john
4b4f69c76a
fix indentation
2020-04-15 10:52:28 +02:00
stickler-ci
e6b29aa0f0
Fixing style errors.
2020-04-15 08:48:45 +00:00
ATM john
a9c9292137
Merge branch '12.0_new_extend_retained_warranty' of github.com:atm-john/dolibarr into 12.0_new_extend_retained_warranty
2020-04-15 10:45:53 +02:00
ATM john
9a1993f71c
Fix retained warranty default value
2020-04-15 10:44:07 +02:00
stickler-ci
cbf6afb4a0
Fixing style errors.
2020-04-14 12:13:38 +00:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Laurent Destailleur
a72b262f5b
FIx #13592
...
Conflicts:
htdocs/compta/bank/line.php
2020-04-13 14:52:06 +02:00
Laurent Destailleur
4ab3bf99ec
FIx #13592
2020-04-13 14:50:55 +02:00
Laurent Destailleur
b54e3fb18c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-13 14:39:10 +02:00
Laurent Destailleur
f726fcdcd8
FIX #13593
2020-04-13 14:32:15 +02:00
Scrutinizer Auto-Fixer
387ea73bf3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
b6baba7651
Removed deprecated var
2020-04-12 18:59:22 +02:00
Laurent Destailleur
92b6b1a042
Look and feel v12
2020-04-12 18:13:43 +02:00
Laurent Destailleur
4a6ffd2619
Merge pull request #13570 from frederic34/patch-6
...
Add table_ref_field to facture-rec class
2020-04-12 17:17:43 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
2e27355dec
FIX #13569
2020-04-12 16:51:35 +02:00
Frédéric FRANCE
251f6d0cb1
Update facture-rec.class.php
2020-04-11 22:53:45 +02:00
Frédéric FRANCE
e9aa27d731
Update facture-rec.class.php
2020-04-11 21:06:33 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
gauthier
1f471d46eb
FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report
2020-04-10 15:51:51 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
...
add in default search
2020-04-10 12:12:28 +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
Anthony Berton
96f1c961b7
Update list.php
2020-04-10 10:55:14 +02:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
...
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
efd6d14c1a
Merge pull request #13505 from atm-florian/develop
...
fix php warning
2020-04-08 14:40:59 +02:00
Laurent Destailleur
215c7b0e32
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/compta.lang
2020-04-08 11:42:43 +02:00
Laurent Destailleur
146ead4d04
Code comment
2020-04-08 11:39:22 +02:00
Laurent Destailleur
df81065f73
MAIN_VIEW_LINE_NUMBER_IN_LIST
2020-04-08 11:23:31 +02:00
stickler-ci
0ce44251f7
Fixing style errors.
2020-04-08 08:50:16 +00:00
Tobias Sekan
23645b7865
Add confirm for delte file in facture
2020-04-08 10:30:51 +02:00
Laurent Destailleur
8e7ad726b2
NEW Easier way to setup the different types of tax. Better visibility.
...
FIX edit of tax stamp regenerated the PDF.
2020-04-07 14:06:08 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
florian HENRY
48da8c315f
fix php warning
2020-04-06 12:21:20 +02:00
Laurent Destailleur
03b09f1d28
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:14:03 +02:00
Laurent Destailleur
13b47774e2
FIX #13424
2020-04-05 11:55:43 +02:00
Maxime Kohlhaas
fd5b2ba391
New supplier turnover by product service report
2020-04-04 23:29:45 +02:00
Maxime Kohlhaas
60bd0e49ec
Fix missing token
2020-04-04 18:57:51 +02:00
Maxime Kohlhaas
fe876b96fe
Fix links + getEntity
2020-04-04 18:49:30 +02:00
Maxime Kohlhaas
1adfe5c21f
New supplier turnover by product service report
2020-04-04 15:45:32 +02:00
Maxime Kohlhaas
863f8dd1d6
New supplier turnover by thirdparty report
2020-04-04 15:38:22 +02:00
Maxime Kohlhaas
67f9b218c5
New supplier turnover report
2020-04-04 15:38:01 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
b8c2dd6025
Look and feel v12
2020-04-02 15:11:46 +02:00
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master
...
NEW: Cash Control in TakePOS
2020-04-02 12:51:36 +02:00
Laurent Destailleur
bb9a4324d1
Merge pull request #13471 from atm-florianm/NEW_add_author_column_on_invoice_list_and_supplier_invoice_list
...
NEW: "author" column in the client/supplier invoice lists
2020-04-02 12:40:51 +02:00
Laurent Destailleur
5d9d62f185
Merge pull request #13480 from atm-florian/develop
...
fix: correct hook init invoice_rec list
2020-04-02 12:38:32 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
florian HENRY
609de965b1
fix: hook init invoicerec list normalyse
2020-04-02 10:45:14 +02:00
stickler-ci
9476fbc3e7
Fixing style errors.
2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204
Fix ##13474: copy extrafields of LINES from a draft invoice to an
...
invoice template
2020-04-02 01:10:56 +02:00
Laurent Destailleur
70706d9ea7
FIX Missing token and take into account max date when it can.
2020-04-01 18:48:45 +02:00
Florian Mortgat
f52af23396
NEW: "author" column in the client/supplier invoice lists
2020-04-01 17:09:01 +02:00
ATM john
81adc6913e
change conf usage
2020-04-01 12:12:30 +02:00
ATM john
79fe664365
fix merge not applied
2020-03-31 16:43:38 +02:00
stickler-ci
004d9381f5
Fixing style errors.
2020-03-31 14:36:42 +00:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
jove@bisquerra.com
d9614ac6fc
Integrate Cash Control in TakePOS
2020-03-30 20:05:45 +02:00
Laurent Destailleur
04a5929e91
Merge pull request #13431 from aspangaro/12.0_a25
...
Typo
2020-03-30 18:52:10 +02:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Alexandre SPANGARO
e1611a8366
Typo
2020-03-27 06:16:24 +01:00
Laurent Destailleur
3ae3e9a16e
Remove $_POST
2020-03-26 02:21:50 +01:00
Laurent Destailleur
d3debccabe
FIX bad value in currency into discount created from down payment
2020-03-26 02:14:57 +01:00
Laurent Destailleur
d2163c95d6
Save the vat src code when converting down payment into discount
2020-03-26 02:13:34 +01:00
Laurent Destailleur
88d98acbba
FIX #13410
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
ba000dbcfd
FIX #13410
2020-03-26 01:24:27 +01:00
Laurent Destailleur
2e5bfb207f
Fix responsive
2020-03-25 23:50:05 +01:00
Alexandre SPANGARO
c3e5cf901d
Work on split module fournisseur
2020-03-24 22:20:25 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
f4a52470e3
Graph use color of status
2020-03-23 19:46:43 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
d662bb97dc
Debug parallel sale feature
2020-03-23 15:02:15 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
87e808fec4
Fix phpcs
2020-03-19 22:07:20 +01:00
Laurent Destailleur
a413e2861e
Fix edit html
2020-03-19 21:13:15 +01:00
Laurent Destailleur
d9f616d6e3
Avoid file xxx_preview-1.png into export
2020-03-19 15:59:49 +01:00
Laurent Destailleur
303961b0a6
Fix trans
2020-03-19 12:10:22 +01:00
Laurent Destailleur
8e1ffa5144
Fix management of token
2020-03-19 10:52:07 +01:00
Laurent Destailleur
c94c33696a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-19 09:58:04 +01:00
Laurent Destailleur
ea13c707a2
Merge pull request #13380 from atm-john/11.0_fix_import_lines_from_object_for_situation_invoices
...
FIX import lines from object for situation invoices
2020-03-18 19:25:04 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
...
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
ATM john
c767e553d3
fix import line from object default value for situations
2020-03-18 10:59:13 +01:00
ATM john
7b8cafb710
remove var_dump
2020-03-18 10:34:44 +01:00
ATM john
d3aeec0a7c
Fix situation value transmission
2020-03-18 10:30:15 +01:00
Ferran Marcet
1fe4e4415e
FIX: Bank movements color is not showing
2020-03-18 09:27:08 +01:00
ATM john
075757eb3d
Fix situation value transmission
2020-03-17 16:49:05 +01:00
Laurent Destailleur
9525289488
Fix return code of some API
2020-03-17 13:50:20 +01:00
ATM john
cb43928a5d
Fix radio label target
2020-03-17 12:29:14 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
621c4ff4e7
Fix phpcs
2020-03-15 19:52:46 +01:00
Laurent Destailleur
22e8fdb46b
Enhance #13033
2020-03-15 13:57:31 +01:00
stickler-ci
1a97e7283f
Fixing style errors.
2020-03-15 12:09:52 +01:00
andreubisquerra
d7150fb592
Change cash control procedure
2020-03-15 12:09:52 +01:00
Laurent Destailleur
8192e9dc67
FIX Missing token in form
2020-03-14 03:02:49 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
...
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
VESSILLER
1379b2ce87
FIX travis errors
2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
...
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink
2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type
2020-03-12 09:44:43 +01:00
Laurent Destailleur
a9847f0d40
Merge pull request #13308 from TobiasSekan/NewCategoryFilterForBankList
...
NEW category filter for bank list
2020-03-11 16:50:12 +01:00
Laurent Destailleur
e1c7222172
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-09 20:39:05 +01:00
Laurent Destailleur
e66313d47e
FIX use bad var to check if total is positive for each VAT rate when
...
validating invoice.
2020-03-09 20:06:47 +01:00
Laurent Destailleur
82f0d8a3bc
Fix bad params
2020-03-09 17:38:47 +01:00
Tobias Sekan
9dd362a22c
NEW Category filter on bank list
2020-03-09 11:43:15 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201
FIX #13263
2020-03-04 00:53:07 +01:00
Laurent Destailleur
71f19b4e5e
FIX #13267
2020-03-04 00:38:04 +01:00
Laurent Destailleur
70d4e5d7e3
Fix button should not be visible
2020-03-03 23:51:17 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312
...
FIX doc
2020-03-03 22:53:51 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20
...
FIX: Nowrap on amount
2020-03-03 21:44:54 +01:00
ptibogxiv
a71356f0ed
FIX doc
2020-03-03 13:41:19 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
Alexandre SPANGARO
aeb3f70df7
FIX: Nowrap on amount
2020-03-03 07:26:51 +01:00
Laurent Destailleur
46bf65704a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Laurent Destailleur
c9d7ea8998
Merge pull request #13241 from ptibogxiv/patch-309
...
NEW: api invoice get by ref
2020-03-02 21:39:17 +01:00
Laurent Destailleur
c8b51066e5
NEW Add due date in feature "Export accounting documents"
2020-03-02 16:00:07 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php
2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php
2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6
Fixing style errors.
2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref
2020-03-01 18:33:13 +01:00
Alexandre SPANGARO
da99c89c26
FIX: typo on ckeck method
2020-03-01 05:21:51 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
f5a07dfb7e
Add status into popup
2020-02-28 18:57:17 +01:00
Laurent Destailleur
87b3cf9765
FIX Bad link to template invoices
2020-02-28 12:01:43 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Marc de Lima Lucio
5d1f91f8ac
FIX: muticurrency columns: remove useless column totals that mix currencies together
2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
Laurent Destailleur
921dacf695
Fix remove $_POST
2020-02-26 16:58:45 +01:00
Laurent Destailleur
114e41108d
FIX sort link
2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46
FIX Bad sort link in accounting report
2020-02-26 06:43:52 +01:00
Laurent Destailleur
4831d22354
FIX sort link
2020-02-26 06:43:21 +01:00
Laurent Destailleur
6cf6719cfb
FIX Bad sort link in accounting report
2020-02-26 06:39:02 +01:00
ATM john
4865e34cc2
fix missing visibility
2020-02-25 23:02:13 +01:00
Laurent Destailleur
a18fda6b3d
Fix data on popup
2020-02-25 19:59:53 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +01:00
Laurent Destailleur
457d0668c8
Look and feel v12
2020-02-24 05:23:34 +01:00
Laurent Destailleur
6366881f91
FIX #13175
2020-02-24 00:41:25 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
Laurent Destailleur
f931b92d36
Merge branch 'new-takepos-batch-decrement' of
...
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
2020-02-23 22:49:03 +01:00
Laurent Destailleur
189c0d675b
Fix memory report. Xdebug no more required. Try = null instead of unset.
2020-02-23 22:05:59 +01:00
Laurent Destailleur
0d474b2ec9
CSS
2020-02-22 14:20:42 +01:00
Laurent Destailleur
1d34ef213c
Fix error management
2020-02-22 12:19:46 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +01:00
Frédéric FRANCE
8d507c4f32
fix workflow with multicurrency
2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7
...
fix workflow with multicurrency
2020-02-21 18:12:27 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
89b7c8dfd6
NEW Can select which element to export in export accounting documents.
2020-02-21 14:20:05 +01:00
VESSILLER
ec19b2feef
FIX phpcs nestling too high level
2020-02-21 12:00:16 +01:00
VESSILLER
71c9b94b22
NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
2020-02-21 11:08:34 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency
2020-02-20 15:11:31 +01:00
Laurent Destailleur
52c7f908a0
Doxygen
2020-02-20 14:02:27 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
e73d83767c
Fix phpcs
2020-02-20 12:35:48 +01:00
Laurent Destailleur
7796724d63
Update list.php
2020-02-20 01:07:41 +01:00
Laurent Destailleur
960302c012
Merge branch 'develop' into patch-35
2020-02-20 01:07:08 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
44c2909696
FIX Multicompany compatibility
2020-02-19 16:08:33 +01:00
Laurent Destailleur
3fafbb372b
Remove call of $mc->dao than hangs. Replaced with $mc use.
2020-02-19 15:51:27 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
stickler-ci
028566616d
Fixing style errors.
2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Pierre Ardoin
bebc37abe3
Update list.php
2020-02-19 08:54:10 +01:00
Pierre Ardoin
34d7fb887f
Show project Ref support if enable
...
Add search and Project Ref column in the list, only if project module is enable.
2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a
FIX #13118
2020-02-19 03:37:28 +01:00
Laurent Destailleur
43b173ef76
FIX #13131
2020-02-19 01:23:54 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
35ada37d4d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-02-14 19:12:11 +01:00
Laurent Destailleur
bb895cb1d8
FIX ref_client not visible in tooltip.
2020-02-13 18:00:59 +01:00
Laurent Destailleur
c196342fd8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07
Fix phpcs
2020-02-13 15:43:53 +01:00
Laurent Destailleur
306b8d190f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a
Fix phpcs
2020-02-13 15:42:41 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Marc de Lima Lucio
fa78af1996
Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0
2020-02-13 12:18:16 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
e511deb8e7
FIX #13096
2020-02-13 11:39:08 +01:00
Laurent Destailleur
700e01d661
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-02-12 22:50:56 +01:00
Laurent Destailleur
75774ec6c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Marc de Lima Lucio
b1b00450a9
FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one
2020-02-12 12:10:48 +01:00
Marc de Lima Lucio
de8660fb55
FIX: situation invoice: allow excess paid to be converted to discount
2020-02-12 12:09:03 +01:00
stickler-ci
27dd9aec9f
Fixing style errors.
2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e
FIX - hasDelay for retained warranty
2020-02-11 16:54:27 +01:00
stickler-ci
416cb3016d
Fixing style errors.
2020-02-11 13:15:23 +00:00
oscim
8b67793409
report and apply GETPOST method
...
report and apply GETPOST method for $dateech, $dateperiod, $label
2020-02-11 14:13:08 +01:00
Laurent Destailleur
f70dd8ec06
Clean code. Load thirdparty for correct lang before generating doc
2020-02-10 00:22:53 +01:00
Laurent Destailleur
5f507b2df5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/tva/card.php
2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
2020-02-08 16:00:06 +01:00
Laurent Destailleur
1a167aa5b4
Update card.php
...
Conflicts:
htdocs/compta/tva/card.php
2020-02-08 15:12:55 +01:00
Laurent Destailleur
10790420ba
Merge pull request #13051 from oscim/patch-19
...
report and apply GETPOST method for $datev and $datep
2020-02-08 15:07:18 +01:00
Laurent Destailleur
544e05a7dd
Update card.php
2020-02-08 15:06:45 +01:00
Laurent Destailleur
9f9002d6a6
Update field definition
2020-02-07 16:05:04 +01:00
Laurent Destailleur
fe7b79c83c
Fix definition of objects
2020-02-07 15:51:14 +01:00
atm-lena
ecea726323
FIX CA by prod list filter
2020-02-07 15:01:37 +01:00
oscim
e408ea463c
report and apply GETPOST method for $datev and $datep
...
fix for usage GETPOST() for input $datev and $datep
And report definition $datev and $datep in top ection file for support GET params for action create
2020-02-07 09:31:58 +01:00
Laurent Destailleur
9c73bb1aef
NEW Can create an deposit from order using a percentage of qty.
2020-02-06 14:15:41 +01:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:09 +01:00
Laurent Destailleur
1875b6a49b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
af7a5b510d
Fix phpcs
2020-02-04 14:47:30 +01:00
Laurent Destailleur
37617bbce8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 03:48:27 +01:00
Laurent Destailleur
a30da7860f
FIX #12892
2020-02-03 03:32:31 +01:00
Laurent Destailleur
4765198af2
Clean code from using deprecated field amount
2020-02-02 19:03:37 +01:00
Laurent Destailleur
d827e3289a
Removed no more used field "amount" in llx_facture
2020-01-31 15:12:17 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Michael Jeanmotte
f1f83656f1
Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259
2020-01-29 22:54:35 +01:00
Laurent Destailleur
e796a2eda9
Add fields array on common objects
2020-01-29 22:38:14 +01:00
Laurent Destailleur
1e879126cd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285
FIX Pending amount to pay must be zero if invoice close for anticipated
...
payment.
2020-01-29 17:56:09 +01:00
oscim
d224c711cf
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 11:07:30 +01:00
oscim
862da5b646
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 08:08:15 +01:00
Laurent Destailleur
9acda3545e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices
...
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
2020-01-27 09:49:49 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
Laurent Destailleur
cf6b9f7d03
Merge pull request #12918 from atm-florian/11_fixWithdrwLineList
...
fix SEPA lines with limit select and working pagination
2020-01-26 22:25:01 +01:00
Laurent Destailleur
14f1f98b59
Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination
...
10 fix create sepa limit and pagination
2020-01-26 22:24:11 +01:00
Pierre Ardoin
c64acb1a9c
Permissions Issue
...
fixes an issue that displayed the "restricted area" banner despite user permissions.
2020-01-25 15:19:46 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
f2771b3365
FIX #12896
2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
209ebfbe2f
Fix trans
2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae
Debug cashfence feature
2020-01-24 15:59:36 +01:00
Laurent Destailleur
779cd94b0e
Debug cashfence feature
2020-01-24 15:26:18 +01:00
florian HENRY
2f0144b19b
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11_fixWithdrwLineList
2020-01-24 13:22:24 +01:00
florian HENRY
dc3eafccb9
add hook into withdraw list
2020-01-24 13:22:04 +01:00
Laurent Destailleur
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
f2ab3426ea
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-23 19:42:22 +01:00
Laurent Destailleur
e1123c63a9
Fix field label
2020-01-23 19:42:00 +01:00
Laurent Destailleur
df90e432d4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/sociales/card.php
2020-01-23 19:39:05 +01:00
Laurent Destailleur
b74d37338b
Fix trans
2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64
Fix label
2020-01-23 19:32:34 +01:00
Laurent Destailleur
f59cb65a21
Fix label
2020-01-23 19:32:15 +01:00
Laurent Destailleur
423be8a139
FIX Label of status of social contribution
2020-01-23 19:30:02 +01:00
Laurent Destailleur
5d4ea0b4c4
FIX Label of status of social contribution
2020-01-23 19:28:56 +01:00
florian HENRY
62caf3cbfc
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:45:16 +01:00
florian HENRY
fd0daad959
fix SEPA line with limit select and working pagination
2020-01-23 16:49:06 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
a9790f355d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 11:32:40 +01:00
Laurent Destailleur
dc1600b3c2
Fix responsive
2020-01-21 10:54:31 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085
Fix init of specimen
2020-01-21 00:20:03 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
5f64531e9b
Fix look and feel v11
2020-01-20 12:39:25 +01:00
Laurent Destailleur
b8938b8d19
Fix look and feel v11
2020-01-20 02:18:00 +01:00
Laurent Destailleur
7c5485288b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 20:34:20 +01:00
Laurent Destailleur
62b9fbb67f
Fix link
2020-01-19 20:33:55 +01:00
Laurent Destailleur
6b6c9efe5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:56:21 +01:00
Laurent Destailleur
5a702eb50c
Fix filter on amount
2020-01-19 19:55:57 +01:00
Laurent Destailleur
99f679493b
Fix search
2020-01-19 19:51:40 +01:00
Laurent Destailleur
526ae83e8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
19ab802aaf
Fix disabling of balance
2020-01-19 19:48:19 +01:00
Laurent Destailleur
d6bdbccf4f
Fix link
2020-01-19 19:33:57 +01:00
Pierre Ardoin
e4eb8883fe
Fix double display of create credit note button
...
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
2020-01-19 19:10:10 +01:00
Laurent Destailleur
8c8d492a48
FIX Protection to avoid blocking situation with negative lines
2020-01-19 15:19:07 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +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
82deccea08
Fix bad link
2020-01-17 14:41:42 +01:00
Laurent Destailleur
fe6bcd8a31
Fix missing value in popup
2020-01-17 14:32:22 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Laurent Destailleur
76e7c147b3
Look and feel v11
2020-01-16 18:03:57 +01:00
Laurent Destailleur
849c78f4cd
Doc
2020-01-16 10:12:39 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
76aedc9264
Merge pull request #12365 from aspangaro/11.0_a2
...
NEW Invoice list - Add date start & date end
2020-01-15 20:50:20 +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
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +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
atm-arnaud
ae4554af65
FIX drafts are now implemented for stats
2020-01-08 11:27:52 +01:00
Laurent Destailleur
ccceaac358
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 17:20:54 +01:00
Laurent Destailleur
ec2ea612ae
Fix GETPOST
2020-01-06 17:19:49 +01:00
Laurent Destailleur
57bbac2015
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 14:09:46 +01:00
Laurent Destailleur
58ff3e563d
Fix link a href
2020-01-06 02:21:42 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Alexandre SPANGARO
f14aaf5e50
FIX Some problems on conciliation with others modules
2020-01-03 16:35:02 +01:00
Laurent Destailleur
2c20b25a29
Suggest another value than "bad customer" to close an invoice paid
2020-01-02 18:02:53 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Laurent Destailleur
b50cb2a65d
Fix solution to solve a blocking situation (credit note both refunded
...
and consumed)
2020-01-01 19:04:14 +01:00
Laurent Destailleur
eae0800021
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 11:24:10 +01:00
Laurent Destailleur
f11a119ab0
Clean dead code
2019-12-31 16:50:21 +01:00
Laurent Destailleur
175894db26
FIX Status of direct debit payment after setting to paid.
2019-12-31 14:48:52 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Laurent Destailleur
8202a67e4e
Fix look and feel v11
2019-12-25 23:15:56 +01:00
Alexandre SPANGARO
44400b7866
FIX : Some issues on salary payment
2019-12-24 07:22:25 +01:00
Alexandre SPANGARO
ab0f77b467
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
2019-12-23 21:15:17 +01:00
Alexandre SPANGARO
384651db46
Merge remote-tracking branch 'upstream/develop' into 11.0_a2
2019-12-23 21:01:17 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
VESSILLER
c39e45b81a
FIX set due date in object in create invoice
2019-12-23 10:57:51 +01:00
Laurent Destailleur
daae053e39
Debug CashFence feature
2019-12-22 20:02:18 +01:00
Laurent Destailleur
3036ff637f
Fix bad url
2019-12-22 19:49:39 +01:00
Laurent Destailleur
3ae5901a64
Fix look and feel v11
2019-12-22 19:46:36 +01:00
Laurent Destailleur
dd9f25b13a
CSS
2019-12-22 16:33:15 +01:00
Laurent Destailleur
39737c7c4b
Fix opacity on text with a href links inside
...
Fix var not defined
2019-12-22 13:19:14 +01:00
Laurent Destailleur
d9a1e1b348
Fix several non dolibarr behaviour on input of salary payments
2019-12-19 10:01:11 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90
Fix creation/update of expense reports
...
Fix export of accounting documents
2019-12-18 23:07:26 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
138215fc3f
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
...
european users.
2019-12-16 22:30:16 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
49a8b4544e
Fix look and feel v11
2019-12-15 19:32:37 +01:00
Laurent Destailleur
9685b56375
Fix warning
2019-12-15 15:03:22 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
8fbaae3fef
Merge pull request #12694 from frederic34/patch-8
...
doxygen
2019-12-14 13:43:47 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Regis Houssin
a527e72124
FIX #12688
2019-12-12 16:35:07 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen
2019-12-12 08:17:14 +01:00
Frédéric FRANCE
269e53583d
doxygen
2019-12-11 23:46:12 +01:00
Frédéric FRANCE
66805a502a
doxygen
2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen
2019-12-11 20:33:58 +01:00
Laurent Destailleur
5454380834
CSS
2019-12-11 19:14:41 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Laurent Destailleur
738526e77e
Fix br
2019-12-10 14:04:50 +01:00
Laurent Destailleur
fe44d3a4fa
FIX #12674
2019-12-10 14:02:03 +01:00
Laurent Destailleur
2d97c0bb79
Try better fix for #12674
2019-12-10 13:55:45 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template
2019-12-09 16:05:23 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card
...
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
2019-12-09 15:59:55 +01:00
Laurent Destailleur
f28e4c14e8
FIX #12644
2019-12-09 13:40:26 +01:00
Laurent Destailleur
0a3b2987d1
Merge pull request #12657 from frederic34/patch-19
...
doxygen
2019-12-09 10:47:16 +01:00
Laurent Destailleur
eb0d20b77e
Fix label of country
...
Fix div empty
2019-12-09 09:16:59 +01:00
Frédéric FRANCE
c05ba624ce
Update deplacement.class.php
2019-12-08 22:46:22 +01:00
Frédéric FRANCE
3db84df60e
Update card.php
2019-12-08 22:45:10 +01:00
Frédéric FRANCE
6c5629b5a5
Update deplacement.class.php
2019-12-08 22:39:33 +01:00
Frédéric FRANCE
49f22facef
doxygen
2019-12-08 22:37:19 +01:00
Florian Mortgat
6227d14cf3
NEW 10.0: link to template of origin in bill cards for bills created from a template
2019-12-06 13:48:24 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Laurent Destailleur
93d66d8213
Debug v11
2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
2019-12-05 15:34:41 +01:00
Laurent Destailleur
5f148be56f
Fix responsive
2019-12-04 16:43:56 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +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
Laurent Destailleur
6f7343b14f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb
Fix look and feel v11
2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage
...
Factoring token usage
2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748
factoring token usage
2019-12-01 10:20:11 +01:00
Laurent Destailleur
1d564c2a39
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit
...
Fix deposit line was not translated in deposit invoice
2019-12-01 00:44:17 +01:00
Maxime Kohlhaas
3c639772d9
Fix #11228 : VAT dates regarding fiscal year
2019-11-30 17:16:16 +01:00
Maxime Kohlhaas
558669dd88
Fix #6497 : deposit lines were not translated
2019-11-30 16:14:16 +01:00
Laurent Destailleur
6944b67b1e
Merge pull request #12548 from frederic34/patch-8
...
functions return void
2019-11-30 01:25:04 +01:00
Frédéric FRANCE
6d8c59991d
doxygen
2019-11-28 23:21:42 +01:00
Frédéric FRANCE
06839e9a7f
functions return void
2019-11-28 22:34:53 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
8430ec4f50
Merge pull request #12534 from aspangaro/11.0_a8
...
Look & Feel v11
2019-11-28 12:18:39 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Alexandre SPANGARO
0f6de0049c
Fix
2019-11-26 21:17:22 +01:00
Alexandre SPANGARO
659e3aca8e
Look & field v11
2019-11-26 21:14:44 +01:00
Alexandre SPANGARO
d910b05a38
Look & Feel v11
2019-11-26 20:28:24 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Frédéric FRANCE
f3f308fc1b
Update graph.php
2019-11-26 00:11:02 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 13:16:38 +00:00
Laurent Destailleur
f9092b1b8e
Fix responsive
2019-11-20 13:22:40 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229
Fix missing class reposition
2019-11-19 21:29:49 +01:00
Laurent Destailleur
07c01a821e
FIx #12466 manually (conflict pb)
2019-11-19 19:43:02 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
2f3b4d239b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-19 18:56:12 +01:00
Laurent Destailleur
5b6f0cb101
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
1e2fd1f25a
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
2019-11-17 21:55:25 +01:00
Scrutinizer Auto-Fixer
eba082320c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:25:24 +00:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
8db4eff108
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
...
Scrutinizer Auto-Fixes
2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer
f197196719
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00:00
gauthier
a5635825f3
FIX : wrong invoice id for fetchObjetctLinked
2019-11-14 12:09:32 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +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
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +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
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c66bce7ec6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:31:18 +00:00
Laurent Destailleur
4340f85e3c
Add warning
2019-11-13 01:22:13 +01:00
Laurent Destailleur
453ffad9e8
Look and feel v11
2019-11-12 18:01:16 +01:00
Laurent Destailleur
2a67dd0f66
Look and feel v11
2019-11-12 17:43:27 +01:00
Laurent Destailleur
e79ac7081a
Look and feel v11
2019-11-12 17:37:05 +01:00
Laurent Destailleur
3430a88c72
Fix $conf not defined
2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75
Clean code
2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +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
stickler-ci
fae5d56d34
Fixing style errors.
2019-11-10 10:04:11 +00:00
Philippe GRAND
b0d68a6de1
add some comment
2019-11-10 11:05:30 +01:00
stickler-ci
4dda9edeb6
Fixing style errors.
2019-11-10 10:01:28 +00:00
Philippe GRAND
f960191671
add some comment
2019-11-10 11:02:44 +01:00
Alexandre SPANGARO
86b90b115f
NEW Invoice list - Add date start & date end
2019-11-09 05:20:13 +01:00
Laurent Destailleur
89ecd6a72a
Merge pull request #12389 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-08 15:53:57 +01:00
Laurent Destailleur
4fce0d3e7a
Fix not transversable
2019-11-08 15:52:57 +01:00
Scrutinizer Auto-Fixer
812d0af1d9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Scrutinizer Auto-Fixer
2ecfe41810
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
ba1f4f0ac6
Fix look and feel v11
2019-11-07 16:40:59 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument
...
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Laurent Destailleur
c7e261a973
FIX #11907
2019-11-07 14:40:26 +01:00
Laurent Destailleur
5a4a421a8e
FIX #12372
2019-11-07 13:07:40 +01:00
Laurent Destailleur
cd5c359b83
Fix regression
2019-11-07 12:53:26 +01:00
Laurent Destailleur
4c44f3c109
Merge pull request #12366 from aspangaro/11.0_a3
...
NEW VAT list - Add date start & date end
2019-11-07 11:53:16 +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
Alexandre SPANGARO
fd45eeab83
NEW VAT list - Add date start & date end
2019-11-07 08:34:06 +01:00
Alexandre SPANGARO
e60b7a67fa
NEW Invoice list - Add date start & date end
2019-11-07 06:35:58 +01:00
Nicolas
f18bca7687
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
2019-11-06 20:51:17 +01:00
Nicolas
4143988614
NEW Add upload document on account statement
2019-11-06 20:50:02 +01:00
Inovea Conseil
fed6ed8760
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
17d5c385ff
FIX #12320 It is clearer that you can't change thirdparty when creating
...
invoice from template with a recurring rule.
2019-11-05 15:46:48 +01:00
stickler-ci
f537ae60b6
Fixing style errors.
2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747
NEW Add upload document on account statement
2019-11-05 13:51:52 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Frédéric FRANCE
3a729f9e7b
fix missing newtoken in form
2019-11-04 22:45:20 +01:00
Laurent Destailleur
a8b1a75ea3
Merge pull request #12325 from frederic34/patch-6
...
fix indent in card-rec.php
2019-11-04 21:11:34 +01:00
Laurent Destailleur
e61f28ed17
Merge pull request #12318 from grandoc/new_branch_04_11_2019
...
fix translation
2019-11-04 20:50:58 +01:00
Frédéric FRANCE
ac783b303d
Update card-rec.php
2019-11-04 20:47:25 +01:00
Laurent Destailleur
e60fff39d9
Fix phpcs
2019-11-04 20:36:55 +01:00
Laurent Destailleur
ec8bd6327d
Fix css
2019-11-04 18:53:46 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
stickler-ci
4480d7dd88
Fixing style errors.
2019-11-04 14:09:43 +00:00
Philippe GRAND
2909f8141e
fix translation
2019-11-04 15:08:43 +01:00
Laurent Destailleur
99a4781a42
Fix better support for multicurrency for template invoices
2019-11-03 18:58:26 +01:00
Laurent Destailleur
630a150b09
Fix multicurrency rate must be visible if currency differs only
2019-11-03 17:48:16 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793
Finish removing of ->attribute_label
2019-11-02 17:26:26 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
6348227698
Merge pull request #12275 from frederic34/patch-8
...
css
2019-11-02 13:31:18 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Laurent Destailleur
82bda63920
Merge pull request #12296 from frederic34/patch-20
...
Update index.php
2019-11-02 10:09:55 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
2019-11-01 21:06:06 +01:00
Frédéric FRANCE
8b98df296f
Update info.php
2019-11-01 17:36:11 +01:00
Frédéric FRANCE
6dd8e7152c
Update index.php
2019-11-01 17:31:34 +01:00
Frédéric FRANCE
38b86d4bde
Update payments.php
2019-11-01 17:30:49 +01:00
Frédéric FRANCE
61873aa1a8
Update list.php
2019-11-01 17:29:21 +01:00
Frédéric FRANCE
5314ff70f5
Update index.php
...
in class ref and rowid are the same, lib is deprecated and is label
2019-11-01 17:26:53 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Philippe Grand
9fad5dc8fc
Update chargesociales.class.php
2019-11-01 11:16:47 +01:00
Philippe Grand
f568241a81
Update cashcontrol.class.php
2019-11-01 11:16:20 +01:00
stickler-ci
0c6938aa2a
Fixing style errors.
2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502
add some comment
2019-11-01 10:42:14 +01:00
Laurent Destailleur
a0e377feb3
Look and feel v11
2019-10-31 22:11:26 +01:00
Laurent Destailleur
a1700e71be
Fix phpcs
2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
607c38775d
Use popup
2019-10-31 14:57:05 +01:00
Laurent Destailleur
360b3a9550
NEW Ask the new label and new dates in confirm popup when cloning tax
2019-10-31 14:06:26 +01:00
Frédéric FRANCE
f202424432
css
2019-10-30 18:52:54 +01:00
Laurent Destailleur
923ab59e4e
Merge pull request #12219 from frederic34/patch-7
...
css
2019-10-30 03:13:14 +01:00
Laurent Destailleur
8849cd9897
Update index.php
2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1
Fix sign for VAT repaid in report
2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory
2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193
start clean indent in compta directory
2019-10-26 14:42:25 +02:00
Frédéric FRANCE
99b338b468
Update index.php
2019-10-24 23:09:58 +02:00
Laurent Destailleur
b4eb14ee44
Use dolGetStatus
2019-10-24 16:43:23 +02:00
Laurent Destailleur
9a386da7f5
NEW Can crop/resize image attached on a bank record
2019-10-23 16:07:09 +02:00
Laurent Destailleur
31ad147e0e
Look and feel v11
2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f
Use GETPOST
2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092
Fix scrutinizer warnings
2019-10-23 14:59:02 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop
...
Translate documentation and minor code improvement
2019-10-22 12:32:40 +02:00
Alfredo Altamirano
f2e5a23547
Declaration of $soc should not be conditional
2019-10-20 13:47:39 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Laurent Destailleur
5a4960f7ae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
Frédéric FRANCE
a16b7bcda6
cut long lines
2019-10-19 19:16:28 +02:00
Laurent Destailleur
78ac543dee
Fix link to list
2019-10-18 20:01:47 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
f7782873a5
Look and feel v11
2019-10-17 15:58:24 +02:00
Laurent Destailleur
c58a006703
NEW Show POS application and terminal on invoice card.
2019-10-17 15:56:50 +02:00
Laurent Destailleur
5e12dcc6b1
Fix on FACTURE_ENABLE_NEGATIVE
2019-10-17 15:40:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49
Clean code
2019-10-16 14:02:13 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
ebd8bc3645
Merge pull request #12107 from frederic34/patch-14
...
Update list.php
2019-10-14 20:57:01 +02:00
Laurent Destailleur
1f672221ec
Merge pull request #12106 from frederic34/patch-13
...
avoid ErrorBadValueForParamNotAString if not configured
2019-10-14 20:55:06 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop
...
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-14 20:39:08 +02:00
Laurent Destailleur
dbdc62b028
Fix td
2019-10-14 18:41:46 +02:00
stickler-ci
4b7987374b
Fixing style errors.
2019-10-14 14:46:04 +00:00
Laurent Destailleur
dba9450b01
css
2019-10-14 16:03:12 +02:00
Laurent Destailleur
28339920b3
Translation
2019-10-14 16:00:03 +02:00
Laurent Destailleur
323f31d832
Trans frequency
2019-10-13 20:54:00 +02:00
Laurent Destailleur
f91b98d326
Add frequency in template invoice popup
2019-10-13 20:50:03 +02:00
Frédéric FRANCE
b424fc6e27
Update list.php
2019-10-12 18:57:08 +02:00
Frédéric FRANCE
cef935468d
Update list.php
2019-10-12 18:40:39 +02:00
Laurent Destailleur
bcc41c2a33
NEW Can filter on description on bank account transaction lists.
2019-10-12 13:19:10 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc
2019-10-11 23:08:33 +02:00
Laurent Destailleur
78bfc8997d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
777c297353
FIX #12054
2019-10-11 15:42:27 +02:00
ro@t.com
2149b155d1
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-10 15:57:26 +02:00
Laurent Destailleur
b34cbfad74
Rename const
2019-10-10 15:23:45 +02:00
Laurent Destailleur
015d51c169
NEW Add column of module source and POS terminal in invoice list.
2019-10-10 15:10:41 +02:00
Laurent Destailleur
b6c600c171
css
2019-10-10 11:44:03 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen
2019-10-09 18:47:25 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255
2019-10-08 19:37:42 +02:00
Laurent Destailleur
5970ea5b79
Update releve.php
2019-10-08 15:48:29 +02:00
Laurent Destailleur
d6bf0fa483
Update releve.php
2019-10-08 15:47:47 +02:00
fuhraih
368b34c5c2
FIX #11835
...
FIX #11835 edit Bank Statements in second Page and so on not working
2019-10-08 15:34:35 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
52c06c1815
Fix css
2019-10-06 19:28:08 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
0b9d27423d
FIX Can't modify vendor invoice if transfered into accountancy
2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885
Fix comparison
2019-10-04 09:54:52 +02:00
Alexandre SPANGARO
14381927c7
Fix Bank Fa-icon
2019-10-03 20:32:15 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Laurent Destailleur
1c92c2d8bc
Merge pull request #11993 from frederic34/patch-12
...
Update chargesociales.class.php for doxygen
2019-10-01 11:15:45 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Frédéric FRANCE
3ba48fde93
Update api_invoices.class.php
2019-09-30 21:44:37 +02:00
Frédéric FRANCE
ea008aefd7
Update chargesociales.class.php
2019-09-30 20:21:10 +02:00
Frédéric FRANCE
0c908fb4ed
Update chargesociales.class.php
2019-09-30 20:13:43 +02:00
Laurent Destailleur
14f7e48fe5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-30 18:50:33 +02:00
Laurent Destailleur
a56b9e1ca9
The trigger BON_PRELEVEMENT has been renamed into
...
DIRECT_DEBIT_ORDER_CREATE.
2019-09-30 18:50:23 +02:00
Laurent Destailleur
cff8f582e7
Update bonprelevement.class.php
2019-09-30 18:47:18 +02:00
Laurent Destailleur
9d5b84ec44
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing
2019-09-30 18:39:46 +02:00
Laurent Destailleur
2da5a506a9
Update facture.class.php
2019-09-30 18:25:03 +02:00
Laurent Destailleur
564e22009d
Update facture.class.php
2019-09-30 18:22:37 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir
...
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php
2019-09-30 18:12:43 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
ptibogxiv
4177c72ae0
Update facture.class.php
2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e
Update facture.class.php
2019-09-29 15:45:41 +02:00
ptibogxiv
5a096972c0
Update list.php
2019-09-29 15:42:39 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255
2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop
...
Fix: Load invoices only if showed
2019-09-27 14:34:16 +02:00
Laurent Destailleur
f3bc319a78
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
6d1a571aed
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
2019-09-27 14:07:11 +02:00
Laurent Destailleur
5d45638248
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-27 14:02:23 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
e38bb89a2e
NEW Add fa_icon on load_fiche_titre
2019-09-27 11:48:40 +02:00
Laurent Destailleur
99cfea1ff4
Update paiement_charge.php
2019-09-27 11:34:50 +02:00
Alexandre SPANGARO
b52e5d51e3
FIX colspan on VAT quadri report
2019-09-26 22:01:59 +02:00
Ferran Marcet
a8cc11d232
Merge branch 'developup' into develop
2019-09-24 13:38:11 +02:00
Alexandre SPANGARO
1b099733f5
Merge remote-tracking branch 'upstream/develop' into 11.0_translation
2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9
Typo abscissa
2019-09-23 21:45:23 +02:00
Alexandre SPANGARO
e32772fdc5
Translate
2019-09-20 09:44:49 +02:00
gauthier
575e4d11d0
FIX : wrong test
2019-09-19 17:28:51 +02:00
Laurent Destailleur
a43253eab8
Fix for deposit not correctly closed
2019-09-17 18:49:56 +02:00
Laurent Destailleur
41a2a25729
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Ferran Marcet
3f25a8d8d5
New: Load invoices only if showed
2019-09-17 09:38:08 +02:00
Ferran Marcet
e4984492b3
Dejarlo igual que develop
2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf
Merge branch 'developup' into develop
...
# Conflicts:
# htdocs/compta/facture/fiche-rec.php
# htdocs/install/mysql/migration/9.0.0-10.0.0.sql
2019-09-17 09:27:42 +02:00
Laurent Destailleur
5233e7d8ad
FIX do not output return code on screen after a select of bank account
2019-09-16 18:29:04 +02:00
Laurent Destailleur
6bfba0b731
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2019-09-15 15:17:38 +02:00
Alexandre SPANGARO
21e27389d4
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-14 20:58:12 +02:00
Alexandre SPANGARO
4420af683d
Fix Bank entries - nowrap on amount
2019-09-14 05:44:28 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
Laurent Destailleur
3f3282400a
FIX SQL syntax error and CSRF check on vat reports
2019-09-11 13:57:15 +02:00
Christophe Battarel
c8cb5886f4
correction
2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86
allow standalone credit note even if no invoice
2019-09-10 16:24:04 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
Laurent Destailleur
1d74387125
Removed deprecated property ->numero (We must use ->num_payment)
2019-09-09 08:47:23 +02:00
Laurent Destailleur
cad9a59d2a
Add option to be able to find behaviour before the fix of list of
...
invoice in direct debit order.
2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0
FIX Consistency in direct debit order lists.
...
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
bc7bf3b4b5
FIX bad consistency in list of invoice for direct debit order.
2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea
Fix wrong warning
2019-09-06 13:02:52 +02:00
ptibogxiv
5d81b0271d
Update facture.class.php
2019-09-06 11:40:26 +02:00
ptibogxiv
fc75d72290
Update list.php
2019-09-06 11:35:52 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
bb81f66a1a
Add phpunit test for Lessc
2019-09-06 10:36:49 +02:00
Laurent Destailleur
92e7d7bb26
Fix duplicate translation
2019-09-05 16:18:20 +02:00
atm-ph
f7fe3d2842
Fix set var in context attribute instead of object attribute
2019-09-04 16:30:55 +02:00
Laurent Destailleur
481a25cb8f
The hook "moreFamily" must return payment into var "totalpayment" and no
...
more "paiement" (english replace french).
2019-09-03 17:39:19 +02:00
Laurent Destailleur
da3d230182
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
84800257e8
Merge pull request #11799 from jtraulle/fix-11683-10.0
...
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
2019-09-03 17:32:47 +02:00
Laurent Destailleur
7c07e64adc
Update treso.php
2019-09-03 17:32:18 +02:00
Laurent Destailleur
65fee73b22
Update treso.php
2019-09-03 17:31:20 +02:00
Laurent Destailleur
28c4f86c79
Fix regression
2019-09-03 16:23:39 +02:00
Laurent Destailleur
33cb9f7df4
Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid
...
FIX set due date in object in create invoice and set default paid in …
2019-09-03 15:21:19 +02:00
Frédéric FRANCE
32343fba24
Optimize invoice situation doc
...
with many many lines, it can be very very long to generate pdf
2019-09-03 13:43:44 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples
...
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +02:00
Laurent Destailleur
f2af28f0e1
Clean code
2019-08-31 02:08:26 +02:00
Jean Traullé
8f1fba6775
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
2019-08-30 23:56:52 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen
2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4
The deprecated method get_OutstandingBill has been removed. You can use
...
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
VESSILLER
877867a6c2
FIX set due date in object in create invoice and set default paid in update invoice
2019-08-28 13:50:39 +02:00
