2
0
forked from Wavyzz/dolibarr
Commit Graph

6480 Commits

Author SHA1 Message Date
Laurent Destailleur
1764d3528b Fix test email 2021-01-28 19:45:52 +01:00
Laurent Destailleur
4c3dc6be1b Fix can't use the link button twice. 2021-01-28 19:38:06 +01:00
Laurent Destailleur
26c22e1b28 Fix warning 2021-01-26 13:22:20 +01:00
Laurent Destailleur
8db80ff44d Fix reponsive 2021-01-26 11:19:13 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Laurent Destailleur
c3ad443200 Fix var not defined 2021-01-21 13:52:23 +01:00
Frédéric FRANCE
3c2bf5d9e9 fix trans
Conflicts:
	htdocs/core/class/commonobject.class.php
2021-01-16 17:18:58 +01:00
Laurent Destailleur
992645c13d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 16:35:13 +01:00
Laurent Destailleur
871691bf69 Fix missing popup 2021-01-16 16:34:49 +01:00
Laurent Destailleur
c3046326cb Fix help 2021-01-15 12:42:40 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
fe7be8362f Fix td balance 2021-01-11 12:03:28 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
2021-01-06 20:20:37 +01:00
jpb
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +01:00
Laurent Destailleur
9764f086d3 Fix Field code is mandatory but not field note in tax dictionary 2021-01-05 14:31:14 +01:00
Laurent Destailleur
f71c581140 Merge pull request #15856 from aspangaro/13b5
FIX: Accountancy - Debug experimental function to validate movements & typo
2021-01-02 15:53:28 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
2021-01-02 15:49:30 +01:00
Laurent Destailleur
a8d15fafd2 Fix missing span 2021-01-02 14:17:54 +01:00
Laurent Destailleur
f328bdc3f9 Fix var name 2021-01-01 22:05:12 +01:00
Alexandre SPANGARO
46160614b8 Typo 2020-12-31 03:30:18 +01:00
Laurent Destailleur
e4915d9825 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-30 22:02:06 +01:00
Laurent Destailleur
40d19e6c36 Fix tooltip on timezone 2020-12-30 22:01:26 +01:00
Laurent Destailleur
d9a2e2e402 Responsive 2020-12-29 02:06:42 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
2020-12-24 13:05:17 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
4fcf606d04 Error management on emailcollector edition 2020-12-22 17:22:24 +01:00
Laurent Destailleur
083b6a8c87 Fix emailcollector edition 2020-12-22 17:03:57 +01:00
Laurent Destailleur
6fad9c2d3b Fix edition of operation into email collector 2020-12-22 16:59:59 +01:00
Laurent Destailleur
15c0773de7 Merge pull request #15791 from frederic34/patch-8
Remove no more needed file
2020-12-21 18:21:51 +01:00
Laurent Destailleur
67de45b8d7 Fix responsive 2020-12-21 01:40:15 +01:00
Laurent Destailleur
d3bd709ad6 Fix phpcs 2020-12-20 18:51:17 +01:00
Frédéric FRANCE
92f38f664a Remove no more needed file 2020-12-20 10:44:55 +01:00
Laurent Destailleur
0c6ccb64e0 Fix links 2020-12-19 21:48:29 +01:00
Laurent Destailleur
fcfd657240 Fix links 2020-12-19 21:41:15 +01:00
Laurent Destailleur
70d1cc79e0 Fix link 2020-12-19 21:30:56 +01:00
Laurent Destailleur
b41b528f33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/sms.php
2020-12-19 15:28:58 +01:00
ptibogxiv
22b2247442 Update sms.php 2020-12-19 13:41:49 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +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
b04cc22350 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/prelevement.php
2020-12-17 14:10:45 +01:00
Laurent Destailleur
f0d787debb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-17 14:07:24 +01:00
Laurent Destailleur
27542ed8ed Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce Update prelevement.php 2020-12-17 13:52:03 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
2020-12-17 10:19:21 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
21c2fae00c Fix setup of antivirus 2020-12-16 17:41:18 +01:00
Laurent Destailleur
66e4de628c Fix permissions 2020-12-14 20:38:22 +01:00