Laurent Destailleur
|
d2ef4b0506
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries_list.php
htdocs/opensurvey/card.php
htdocs/opensurvey/index.php
htdocs/opensurvey/results.php
|
2021-03-18 12:24:34 +01:00 |
|
Laurent Destailleur
|
22ed95a629
|
Look and feel v14
|
2021-03-16 19:09:56 +01:00 |
|
Laurent Destailleur
|
26dc3ef1b0
|
FIX Filter on debit/credit
Conflicts:
htdocs/compta/bank/bankentries_list.php
|
2021-03-16 18:59:28 +01:00 |
|
Laurent Destailleur
|
9ea7c92b1b
|
FIX Filter on debit/credit
|
2021-03-16 18:56:10 +01:00 |
|
Laurent Destailleur
|
26931a7e52
|
Merge pull request #16705 from dolibit-ut/patch-86
Update card.php
|
2021-03-16 10:36:27 +01:00 |
|
Laurent Destailleur
|
8a23d515e9
|
Merge pull request #16715 from frederic34/patch-12
fix php8 warning
|
2021-03-16 10:31:09 +01:00 |
|
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 |
|
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 |
|
Frédéric FRANCE
|
99cd866eba
|
fix php8 warning
|
2021-03-15 15:12:10 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Laurent Destailleur
|
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
|
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
|
71370bd558
|
Fix links in cheque receipt pages
|
2021-03-03 21:18:14 +01:00 |
|
Laurent Destailleur
|
acb7b30eb0
|
Merge pull request #16507 from frederic34/add_rule
Add rule
|
2021-03-02 12:52:03 +01:00 |
|
Laurent Destailleur
|
0670a00b83
|
Fix phpcs
|
2021-03-02 02:06:09 +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 |
|
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
|
c996871f98
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-26 11:50:18 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +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 |
|
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
|
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
|
d7c3cc4d18
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/bank/various_payment/list.php
|
2021-02-19 14:08:36 +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 |
|
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 |
|
atm-lena
|
9f9b7554ed
|
FIX error commit : only type user
|
2021-02-17 11:00: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 |
|