Laurent Destailleur
|
8bcff9a0f1
|
Merge pull request #13052 from fappels/11_fix_expedition_ceate_line
FIX expedition ceate line new parameter is not required.
|
2020-02-08 16:07:36 +01:00 |
|
Laurent Destailleur
|
c27260869b
|
FIX #13046 More complete
|
2020-02-08 15:59:08 +01:00 |
|
Laurent Destailleur
|
df7cdd1da8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
|
2020-02-08 15:42:35 +01:00 |
|
Laurent Destailleur
|
1a167aa5b4
|
Update card.php
Conflicts:
htdocs/compta/tva/card.php
|
2020-02-08 15:12:55 +01:00 |
|
Laurent Destailleur
|
9b9101dc2f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/admin/tools/export_files.php
|
2020-02-08 15:09:24 +01:00 |
|
Laurent Destailleur
|
5f5645a184
|
Merge pull request #13044 from ksar-ksar/10.0
FIX : Warning on admin/export_files
|
2020-02-08 15:05:44 +01:00 |
|
Laurent Destailleur
|
34192f25f6
|
Merge pull request #13042 from ksar-ksar/11.0
FIX : Update export_files.php
|
2020-02-08 15:05:26 +01:00 |
|
ksar
|
e951743077
|
Update export_files.php
Remove Warning
|
2020-02-08 15:04:27 +01:00 |
|
Laurent Destailleur
|
2a897ac91a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-08 15:02:49 +01:00 |
|
Laurent Destailleur
|
5fac824824
|
Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing
FIX advanced target emailing sql and ergonomy
|
2020-02-08 14:59:00 +01:00 |
|
ptibogxiv
|
8100708639
|
Update pdf_espadon.modules.php
|
2020-02-08 14:57:04 +01:00 |
|
ptibogxiv
|
ae5da164c6
|
FIX need weight short label in shipping doc
need short label because value + term is too long
|
2020-02-08 14:56:36 +01:00 |
|
Laurent Destailleur
|
46e7f613fd
|
Merge pull request #13049 from hregis/11.0
FIX #13028
|
2020-02-08 14:52:57 +01:00 |
|
Laurent Destailleur
|
85c4013a0d
|
Update card.php
|
2020-02-08 14:52:02 +01:00 |
|
Laurent Destailleur
|
5f75ae4830
|
FIX If we can change vendor status, we must be able to chane vendor code
|
2020-02-08 11:34:57 +01:00 |
|
Laurent Destailleur
|
2eae9a2fa2
|
FIX Missing include
|
2020-02-07 12:15:20 +01:00 |
|
Laurent Destailleur
|
84c1228ad4
|
FIX Disable ticket status change if ticket close
FIX Use ref into label of ticket message
|
2020-02-07 12:15:15 +01:00 |
|
Francis Appels
|
0e65d08455
|
Fix set create_line rang parameter not required
|
2020-02-07 10:16:56 +01:00 |
|
Francis Appels
|
4760e5b1b3
|
Merge remote-tracking branch 'Dolibarr/11.0' into 11
|
2020-02-07 10:02:51 +01:00 |
|
Regis Houssin
|
45ba23da3e
|
FIX #13028
|
2020-02-07 08:53:05 +01:00 |
|
Laurent Destailleur
|
83598a0b53
|
FIX After import of a website template, home page was not set
|
2020-02-06 23:35:04 +01:00 |
|
Laurent Destailleur
|
fe0d1a81eb
|
Fix filter on current user is stupi on the view "per user".
|
2020-02-06 21:16:48 +01:00 |
|
Laurent Destailleur
|
19847ec7ac
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-02-06 13:04:49 +01:00 |
|
Laurent Destailleur
|
78389e6c5d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-06 13:03:47 +01:00 |
|
Laurent Destailleur
|
387db16217
|
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-02-06 13:03:10 +01:00 |
|
Laurent Destailleur
|
e14612f569
|
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-02-06 13:02:27 +01:00 |
|
Laurent Destailleur
|
13442ef0df
|
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
|
2020-02-06 13:01:09 +01:00 |
|
ksar
|
23fc8321d5
|
FIX : Warning on admin/export_files
#13041
|
2020-02-06 12:55:35 +01:00 |
|
ksar
|
16fdab6089
|
Update export_files.php
REmove the Warning
|
2020-02-06 12:12:20 +01:00 |
|
atm-arnaud
|
bd6d49f04a
|
FIX advanced target emailing sql and ergonomy
|
2020-02-06 12:08:50 +01:00 |
|
Laurent Destailleur
|
857c22cb29
|
Fix doc
|
2020-02-06 10:13:10 +01:00 |
|
Laurent Destailleur
|
cca62dd8d3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 19:38:25 +01:00 |
|
Laurent Destailleur
|
1543028cdb
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-05 19:38:02 +01:00 |
|
Laurent Destailleur
|
b6efd098dd
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2020-02-05 19:37:03 +01:00 |
|
Laurent Destailleur
|
1ef978ccc4
|
FIX #12966
|
2020-02-05 19:32:49 +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
|
80f4e625be
|
Fix phpcs
|
2020-02-05 17:07:42 +01:00 |
|
Laurent Destailleur
|
f3e27695e2
|
FIX Avoid deletion of bank record if in accounting
|
2020-02-05 16:35:50 +01:00 |
|
Laurent Destailleur
|
2e0929c2e9
|
FIX export ledger
|
2020-02-05 16:08:28 +01:00 |
|
Laurent Destailleur
|
1fe9783760
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/product/index.php
|
2020-02-05 14:38:19 +01:00 |
|
Laurent Destailleur
|
4d58dd05aa
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 14:31:07 +01:00 |
|
Laurent Destailleur
|
9515467300
|
Merge pull request #13005 from RubenRuCh/11.0
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-05 14:30:40 +01:00 |
|
Tobias Sekan
|
eca0016778
|
Fix wrong category name on user category card
|
2020-02-05 14:17:41 +01:00 |
|
Laurent Destailleur
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
andreubisquerra
|
220f02805d
|
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
|
2020-02-05 14:12:29 +01:00 |
|
Laurent Destailleur
|
5a81e3e181
|
Merge pull request #13012 from ptibogxiv/patch-299
fix url field in edit mode societe/card.php
|
2020-02-05 14:09:04 +01:00 |
|
Laurent Destailleur
|
a36cf1f86b
|
Fix phpunit
|
2020-02-05 14:08:13 +01:00 |
|
Laurent Destailleur
|
334c69841a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-05 13:41:30 +01:00 |
|
Laurent Destailleur
|
796cdad6fc
|
Merge pull request #13008 from hregis/10.0_mc
FIX compatibility with multicompany (avoid duplicate data)
|
2020-02-05 13:41:20 +01:00 |
|
Laurent Destailleur
|
9100b8a548
|
FIX SQL request and phpunit
|
2020-02-05 13:41:10 +01:00 |
|