lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,473 Commits 43 Branches 150 Tags 886 MiB
54d35fa59f
Commit Graph

10702 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +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
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
Laurent Destailleur
93f0754be9 Fix removed a bugged section (not used, was in develop mode only) 2021-02-26 14:33:27 +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
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
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
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
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