lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,876 Commits 43 Branches 150 Tags 886 MiB
a20bb3d66e
Commit Graph

10867 Commits

Author SHA1 Message Date
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
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
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