Laurent Destailleur
413164f5c0
NEW can upload the odt file for product doc template
2021-10-05 13:48:13 +02:00
Laurent Destailleur
b4cfe35138
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-05 13:39:46 +02:00
Marc de Lima Lucio
6ed9e00b4d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-05 13:35:50 +02:00
Laurent Destailleur
b11dbf069e
FIX Bad use of a forced contact of another company on PDF/ODT documents
2021-10-05 13:11:54 +02:00
Marc de Lima Lucio
f4c22c0ae7
FIX: deposit payment terms: PHPDoc
2021-10-05 13:02:12 +02:00
Laurent Destailleur
379dd9ccbb
Fix position of text
2021-10-05 12:09:03 +02:00
Indelog
6c82b1d0e1
Fix creataing invoice originating for custom module
...
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.
This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
2021-10-05 11:35:43 +02:00
Marc de Lima Lucio
b06857136a
NEW: deposit payment terms: show percentage on proposal/order PDFs
2021-10-05 11:31:03 +02:00
Marc de Lima Lucio
54782f5d4c
FIX: deposit payment terms: don't show percentage input on lists
2021-10-05 11:11:27 +02:00
Laurent Destailleur
50470f84c4
Look and feel v15. Stay at same position on doc generation
2021-10-05 11:03:51 +02:00
Marc de Lima Lucio
337531f832
FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices
2021-10-05 10:54:22 +02:00
Laurent Destailleur
f0703b414a
css
2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
3f26ab195b
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32
MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut
2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
d10ec688c7
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802
Missing language key
2021-10-05 06:26:19 +02:00
Francis Appels
d3cbda08dc
Fix fatal error
2021-10-04 22:12:50 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop
...
New : Add showdocument hook
2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php
2021-10-04 19:20:37 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms
2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d
NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI
2021-10-04 18:09:24 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23
...
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
2021-10-04 15:32:40 +02:00
Laurent Destailleur
6060f0bfb0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00
Gauthier PC portable 024
0dd3681e50
FIX : several debug
2021-10-04 14:08:11 +02:00
Gauthier PC portable 024
73e741ca74
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-04 11:10:38 +02:00
Laurent Destailleur
66310b14d7
Better way to present open invoice graph
2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f
Better way to present open invoice graph
2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef
Clean css
2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93
Look and feel v14
2021-10-03 18:20:01 +02:00
Alexandre SPANGARO
42bb9ac6d2
Better URL
2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061
Change Url
2021-10-03 05:30:49 +02:00
Laurent Destailleur
8ba18f4d73
Merge pull request #18884 from frederic34/patch-9
...
doxygen
2021-10-02 20:38:27 +02:00
Laurent Destailleur
7e48d6d31b
Merge pull request #18886 from frederic34/patch-11
...
doxygen
2021-10-02 20:38:20 +02:00
Laurent Destailleur
bcb7d8c07a
Merge pull request #18887 from frederic34/patch-12
...
doxygen
2021-10-02 20:38:13 +02:00
Laurent Destailleur
1451e95e79
Merge pull request #18888 from frederic34/patch-13
...
doxygen
2021-10-02 20:37:53 +02:00
Laurent Destailleur
902fed1f0d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ecm/index.php
2021-10-02 20:09:06 +02:00
Frédéric FRANCE
828c1d41e7
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:49:33 +02:00
Frédéric FRANCE
0ebe4de80a
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:48:27 +02:00
Frédéric FRANCE
1ba0369f01
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:47:30 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:40:33 +02:00
Laurent Destailleur
d064ab2b17
Add more action to GET action to check
2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800
MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3)
2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c
MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3)
2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6
Add LIBXML_NONET to simplexml_load_string
2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
0bf1db2fd4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
htdocs/takepos/receipt.php
2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2021-09-30 16:23:34 +02:00