Laurent Destailleur
|
ee29c3efdd
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-08 16:02:23 +01:00 |
|
Laurent Destailleur
|
716f765ce1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
|
2020-02-08 16:00:06 +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
|
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
|
b66c2a29a2
|
Merge branch 'develop' into patch-301
|
2020-02-08 14:54:23 +01:00 |
|
Laurent Destailleur
|
9c12c4be08
|
Fix customreports
|
2020-02-08 14:49:26 +01:00 |
|
Laurent Destailleur
|
3a74c3d7e9
|
Enhance property ->ismulticompanymanaged to define an object with entity
on its parent.
|
2020-02-08 14:40:30 +01:00 |
|
Laurent Destailleur
|
c3beb854a2
|
Definition of $fields for member and subscriptions
|
2020-02-08 13:44:31 +01:00 |
|
Laurent Destailleur
|
cffc56b80b
|
Declaration of property fields of thirdparties
|
2020-02-08 11:32:38 +01:00 |
|
Laurent Destailleur
|
fe7b79c83c
|
Fix definition of objects
|
2020-02-07 15:51:14 +01:00 |
|
Laurent Destailleur
|
4e4fd4c76c
|
Remove code using a no more used field
|
2020-02-07 13:15:51 +01:00 |
|
Laurent Destailleur
|
0f1a8a3997
|
Implement min and max for generic graph
|
2020-02-07 13:01:07 +01:00 |
|
Laurent Destailleur
|
d9fda71a23
|
Fix phpcs
|
2020-02-07 12:51:08 +01:00 |
|
Laurent Destailleur
|
cd58822d98
|
Can edit a table of resolution code for tickets
|
2020-02-07 12:48:41 +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 |
|
Laurent Destailleur
|
54414f7bb0
|
WIP Generic report
|
2020-02-07 11:53:09 +01:00 |
|
Laurent Destailleur
|
53e1b80742
|
FIX Disable ticket status change if ticket close
FIX Use ref into label of ticket message
|
2020-02-07 11:52:55 +01:00 |
|
Laurent Destailleur
|
ff4ce2e505
|
WIP Work on generic custom graph
|
2020-02-07 10:58:17 +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
|
5e71366ff2
|
css
|
2020-02-06 18:06:36 +01:00 |
|
Laurent Destailleur
|
c8f7b79c48
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-02-06 13:05:52 +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 |
|
Laurent Destailleur
|
05e08b3596
|
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
|
2020-02-06 12:58:02 +01:00 |
|
atm-arnaud
|
bd6d49f04a
|
FIX advanced target emailing sql and ergonomy
|
2020-02-06 12:08:50 +01:00 |
|
ptibogxiv
|
2ca6b8f633
|
Update pdf_espadon.modules.php
|
2020-02-06 10:49:05 +01:00 |
|
ptibogxiv
|
f1cce26ef0
|
FIX need weight short label in shipping doc
need short label because value + term is too long
|
2020-02-06 10:47:56 +01:00 |
|
Laurent Destailleur
|
48e6db17bd
|
Fix doc
|
2020-02-06 10:28:49 +01:00 |
|
Laurent Destailleur
|
2966b2303b
|
Fix phpcs
|
2020-02-06 10:23:04 +01:00 |
|
Laurent Destailleur
|
48cd8e1314
|
Fix doc
|
2020-02-06 10:17:06 +01:00 |
|
Laurent Destailleur
|
857c22cb29
|
Fix doc
|
2020-02-06 10:13:10 +01:00 |
|
Laurent Destailleur
|
dbb731a656
|
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder
NEW Hidden option MAIN_TEMP_DIR
|
2020-02-05 20:43:26 +01:00 |
|
Laurent Destailleur
|
4a07740601
|
Update conf.class.php
|
2020-02-05 20:42:44 +01:00 |
|
Laurent Destailleur
|
7cc959e316
|
Update conf.class.php
|
2020-02-05 20:42:03 +01:00 |
|
stickler-ci
|
1ecef695f8
|
Fixing style errors.
|
2020-02-05 19:40:22 +00:00 |
|
Laurent Destailleur
|
3e73e97f24
|
Update conf.class.php
|
2020-02-05 20:39:38 +01:00 |
|
Laurent Destailleur
|
98ac0428a5
|
Update conf.class.php
|
2020-02-05 20:37: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
|
30fa8940a9
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:00 +01:00 |
|
Laurent Destailleur
|
80f4e625be
|
Fix phpcs
|
2020-02-05 17:07:42 +01:00 |
|
Laurent Destailleur
|
fdfc45bbe9
|
Fix wrapping
|
2020-02-05 15:04:11 +01:00 |
|
Laurent Destailleur
|
a2bb64354b
|
Fix bad merge
|
2020-02-05 14:56:01 +01:00 |
|
Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +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
|
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 |
|
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 |
|