Laurent Destailleur
|
fefb3fdde7
|
Fix permissions on restricArea for external modules
|
2020-03-08 18:26:41 +01:00 |
|
Laurent Destailleur
|
44a611e006
|
Move getElementProperties and fetchObjectByElement into functions
|
2020-03-07 15:06:14 +01:00 |
|
Laurent Destailleur
|
47ebc2bbf2
|
Hide legend
|
2020-03-06 09:52:51 +01:00 |
|
Laurent Destailleur
|
52c236570b
|
Work on the generic Graphic Reporting tool
|
2020-03-06 01:18:35 +01:00 |
|
Laurent Destailleur
|
a5a2d60755
|
Fix phpcs
|
2020-03-05 00:20:39 +01:00 |
|
Laurent Destailleur
|
a6d340a22c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2020-03-04 19:28:15 +01:00 |
|
Laurent Destailleur
|
deda6252f2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
|
2020-03-04 19:22:30 +01:00 |
|
atm-arnaud
|
834873ab15
|
FIX date order was -1D and desc with label repetition
|
2020-03-04 11:58:42 +01:00 |
|
Laurent Destailleur
|
537d129627
|
Merge pull request #13251 from bb2a/patch-20
NEW Add subtitution variables for url of document in backoffice
|
2020-03-03 23:13:53 +01:00 |
|
Anthony Berton
|
2fd7276a30
|
Update functions.lib.php
|
2020-03-03 09:53:00 +01:00 |
|
Laurent Destailleur
|
ea7c2aa46b
|
Update functions.lib.php
|
2020-03-02 21:47:36 +01:00 |
|
Laurent Destailleur
|
05556a77af
|
Fix css
|
2020-03-02 19:37:16 +01:00 |
|
Anthony Berton
|
d9a002a8bd
|
Update functions.lib.php
|
2020-03-02 19:27:36 +01:00 |
|
Anthony Berton
|
197f81cb52
|
Update functions.lib.php
|
2020-03-02 19:23:45 +01:00 |
|
Anthony Berton
|
12b9897f5c
|
Update functions.lib.php
|
2020-03-02 18:53:52 +01:00 |
|
Laurent Destailleur
|
db96634339
|
Fix trans
|
2020-03-02 18:50:21 +01:00 |
|
Laurent Destailleur
|
91e8df5c9b
|
Fix canonical name
|
2020-03-02 18:43:44 +01:00 |
|
Laurent Destailleur
|
390c0ce4dc
|
Fix main language is not into subdir
|
2020-03-02 18:41:30 +01:00 |
|
Laurent Destailleur
|
fab39aef9e
|
Clean menu bar
|
2020-03-02 17:35:49 +01:00 |
|
Laurent Destailleur
|
bb79c2cbd9
|
Fix links
|
2020-03-02 17:06:22 +01:00 |
|
Laurent Destailleur
|
dea1f1b19f
|
Fix link
|
2020-03-02 17:00:51 +01:00 |
|
Laurent Destailleur
|
8928a84c53
|
Fix link to medias
|
2020-03-02 16:56:54 +01:00 |
|
Laurent Destailleur
|
f2dba4f621
|
Merge pull request #13227 from aspangaro/12.0_a16
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-29 13:02:43 +01:00 |
|
Laurent Destailleur
|
8879672122
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-29 12:52:18 +01:00 |
|
Laurent Destailleur
|
0855598c00
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
|
2020-02-29 12:51:33 +01:00 |
|
Laurent Destailleur
|
56704e4029
|
Add stats of products in MO
|
2020-02-28 19:26:52 +01:00 |
|
Laurent Destailleur
|
a3e56994b6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
|
2020-02-27 18:35:32 +01:00 |
|
Alexandre SPANGARO
|
86d9622360
|
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-27 10:44:04 +01:00 |
|
atm-quentin
|
009eb0d4a4
|
FIX test on 0 better than isset
|
2020-02-27 09:34:20 +01:00 |
|
Laurent Destailleur
|
9bc5eb44ca
|
FIX #13182
|
2020-02-26 20:25:26 +01:00 |
|
atm-quentin
|
a5baf2bc88
|
FIX search with '0'
|
2020-02-26 09:19:39 +01:00 |
|
Laurent Destailleur
|
39624f21e7
|
Fix var not always defined
|
2020-02-25 15:36:34 +01:00 |
|
Laurent Destailleur
|
61abfb95a5
|
Look and feel v12
|
2020-02-25 13:28:11 +01:00 |
|
Laurent Destailleur
|
16b3e6f7bb
|
Move external access on dedicated tab
Translate field to sort products
|
2020-02-25 12:44:18 +01:00 |
|
Laurent Destailleur
|
ace5f2844a
|
Make Setup of TakePOS faster with Ajax ON-Off Button.
|
2020-02-25 12:37:44 +01:00 |
|
Laurent Destailleur
|
d78221ea08
|
css
|
2020-02-24 21:48:46 +01:00 |
|
Laurent Destailleur
|
7cd49f327e
|
Look and feel v12: CSS for qty in lists
|
2020-02-24 21:47:48 +01:00 |
|
Laurent Destailleur
|
68526a14cd
|
NEW Truncate columns names when too long and show full title as popup
|
2020-02-24 21:33:28 +01:00 |
|
Laurent Destailleur
|
32d74adf20
|
NEW Truncate columns names when too long and show full title as popup
|
2020-02-24 21:18:49 +01:00 |
|
Laurent Destailleur
|
9d9429f66b
|
New: Can limit number of tabs by page.
|
2020-02-24 20:41:29 +01:00 |
|
Laurent Destailleur
|
32d12468cf
|
Use SVG logo instead of png
|
2020-02-24 06:27:03 +01:00 |
|
Laurent Destailleur
|
096a568e83
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
|
2020-02-23 23:42:23 +01:00 |
|
Laurent Destailleur
|
3075e40f8c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
|
2020-02-23 23:37:46 +01:00 |
|
Laurent Destailleur
|
189c0d675b
|
Fix memory report. Xdebug no more required. Try = null instead of unset.
|
2020-02-23 22:05:59 +01:00 |
|
Laurent Destailleur
|
b4fdd9bc50
|
Merge pull request #13078 from hregis/10.0_mc
FIX #10309
|
2020-02-21 19:21:54 +01:00 |
|
Laurent Destailleur
|
e4b00c5c20
|
Merge branch 'develop' into master
|
2020-02-21 18:20:10 +01:00 |
|
Frédéric FRANCE
|
f6eba36575
|
fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
|
2020-02-21 18:00:12 +01:00 |
|
Laurent Destailleur
|
9b9f6d5da4
|
Merge pull request #13151 from frederic34/patch-6
fix CATEGORY_ADD_DESC_INTO_DOC
|
2020-02-21 17:55:19 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
7909055ee8
|
Enhance multilangue support in website module
|
2020-02-21 11:36:16 +01:00 |
|
Laurent Destailleur
|
1f4b639ba0
|
Debug MRP module
|
2020-02-20 17:44:03 +01:00 |
|
javierybar
|
2942e85e47
|
More elegant and easy to understand printer setup
|
2020-02-20 15:16:17 +01:00 |
|
Frédéric FRANCE
|
523e161f33
|
fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
|
2020-02-20 09:45:17 +01:00 |
|
Alexandre SPANGARO
|
a7ca7dfbb6
|
FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
|
2020-02-20 06:00:17 +01:00 |
|
Laurent Destailleur
|
76f0df138b
|
Try to fix doc
|
2020-02-20 01:26:40 +01:00 |
|
Laurent Destailleur
|
895503d2eb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
|
2020-02-20 00:21:25 +01:00 |
|
Laurent Destailleur
|
0c571c0376
|
Restore common behaviour: Draft object are on left under graph.
Open and live objects are on right
|
2020-02-19 14:20:55 +01:00 |
|
Laurent Destailleur
|
1dd5ba093d
|
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
|
2020-02-19 12:11:16 +01:00 |
|
Laurent Destailleur
|
ac16857501
|
GETPOST(..., 'alpha') remove " if found instead of returning ''
|
2020-02-19 11:33:45 +01:00 |
|
Laurent Destailleur
|
7c07589850
|
FIX #13124
|
2020-02-19 03:07:12 +01:00 |
|
Laurent Destailleur
|
9883c0b688
|
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
NEW add weighted amount on project/opportunity
|
2020-02-19 00:03:03 +01:00 |
|
Laurent Destailleur
|
b618581692
|
More ajax button in setup. Can reload after on ajaxonoff.
|
2020-02-18 09:38:34 +01:00 |
|
Laurent Destailleur
|
6555f5d74f
|
More default hmtl tags in restricthtmlonly
|
2020-02-17 20:55:17 +01:00 |
|
Laurent Destailleur
|
a6b0fec90b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/exports/class/export.class.php
|
2020-02-17 12:35:34 +01:00 |
|
Laurent Destailleur
|
bf281b7dab
|
Comment
|
2020-02-17 11:51:49 +01:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Regis Houssin
|
0ab0bb2e7d
|
FIX wrong test
|
2020-02-14 19:26:28 +01:00 |
|
Scrutinizer Auto-Fixer
|
17010478ba
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-13 09:44:08 +00:00 |
|
Regis Houssin
|
52506ddd05
|
FIX can be a string or integer
|
2020-02-13 09:25:36 +01:00 |
|
Regis Houssin
|
f19f706c38
|
FIX better check
|
2020-02-13 07:55:52 +01:00 |
|
Laurent Destailleur
|
7931734ecb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modUser.class.php
|
2020-02-12 20:30:20 +01:00 |
|
Laurent Destailleur
|
3a9125b097
|
Merge pull request #13087 from ptibogxiv/patch-304
Fix netmeasure update and display
|
2020-02-12 18:35:44 +01:00 |
|
Laurent Destailleur
|
bd0666bf53
|
Update product.lib.php
|
2020-02-12 18:35:15 +01:00 |
|
Laurent Destailleur
|
e74df397eb
|
FIX #13094
|
2020-02-12 17:28:18 +01:00 |
|
ptibogxiv
|
f17c7f4cb3
|
fix for unit with rowid (netmeasure)
|
2020-02-11 20:21:53 +01:00 |
|
Laurent Destailleur
|
74d3912763
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2020-02-11 16:52:58 +01:00 |
|
Laurent Destailleur
|
05f0242198
|
NEW The info_admin() can show text after click on other text
|
2020-02-11 10:38:09 +01:00 |
|
Regis Houssin
|
275b5d1f77
|
FIX #10309
|
2020-02-11 07:32:29 +01:00 |
|
Laurent Destailleur
|
8645fd8946
|
FIX CVE-2019–17223 FIX #13053
|
2020-02-09 18:28:57 +01:00 |
|
Laurent Destailleur
|
3852ba0655
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-08 17:16:25 +01:00 |
|
Laurent Destailleur
|
aed3ea25cb
|
Code comment
|
2020-02-08 17:14:04 +01:00 |
|
Laurent Destailleur
|
3dfe7161cf
|
Merge pull request #13035 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
|
2020-02-08 17:09:25 +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
|
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
|
c3beb854a2
|
Definition of $fields for member and subscriptions
|
2020-02-08 13:44:31 +01:00 |
|
Laurent Destailleur
|
54414f7bb0
|
WIP Generic report
|
2020-02-07 11:53:09 +01:00 |
|
VESSILLER
|
0be98a4b1b
|
NEW add opportunity status in project stats
|
2020-02-07 09:06:07 +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
|
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 |
|
Scrutinizer Auto-Fixer
|
59c0631172
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-06 09:49:12 +00: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
|
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
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
Laurent Destailleur
|
ddd1ca26b9
|
CSS
|
2020-02-05 14:04:19 +01:00 |
|
Laurent Destailleur
|
f8daed7f56
|
Update company.lib.php
|
2020-02-05 12:49:56 +01:00 |
|
ptibogxiv
|
94fd2b40c7
|
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
|
2020-02-05 12:04:27 +01:00 |
|
Laurent Destailleur
|
0b891d5e0c
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:47 +01:00 |
|
Laurent Destailleur
|
bc19f72306
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:20 +01:00 |
|
Laurent Destailleur
|
bb1c9a66dd
|
Fix code alignement on modulebuilder
|
2020-02-04 16:37:30 +01:00 |
|
Laurent Destailleur
|
976ce0a954
|
Fix scrutinizer
|
2020-02-04 14:33:25 +01:00 |
|
Laurent Destailleur
|
157745a1bb
|
Fix phpcs
|
2020-02-04 14:18:37 +01:00 |
|
Laurent Destailleur
|
12b63606df
|
Fix look and feel of v11
|
2020-02-02 20:21:16 +01:00 |
|
Laurent Destailleur
|
21e4717721
|
Merge pull request #12983 from atm-quentin/NEW_monthly_view
NEW monthly view to enter time
|
2020-02-02 20:05:18 +01:00 |
|
Laurent Destailleur
|
86c1777702
|
Merge pull request #12976 from mapiolca/patch-28
Add support of Number2Words module (v2)
|
2020-02-02 19:54:49 +01:00 |
|
Laurent Destailleur
|
ffa847bc8e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-02 19:32:37 +01:00 |
|
Laurent Destailleur
|
075b1ea744
|
FIX Log of authentication ko or ko + CVE-2020-7996
|
2020-02-02 19:05:38 +01:00 |
|
Laurent Destailleur
|
aa54aaeb01
|
FIX search filter on extrafields were not restored avec "Back to list"
|
2020-01-31 19:46:03 +01:00 |
|
Laurent Destailleur
|
9372940f17
|
Fix log through proxy
|
2020-01-31 17:51:30 +01:00 |
|
Laurent Destailleur
|
8e18a08377
|
Fix log of proxy forward only if it differs from remote_addr
|
2020-01-31 16:59:10 +01:00 |
|
Laurent Destailleur
|
0cd8337b7e
|
NEW Can manage situation invoices
|
2020-01-31 14:54:42 +01:00 |
|
Laurent Destailleur
|
f752551914
|
WIP Generic stats page
|
2020-01-31 14:53:47 +01:00 |
|
atm-quentin
|
78baae1480
|
Fix stickler v2
|
2020-01-31 11:51:40 +01:00 |
|
atm-quentin
|
398e83d1cc
|
FIX for stickler
|
2020-01-31 11:36:53 +01:00 |
|
stickler-ci
|
fee113bfb5
|
Fixing style errors.
|
2020-01-31 10:26:33 +00:00 |
|
atm-quentin
|
a001913751
|
Debut modification saisie par mois
NEW hook and data id
NEW visu FROM day TO day in permonth view
FIX
|
2020-01-31 11:21:49 +01:00 |
|
atm-quentin
|
ae14814f10
|
NEW visu FROM day TO day in permonth view
|
2020-01-31 11:10:40 +01:00 |
|
Laurent Destailleur
|
c58f76b15c
|
Fix constant name
|
2020-01-30 17:06:26 +01:00 |
|
Pierre Ardoin
|
05d3c134db
|
Add support of Number2Words module (v2)
if the Number2Words Module is detected, this conversion is selected.
|
2020-01-30 15:58:21 +01:00 |
|
Laurent Destailleur
|
141664ff10
|
Fix phpcs
|
2020-01-30 02:25:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
f64ad71924
|
Missing country code
|
2020-01-28 02:50:11 +01:00 |
|
Laurent Destailleur
|
c2c80bf40f
|
Fix Look and feel v11
|
2020-01-28 02:44:41 +01:00 |
|
Laurent Destailleur
|
fc63d7366d
|
FIX Mandatory fields must stay mandatory if create/update submit fails
|
2020-01-27 22:23:40 +01:00 |
|
Laurent Destailleur
|
4fe942985f
|
FIX Mandatory fields must stay mandatory if create/update submit fails
|
2020-01-27 22:22:59 +01:00 |
|
Laurent Destailleur
|
29853b5fbd
|
Fix responsive for public interface of tickets
|
2020-01-27 14:01:35 +01:00 |
|
Laurent Destailleur
|
50d9ac0b52
|
Fix else if
|
2020-01-27 02:13:12 +01:00 |
|
Laurent Destailleur
|
08d8670bb3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
|
2020-01-24 20:12:27 +01:00 |
|
Laurent Destailleur
|
8f3f34e1c0
|
Fix css
|
2020-01-24 20:11:07 +01:00 |
|
Laurent Destailleur
|
de4183ea65
|
Update logos
|
2020-01-24 17:30:46 +01:00 |
|
Laurent Destailleur
|
27a0858050
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-23 17:41:31 +01:00 |
|
Laurent Destailleur
|
7ad827f212
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2020-01-23 12:09:01 +01:00 |
|
Laurent Destailleur
|
be344518c4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
|
2020-01-23 12:07:17 +01:00 |
|
Laurent Destailleur
|
cbe396b97c
|
Update functions2.lib.php
|
2020-01-23 12:04:14 +01:00 |
|
Laurent Destailleur
|
1487158082
|
Update functions2.lib.php
|
2020-01-23 12:02:29 +01:00 |
|
Alexandre SPANGARO
|
7f47b48559
|
Move function to functions2.lib.php
|
2020-01-23 11:47:30 +01:00 |
|
Alexandre SPANGARO
|
5eeef771fa
|
FIX: FEC export format
|
2020-01-23 06:20:31 +01:00 |
|
Laurent Destailleur
|
040f8bef5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/societe/class/societe.class.php
|
2020-01-22 16:29:04 +01:00 |
|
Laurent Destailleur
|
28d0b85b84
|
Fix phpcs
|
2020-01-22 14:56:19 +01:00 |
|
Laurent Destailleur
|
2caa4e9fa6
|
Merge pull request #12885 from leninrivas/10.0
FIX Missing Linked objects Fichinter Ref. in PDF formats
|
2020-01-22 14:17:25 +01:00 |
|
Laurent Destailleur
|
4922567a27
|
Add .noexec extension for old php4, php5... files
|
2020-01-21 15:02:04 +01:00 |
|
Laurent Destailleur
|
4fdfba3867
|
Add .noexec extension for old php4, php5... files
|
2020-01-21 15:01:22 +01:00 |
|
Laurent Destailleur
|
ab5940f28c
|
Fix css lost
|
2020-01-21 00:56:32 +01:00 |
|
Laurent Destailleur
|
acdb28ba25
|
Add country id and country code in substitution vars
|
2020-01-21 00:28:53 +01:00 |
|
Laurent Destailleur
|
5b86851cf3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:46:52 +01:00 |
|
Laurent Destailleur
|
5cac54b2e1
|
Doc
|
2020-01-20 18:46:13 +01:00 |
|
Laurent Destailleur
|
92856788a3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:39:46 +01:00 |
|
Laurent Destailleur
|
d465101ae3
|
Fix We should not be able to choose which permission to use to have
access to an object.
|
2020-01-20 14:29:02 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +01:00 |
|
Laurent Destailleur
|
b8938b8d19
|
Fix look and feel v11
|
2020-01-20 02:18:00 +01:00 |
|
Laurent Destailleur
|
24d439845b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-18 20:20:25 +01:00 |
|
Laurent Destailleur
|
d9f7c4aec4
|
FIX #12838
|
2020-01-18 19:53:48 +01:00 |
|
Laurent Destailleur
|
9c1e409feb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-17 11:35:16 +01:00 |
|
Laurent Destailleur
|
c556f60c89
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-16 18:13:35 +01:00 |
|
Anthony Berton
|
9a6ee89d43
|
Update functions.lib.php
|
2020-01-16 15:44:07 +01:00 |
|
Anthony Berton
|
9a6bcaa683
|
Update functions.lib.php
|
2020-01-16 15:20:09 +01:00 |
|
Laurent Destailleur
|
849c78f4cd
|
Doc
|
2020-01-16 10:12:39 +01:00 |
|
atm-ph
|
3cdb84b192
|
Fix note started with <s> balise
|
2020-01-16 09:50:57 +01:00 |
|
Laurent Destailleur
|
5772dce460
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-01-15 12:09:21 +01:00 |
|
Laurent Destailleur
|
07b12e507f
|
Merge pull request #12841 from bb2a/patch-10
Addition of delivery times substitution
|
2020-01-15 12:08:07 +01:00 |
|
Laurent Destailleur
|
c8ff847480
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/modulebuilder/index.php
|
2020-01-15 11:56:46 +01:00 |
|
Laurent Destailleur
|
0442105bd4
|
Fix Generation of zip of module
|
2020-01-15 11:55:27 +01:00 |
|
Anthony Berton
|
ef5c1e6c8c
|
Update functions.lib.php
|
2020-01-13 23:09:08 +00:00 |
|
Anthony Berton
|
1eff733e1c
|
Update functions.lib.php
|
2020-01-13 18:23:50 +01:00 |
|
Anthony Berton
|
f3046589e7
|
Update functions.lib.php
|
2020-01-13 18:19:51 +01:00 |
|
Anthony Berton
|
226dbceac0
|
Update functions.lib.php
|
2020-01-13 17:11:50 +01:00 |
|
Laurent Destailleur
|
9d4e1a3941
|
FIX #12797
|
2020-01-13 14:25:48 +01:00 |
|
Laurent Destailleur
|
e88c11c417
|
Space
|
2020-01-13 13:20:58 +01:00 |
|
Laurent Destailleur
|
22d4f37e58
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2020-01-10 14:31:37 +01:00 |
|
Laurent Destailleur
|
b47db086cb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
|
2020-01-10 14:30:42 +01:00 |
|
Laurent Destailleur
|
9ebdd82edb
|
Fix We must refuse to delete a various payment if payment was dispatched
in accountancy.
|
2020-01-10 02:43:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
8691194627
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-09 23:03:10 +00:00 |
|
Laurent Destailleur
|
f48c7d2ecf
|
Fix modulebuilder
|
2020-01-09 22:31:23 +01:00 |
|
Laurent Destailleur
|
0e58edd896
|
Fix modulebuilder
|
2020-01-09 22:27:24 +01:00 |
|
Laurent Destailleur
|
97f62c68f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-08 13:38:03 +01:00 |
|
Laurent Destailleur
|
622dc7e8d7
|
Debug v11
|
2020-01-07 22:01:55 +01:00 |
|
Laurent Destailleur
|
7ef3ee56bd
|
Fix MRP
|
2020-01-07 20:28:21 +01:00 |
|
Laurent Destailleur
|
a947215ac1
|
Fix morecss param was lost
|
2020-01-07 14:40:59 +01:00 |
|
Laurent Destailleur
|
0e2edde6d3
|
Look and feel v11
|
2020-01-07 14:25:58 +01:00 |
|
Laurent Destailleur
|
f4d7958ead
|
Fix duplicate record in list of events for projects
|
2020-01-07 14:16:13 +01:00 |
|
Laurent Destailleur
|
f05873201c
|
Fix duplicate record in list of events for projects
|
2020-01-07 14:14:47 +01:00 |
|
Laurent Destailleur
|
444e2f1130
|
Fix length of column
|
2020-01-07 14:01:45 +01:00 |
|
Laurent Destailleur
|
eea8a4df7b
|
Fix length of column
|
2020-01-07 14:01:12 +01:00 |
|
Laurent Destailleur
|
750fa83e96
|
FIX Bad management of elementtype not llx_actioncomm
|
2020-01-07 13:49:52 +01:00 |
|
Laurent Destailleur
|
6029e82e90
|
FIX Bad management of elementtype not llx_actioncomm
|
2020-01-07 13:48:44 +01:00 |
|
Laurent Destailleur
|
8c67ea14a0
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-06 15:30:22 +01:00 |
|
Laurent Destailleur
|
40ba90d170
|
css
|
2020-01-06 15:29:18 +01:00 |
|
Laurent Destailleur
|
afd32135f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/invoice.php
|
2020-01-01 22:37:13 +01:00 |
|
Laurent Destailleur
|
e7ac01e1bd
|
FIX localtax info were not returned correctly when call done with id.
|
2020-01-01 22:27:47 +01:00 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +01:00 |
|
Laurent Destailleur
|
094b37d79d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-23 19:12:32 +01:00 |
|
Laurent Destailleur
|
8e78dbad69
|
Fix for php 7.4
|
2019-12-23 16:41:22 +01:00 |
|
Laurent Destailleur
|
f193d3edd8
|
Fix for php7.4
|
2019-12-23 16:38:37 +01:00 |
|
Laurent Destailleur
|
1ebf7e642f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-23 15:49:25 +01:00 |
|
Laurent Destailleur
|
330cca994e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2019-12-23 15:49:00 +01:00 |
|
Laurent Destailleur
|
3250b13f4a
|
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
|
2019-12-23 15:45:08 +01:00 |
|
Laurent Destailleur
|
07c1a5717e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
|
2019-12-23 14:16:34 +01:00 |
|
Laurent Destailleur
|
2df9df2db0
|
Debug v11
|
2019-12-23 12:24:27 +01:00 |
|
Laurent Destailleur
|
693551069b
|
Fix look and feel v11
|
2019-12-22 21:32:35 +01:00 |
|
Laurent Destailleur
|
30b8affdb7
|
Fix look and feel v11
|
2019-12-22 21:32:19 +01:00 |
|
Laurent Destailleur
|
ad039ff968
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/repair.php
|
2019-12-21 14:03:45 +01:00 |
|
Laurent Destailleur
|
03649ea2c8
|
Fix pb with svg images
|
2019-12-19 19:10:23 +01:00 |
|
Laurent Destailleur
|
43ff015157
|
Fix pb with svg images
|
2019-12-19 19:09:56 +01:00 |
|
stickler-ci
|
863fa7360d
|
Fixing style errors.
|
2019-12-19 09:57:37 +00:00 |
|
Laurent Destailleur
|
dd0a1b3e10
|
Merge branch 'develop' into develop_project
|
2019-12-19 10:56:03 +01:00 |
|
Laurent Destailleur
|
2afaed6981
|
Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies
|
2019-12-19 10:50:23 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
138215fc3f
|
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
european users.
|
2019-12-16 22:30:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
fdf4d86d81
|
Debug code
|
2019-12-16 12:38:51 +01:00 |
|
Laurent Destailleur
|
28bcb49957
|
Fix css
|
2019-12-16 11:32:27 +01:00 |
|
Laurent Destailleur
|
9e94be8bac
|
CSS
|
2019-12-15 20:31:09 +01:00 |
|
Laurent Destailleur
|
7c71f6cae9
|
Fix message
|
2019-12-15 17:48:30 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Laurent Destailleur
|
17b9964678
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
|
2019-12-14 14:43:14 +01:00 |
|
Laurent Destailleur
|
a8de7b850a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/admin/system/filecheck.php
|
2019-12-14 14:33:46 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
d38c73c90a
|
FIX output of emails from and error on emailing pages.
|
2019-12-13 15:52:08 +01:00 |
|
Laurent Destailleur
|
a612aefab7
|
Fix HTML5
|
2019-12-12 11:11:08 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
Laurent Destailleur
|
6f4e2e7e61
|
Fix rounding with multicurrency
|
2019-12-11 17:58:14 +01:00 |
|
VESSILLER
|
0396b348f7
|
NEW add weighted amount on project/opportunity
|
2019-12-10 09:32:37 +01:00 |
|
Frédéric FRANCE
|
f4674a7558
|
doxygen and $db bot defined
|
2019-12-10 07:51:39 +01:00 |
|
Laurent Destailleur
|
c8f457f303
|
Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal
Fix warning introduce by my #12605 PR #12622
|
2019-12-09 15:57:24 +01:00 |
|
Laurent Destailleur
|
04a7de14c6
|
Merge pull request #12660 from Ahuahuachi/develop
Bugfix: Module builder missing table prefix
|
2019-12-09 15:56:01 +01:00 |
|
Laurent Destailleur
|
8c50097012
|
Update modulebuilder.lib.php
|
2019-12-09 15:55:25 +01:00 |
|
Laurent Destailleur
|
a12b2fea80
|
Update modulebuilder.lib.php
|
2019-12-09 15:54:14 +01:00 |
|
John Botella
|
e1cf93d9a9
|
Fix exif_read_data fatal error
|
2019-12-09 14:44:37 +01:00 |
|
Laurent Destailleur
|
63a26ed436
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-09 13:25:49 +01:00 |
|
Laurent Destailleur
|
f2c7d3de2e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:25:23 +01:00 |
|
Laurent Destailleur
|
5dbf060f00
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:24:01 +01:00 |
|
Laurent Destailleur
|
fba274997a
|
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
Fix dolGetBadge class
|
2019-12-09 13:05:07 +01:00 |
|
Laurent Destailleur
|
eb0d20b77e
|
Fix label of country
Fix div empty
|
2019-12-09 09:16:59 +01:00 |
|
Alfredo Altamirano
|
39afe39016
|
Bugfix: Module builder missing table prefix
The function rebuildObjectSql from the module builder module is missing the table prefix when adding a constraint
|
2019-12-08 19:29:46 -06:00 |
|
Laurent Destailleur
|
2ca5a4378b
|
Fix empty div when no address
Fix deletion of MO
|
2019-12-09 00:54:42 +01:00 |
|
Laurent Destailleur
|
394104291a
|
Fix function not found when creating a payment of an expense report
|
2019-12-08 04:22:09 +01:00 |
|
ATM John BOTELLA
|
4d3ed4ffd3
|
Fix dolGetBadge class
|
2019-12-07 17:41:13 +01:00 |
|
Laurent Destailleur
|
d58a6a7d9a
|
Fix hreflang is more complete
|
2019-12-07 16:59:35 +01:00 |
|
Laurent Destailleur
|
0e063a3bb3
|
Fix hreflang tag (must include itself)
|
2019-12-07 15:46:14 +01:00 |
|
Laurent Destailleur
|
3f0fd9b82a
|
Fix url
|
2019-12-07 13:36:37 +01:00 |
|
Laurent Destailleur
|
ff05150f7e
|
Fix link for alternate language
|
2019-12-07 13:25:59 +01:00 |
|
Laurent Destailleur
|
7f23c5f74e
|
Fix link for alternate language
|
2019-12-07 13:21:11 +01:00 |
|
Laurent Destailleur
|
a2da98c08a
|
Fix $db not defined
|
2019-12-07 13:19:12 +01:00 |
|
Laurent Destailleur
|
7be8b14368
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-07 13:10:07 +01:00 |
|
Laurent Destailleur
|
3030a9fa2a
|
Fix manifest file was saved but not enabled.
|
2019-12-07 13:09:55 +01:00 |
|
Laurent Destailleur
|
8138fa9780
|
Missing X-Content-Type-Options: nosniff on header of website pages
|
2019-12-07 11:51:21 +01:00 |
|
Laurent Destailleur
|
91d83c3d60
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-06 17:40:43 +01:00 |
|
Laurent Destailleur
|
796f34628d
|
Debug v11
|
2019-12-06 17:40:22 +01:00 |
|
Scrutinizer Auto-Fixer
|
4debd71281
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-06 08:26:49 +00:00 |
|
Laurent Destailleur
|
cb497cb08e
|
Translation
|
2019-12-06 08:58:16 +01:00 |
|
Laurent Destailleur
|
f74e1f8fa3
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-06 08:11:23 +01:00 |
|
Laurent Destailleur
|
a7571054f0
|
Fix if exif not available
|
2019-12-04 22:19:35 +01:00 |
|
Laurent Destailleur
|
553bb728c6
|
Fix break not necessary
|
2019-12-04 22:13:50 +01:00 |
|
Laurent Destailleur
|
bde917d7fc
|
Fix responsive
|
2019-12-04 15:09:20 +01:00 |
|
Laurent Destailleur
|
9878eddd75
|
Fix phpcs
|
2019-12-03 22:52:20 +01:00 |
|
Laurent Destailleur
|
a75915a7a8
|
Fix regression
|
2019-12-03 22:37:58 +01:00 |
|
Laurent Destailleur
|
60d3bd0fe9
|
Fix regression
|
2019-12-03 22:36:26 +01:00 |
|
Laurent Destailleur
|
558e0cb5f6
|
Fix regression
|
2019-12-03 22:34:49 +01:00 |
|
Laurent Destailleur
|
22b17190e8
|
Update pdf.lib.php
|
2019-12-03 22:26:33 +01:00 |
|
stickler-ci
|
24b5b9bd72
|
Fixing style errors.
|
2019-12-03 18:42:29 +00:00 |
|
Philippe GRAND
|
0ce1e5c007
|
Fix : Fatal error: Uncaught Error: Class Facture not found
|
2019-12-03 19:39:32 +01:00 |
|
Laurent Destailleur
|
576006ff6c
|
Merge pull request #12605 from atm-john/10.0_fix_exif_images
Fix Use dynamically exif image information with conf MAIN_USE_EXIF_ROTATION
|
2019-12-03 17:57:19 +01:00 |
|
John Botella
|
e46f654e9f
|
Fix deprecated image2wbmp function
|
2019-12-03 17:27:13 +01:00 |
|
Laurent Destailleur
|
d93cfedcbe
|
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
Add preview button for MD, CSS, XAML files
|
2019-12-03 13:20:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
John Botella
|
f806c0da78
|
Fix comment missing
|
2019-12-03 09:29:04 +01:00 |
|
John Botella
|
2b01576aa9
|
Fix comment
|
2019-12-03 09:24:11 +01:00 |
|
John Botella
|
3b72cade4e
|
Fix exif image with conf MAIN_USE_EXIF_ROTATION
|
2019-12-02 17:32:06 +01:00 |
|
Tobias Sekan
|
f4e4e1e518
|
Add preview for MD, CSS, XAML files
|
2019-12-02 13:53:28 +01:00 |
|
Laurent Destailleur
|
6d81bc77cb
|
Fix look and feel v11
|
2019-12-02 11:00:09 +01:00 |
|
Laurent Destailleur
|
af5beade41
|
Merge pull request #12584 from atm-john/develop_add_link_to_widget
NEW link to widget
|
2019-12-01 19:13:10 +01:00 |
|
Laurent Destailleur
|
f378141fbd
|
PHPCS
|
2019-12-01 12:51:01 +01:00 |
|
Laurent Destailleur
|
3eec2430eb
|
Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
|
2019-12-01 11:37:30 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
Laurent Destailleur
|
bf99e8af5d
|
Fix phpcs
|
2019-12-01 10:33:55 +01:00 |
|
Laurent Destailleur
|
6bf3af5d83
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
|
2019-12-01 10:30:22 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
ATM John BOTELLA
|
096e50aaf6
|
add link to widget
|
2019-12-01 10:08:43 +01:00 |
|
Laurent Destailleur
|
1d564c2a39
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/core/class/notify.class.php
|
2019-12-01 00:58:01 +01:00 |
|
Laurent Destailleur
|
bfb8a4e8da
|
Merge pull request #12578 from Dolibarr/revert-12577-#12482
Revert "FIX#12482"
|
2019-12-01 00:55:13 +01:00 |
|
Laurent Destailleur
|
199b0c11af
|
Merge pull request #12572 from atm-maxime/fix_deposit
Fix deposit line was not translated in deposit invoice
|
2019-12-01 00:44:17 +01:00 |
|
Laurent Destailleur
|
7931bfa766
|
Merge pull request #12568 from atm-john/develop_fix_divide_by_zero
Fix division by zero
|
2019-11-30 23:29:11 +01:00 |
|
Laurent Destailleur
|
47b35e9011
|
Merge pull request #12570 from atm-maxime/fix_margin_rights
Fix margin rights
|
2019-11-30 23:28:26 +01:00 |
|
Laurent Destailleur
|
a352fd5a6e
|
Revert "FIX#12482"
|
2019-11-30 21:00:56 +01:00 |
|
Nicolas
|
f2ff443641
|
FIX #12482
|
2019-11-30 20:04:27 +01:00 |
|
Maxime Kohlhaas
|
558669dd88
|
Fix #6497 : deposit lines were not translated
|
2019-11-30 16:14:16 +01:00 |
|
Maxime Kohlhaas
|
2c165d0a61
|
Fix deposit date display in PDF
|
2019-11-30 15:53:50 +01:00 |
|
Maxime Kohlhaas
|
916954b301
|
Fix #12371 : access rights on contacts
|
2019-11-30 14:48:05 +01:00 |
|
ATM John BOTELLA
|
b7d39b610b
|
Fix divided by zero
|
2019-11-30 10:08:55 +01:00 |
|
Laurent Destailleur
|
35b4318cee
|
Merge pull request #12552 from frederic34/patch-15
$head was never initialized
|
2019-11-30 01:16:40 +01:00 |
|
Laurent Destailleur
|
3b9d2abcb2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
|
2019-11-29 11:42:08 +01:00 |
|
Laurent Destailleur
|
3acd0bc2ff
|
FIX Reduce number of request for list of products
|
2019-11-29 11:32:09 +01:00 |
|
Frédéric FRANCE
|
00a80e498e
|
$head was never initialized
|
2019-11-28 23:06:04 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Laurent Destailleur
|
540f47b998
|
Merge pull request #12523 from oscim/patch-11
Put $object in complete_head_from_modules
|
2019-11-28 12:20:16 +01:00 |
|
Laurent Destailleur
|
1e84b0ea97
|
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
Scrutinizer Auto-Fixes
|
2019-11-28 12:19:43 +01:00 |
|
Laurent Destailleur
|
874f5b7005
|
Merge pull request #12528 from frederic34/patch-8
image2wbmp() is deprecated as of PHP 7.3.0
|
2019-11-28 12:19:32 +01:00 |
|
Laurent Destailleur
|
c0d349e9f7
|
Merge pull request #12530 from frederic34/patch-13
fix doxygen
|
2019-11-27 20:11:24 +01:00 |
|
Laurent Destailleur
|
c22fea52e5
|
Fix do not ping name of server
|
2019-11-27 11:38:30 +01:00 |
|
Laurent Destailleur
|
9a9a43fc4d
|
Return OS with ping
|
2019-11-27 11:34:10 +01:00 |
|
Frédéric FRANCE
|
757d05e907
|
fix doxygen
|
2019-11-26 18:59:26 +01:00 |
|
Frédéric FRANCE
|
a04fa05b6c
|
image2wbmp() is deprecated as of PHP 7.3.0
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
|
2019-11-26 18:41:38 +01:00 |
|
oscim
|
1e6b93500a
|
Put $object in complete_head_from_modules
Add object for correctly usage in function complete_head_from_modules
|
2019-11-26 16:34:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
057ab6a059
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-26 11:52:04 +00:00 |
|
Laurent Destailleur
|
d1419f81da
|
Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
|
2019-11-26 10:26:45 +01:00 |
|
Laurent Destailleur
|
b44817f2bf
|
Merge pull request #12518 from frederic34/patch-17
doxygen
|
2019-11-26 09:10:47 +01:00 |
|
Frédéric FRANCE
|
1ccf0808d0
|
doxygen
|
2019-11-26 00:28:26 +01:00 |
|
andreubisquerra
|
6baa1c8d4a
|
Fix travis
|
2019-11-25 23:32:40 +01:00 |
|
andreubisquerra
|
b2e995279e
|
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
|
2019-11-25 19:29:07 +01:00 |
|
Laurent Destailleur
|
bc5270ce76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/card.php
|
2019-11-24 18:15:25 +01:00 |
|
Laurent Destailleur
|
cf0311dd6a
|
FIX Hook getAccessForbiddenMessage was missing parameters
|
2019-11-22 16:13:22 +01:00 |
|
Laurent Destailleur
|
e8bc8b68c1
|
Fix missing field in migration
|
2019-11-21 18:17:40 +01:00 |
|
Anthony Berton
|
496aa0c065
|
Update functions.lib.php
|
2019-11-21 10:38:59 +01:00 |
|
Scrutinizer Auto-Fixer
|
cd7523318d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-19 08:30:26 +00:00 |
|
Laurent Destailleur
|
16d67a1a8e
|
Fix several trouble with some types in modulebuilder
Fix difference between null and 0
|
2019-11-17 17:36:36 +01:00 |
|
Anthony Berton
|
fe3c921152
|
Merge branch 'develop' into patch-4
|
2019-11-17 10:17:47 +01:00 |
|
Anthony Berton
|
e1f36ae107
|
Update functions.lib.php
|
2019-11-16 17:37:18 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Laurent Destailleur
|
ede05e03ba
|
Merge pull request #12417 from frederic34/patch-7
doxygen
|
2019-11-13 18:34:29 +01:00 |
|
Laurent Destailleur
|
7118dbbd1d
|
Fix var not defined
|
2019-11-13 18:25:48 +01:00 |
|
Laurent Destailleur
|
89bf35a8bf
|
Fix default value show must match the theme selected
|
2019-11-12 21:54:41 +01:00 |
|
Frédéric FRANCE
|
7ce297c6cc
|
doxygen
|
2019-11-12 21:53:17 +01:00 |
|
Laurent Destailleur
|
03e35623c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-12 00:43:37 +01:00 |
|
Laurent Destailleur
|
8be0a6d470
|
Fix: Can set savingdocmask by caller. Fix permissions names.
Fix: Disable crop on svg images.
|
2019-11-12 00:43:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
038bda254d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 22:59:36 +00:00 |
|
Laurent Destailleur
|
5eb03cf6ad
|
Avoid false positive.
|
2019-11-11 13:26:48 +01:00 |
|
Laurent Destailleur
|
771f304c79
|
Fix typo
|
2019-11-09 18:40:08 +01:00 |
|
Anthony Berton
|
4449c6d2a7
|
Update functions.lib.php
|
2019-11-08 16:34:20 +01:00 |
|
Laurent Destailleur
|
d1c49c7021
|
Fix trans
|
2019-11-08 10:24:03 +01:00 |
|
Laurent Destailleur
|
34beca0758
|
Fix var not not consistent
|
2019-11-07 16:33:11 +01:00 |
|
Laurent Destailleur
|
8318db85a3
|
Fix typo
|
2019-11-07 16:32:44 +01:00 |
|
Laurent Destailleur
|
c0b8684475
|
Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
|
2019-11-07 15:06:47 +01:00 |
|
Nicolas
|
f18bca7687
|
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
|
2019-11-06 20:51:17 +01:00 |
|
Inovea Conseil
|
fed6ed8760
|
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
|
2019-11-06 20:48:24 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
stickler-ci
|
f537ae60b6
|
Fixing style errors.
|
2019-11-05 12:52:58 +00:00 |
|
Nicolas
|
991e1b2747
|
NEW Add upload document on account statement
|
2019-11-05 13:51:52 +01:00 |
|
Laurent Destailleur
|
747113551b
|
Debug pagination of bookmark list
|
2019-11-05 09:52:33 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
c276659acd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/ticket.lib.php
|
2019-11-04 20:37:49 +01:00 |
|
Laurent Destailleur
|
e60fff39d9
|
Fix phpcs
|
2019-11-04 20:36:55 +01:00 |
|
Laurent Destailleur
|
0347d82660
|
Merge pull request #12303 from frederic34/patch-2
css
|
2019-11-04 20:31:02 +01:00 |
|
Laurent Destailleur
|
ec8bd6327d
|
Fix css
|
2019-11-04 18:53:46 +01:00 |
|
Laurent Destailleur
|
6e591d2be0
|
Fix css
|
2019-11-04 18:25:32 +01:00 |
|
Laurent Destailleur
|
8aa2fd04ad
|
NEW The integrity checker now show the expected size of files
|
2019-11-04 13:23:48 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
99a4781a42
|
Fix better support for multicurrency for template invoices
|
2019-11-03 18:58:26 +01:00 |
|
Frédéric FRANCE
|
3e2d89dc02
|
Update ticket.lib.php
|
2019-11-02 18:16:09 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
df750b6a9d
|
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
|
2019-11-02 13:40:27 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
04a5054e1c
|
Merge pull request #12279 from atm-john/develop_ticket_file_display
New - ticket file download button display
|
2019-11-02 13:32:33 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
stickler-ci
|
b43d06db37
|
Fixing style errors.
|
2019-11-02 10:55:24 +00:00 |
|
Laurent Destailleur
|
37f4ebb1b2
|
Update xcal.lib.php
|
2019-11-02 11:56:01 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Laurent Destailleur
|
8608c5db9c
|
Fix color of task progression
|
2019-11-01 23:16:08 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
2af23aa658
|
Enhance modulebuilder
|
2019-11-01 17:54:17 +01:00 |
|
Laurent Destailleur
|
a1b2130247
|
Enhance the progress bar of tasks
|
2019-11-01 16:09:31 +01:00 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Frédéric FRANCE
|
da238e94e1
|
php is > 5.4
|
2019-11-01 15:21:21 +01:00 |
|
Sekan, Tobias
|
e27f1c623d
|
Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop
|
2019-11-01 13:16:54 +01:00 |
|
Sekan, Tobias
|
885c6e6516
|
Fix wrong newline replacement
|
2019-11-01 13:16:14 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
stickler-ci
|
fee0a362ad
|
Fixing style errors.
|
2019-11-01 11:11:59 +00:00 |
|
Sekan, Tobias
|
2a983a6a7c
|
fix link in documentation
|
2019-11-01 12:09:43 +01:00 |
|
Sekan, Tobias
|
0bfff92032
|
Add attendee to ical export + cleanup
|
2019-11-01 11:59:54 +01:00 |
|
Laurent Destailleur
|
5b5a2e9804
|
Clean code
|
2019-11-01 03:25:09 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
John Botella
|
d0a5e30faa
|
Change btn name
|
2019-10-31 08:44:08 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
John Botella
|
0cff122ccd
|
Add file display in ticket
|
2019-10-30 17:46:18 +01:00 |
|
Laurent Destailleur
|
2770f79a86
|
Merge pull request #12216 from frederic34/patch-5
css
|
2019-10-30 03:02:24 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
bf0400a29b
|
Merge pull request #12252 from oscim/patch-10
Update admin.lib.php
|
2019-10-30 02:41:59 +01:00 |
|
Laurent Destailleur
|
f03bf149bd
|
Fix autoselect of field with modulebuilder
|
2019-10-30 02:09:29 +01:00 |
|
Laurent Destailleur
|
4eedf4a113
|
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-10-29 11:48:36 +01:00 |
|
Laurent Destailleur
|
9483e367ca
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:48:11 +01:00 |
|
Laurent Destailleur
|
e58ecaaa64
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:43:35 +01:00 |
|
stickler-ci
|
52ef2bb990
|
Fixing style errors.
|
2019-10-29 10:16:49 +00:00 |
|
oscim
|
d310ca6e82
|
Update admin.lib.php
add function modulehelp_prepare_head
|
2019-10-29 11:15:03 +01:00 |
|
Laurent Destailleur
|
5e06fe0712
|
FIX Avoid fatal error when creating thumb from PDF
|
2019-10-29 11:11:13 +01:00 |
|
Frédéric FRANCE
|
e2afcfb999
|
clean indent
|
2019-10-27 11:53:20 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Frédéric FRANCE
|
83ed70f72f
|
Update agenda.lib.php
|
2019-10-24 22:44:51 +02:00 |
|
Laurent Destailleur
|
2814a5c07b
|
Fix phpcs
|
2019-10-24 21:47:31 +02:00 |
|
Laurent Destailleur
|
b45ee20696
|
NEW Add a tab to setup "Opening hours" of company (information only)
|
2019-10-24 21:29:07 +02:00 |
|
Laurent Destailleur
|
b48f08dd07
|
Theme v11
|
2019-10-23 20:12:29 +02:00 |
|
Laurent Destailleur
|
41303006f3
|
Rename constant
|
2019-10-23 17:48:55 +02:00 |
|
Laurent Destailleur
|
f4545a2068
|
Debug method MAIN_STATUS_USES_CSS
|
2019-10-23 17:31:54 +02:00 |
|
Laurent Destailleur
|
da00591bba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2019-10-23 04:04:32 +02:00 |
|
Laurent Destailleur
|
c4be61c55c
|
FIX Better compatible fix for the trouble of weight / size units
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
|
2019-10-22 18:42:59 +02:00 |
|
Laurent Destailleur
|
e7e9898e0d
|
FIX Better compatible fix for the trouble of weight / size units
|
2019-10-22 18:36:36 +02:00 |
|
Laurent Destailleur
|
8242281ef8
|
Close #12096
|
2019-10-22 14:39:33 +02:00 |
|
Laurent Destailleur
|
b2bbee55f1
|
Fix phpcs
|
2019-10-22 12:37:36 +02:00 |
|
Anthony Berton
|
5e7d615250
|
Update functions.lib.php
|
2019-10-21 21:06:48 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
49c101bb77
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-20 15:16:51 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Laurent Destailleur
|
84f6fd64a9
|
Merge pull request #12176 from Ahuahuachi/develop
Translation of some function documentation
|
2019-10-20 13:31:25 +02:00 |
|
Laurent Destailleur
|
62a8523ccf
|
Merge pull request #12178 from frederic34/patch-18
Update functions2.lib.php
|
2019-10-20 12:40:34 +02:00 |
|
stickler-ci
|
66a2dc4994
|
Fixing style errors.
|
2019-10-20 09:18:55 +00:00 |
|
Frédéric FRANCE
|
33c35780e0
|
wip
|
2019-10-20 11:17:54 +02:00 |
|
Frédéric FRANCE
|
f0a3d1a1c4
|
Update functions2.lib.php
|
2019-10-18 23:20:34 +02:00 |
|
Alfredo Altamirano
|
71f9b4f36b
|
Translation of parameter documentation
|
2019-10-18 12:55:21 -05:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
4d9c285126
|
Merge pull request #12163 from sadlig/fix-stock-movement-right
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:53:17 +02:00 |
|
Gildas
|
132ea56a59
|
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:06:38 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
6d05d42c50
|
Look and feel v11
|
2019-10-16 11:26:20 +02:00 |
|
Laurent Destailleur
|
63a60c7811
|
NEW Add option MAIN_PDF_FORCE_FONT_SIZE
|
2019-10-15 11:13:14 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Laurent Destailleur
|
2ed96c9e5f
|
Fix scrutinizer
|
2019-10-15 02:54:19 +02:00 |
|
Laurent Destailleur
|
a1c93cb2e6
|
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
|
2019-10-15 02:45:12 +02:00 |
|
Laurent Destailleur
|
c869cbe193
|
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
|
2019-10-14 23:55:10 +02:00 |
|
Laurent Destailleur
|
7b1b51e752
|
Merge pull request #12115 from TobiasSekan/develop
Fix MS Outlook import error
|
2019-10-14 20:54:30 +02:00 |
|
Laurent Destailleur
|
3b84e2bac3
|
Use img-thumb css
|
2019-10-14 19:21:13 +02:00 |
|
Tobias Sekan
|
e2ca646b6e
|
Fix MS Outlook import error
|
2019-10-14 10:22:47 +02:00 |
|
Frédéric FRANCE
|
c143584af4
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 21:16:54 +02:00 |
|
Laurent Destailleur
|
c338db6c36
|
Fix unlink picto
|
2019-10-12 19:16:36 +02:00 |
|
Frédéric FRANCE
|
d9ba09bec1
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 19:02:24 +02:00 |
|
Laurent Destailleur
|
9ba992b8b6
|
Work on inventory module
|
2019-10-12 12:31:35 +02:00 |
|
Laurent Destailleur
|
95305a313d
|
Fix trans
|
2019-10-11 17:02:35 +02:00 |
|
Laurent Destailleur
|
60bdb3133e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-11 16:57:56 +02:00 |
|
Laurent Destailleur
|
b58c2c38b2
|
Fix missing token
|
2019-10-11 16:57:47 +02:00 |
|
Laurent Destailleur
|
3f62a6d532
|
Merge pull request #12093 from frederic34/patch-23
fix search by roles
|
2019-10-11 16:57:33 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
cc73877e03
|
Merge branch 'develop' into patch-18
|
2019-10-11 16:32:48 +02:00 |
|
Laurent Destailleur
|
541357027e
|
Merge pull request #12077 from frederic34/patch-15
globe fontawesome
|
2019-10-11 16:31:37 +02:00 |
|
Laurent Destailleur
|
9251f04d63
|
Update thumbs of themes
|
2019-10-11 13:26:48 +02:00 |
|
Laurent Destailleur
|
5801d09dbe
|
NEW Use the squarre logo as favicon of pages
|
2019-10-11 12:28:13 +02:00 |
|
John Botella
|
9194eb4bec
|
Fix block title height if no button
|
2019-10-11 09:14:10 +02:00 |
|
John Botella
|
724999f1ce
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-11 08:40:43 +02:00 |
|
Frédéric FRANCE
|
c80d055af3
|
fix search by roles
|
2019-10-10 23:51:54 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Laurent Destailleur
|
e7f56b67d8
|
Look and feel v11
|
2019-10-10 23:00:33 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Frédéric FRANCE
|
be00576717
|
Update functions.lib.php
|
2019-10-10 08:22:14 +02:00 |
|
Frédéric FRANCE
|
d4757a0b5b
|
globe fontawesome
|
2019-10-09 23:20:15 +02:00 |
|
Laurent Destailleur
|
072a0a26d6
|
Use a font awesome icon to show "shippable" flag on orders.
|
2019-10-09 18:07:00 +02:00 |
|
Laurent Destailleur
|
db651a607d
|
Use fontawesome for img_warning
|
2019-10-09 17:33:46 +02:00 |
|
Laurent Destailleur
|
f2d04fe55c
|
Code comment
|
2019-10-09 11:51:10 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
f55a4d77e4
|
css
|
2019-10-08 16:41:03 +02:00 |
|
Laurent Destailleur
|
d55b7689bb
|
Merge pull request #11920 from ptibogxiv/patch-264
NEW translation for member type
|
2019-10-08 09:00:49 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
297313e7de
|
CSS
|
2019-10-07 16:01:36 +02:00 |
|
Laurent Destailleur
|
c6c498fd67
|
Merge pull request #11829 from atm-florian/dev_contactdefault
NEW : Address/Contact by default on third parties
|
2019-10-07 15:27:58 +02:00 |
|
ptibogxiv
|
9aa7226d39
|
Update member.lib.php
|
2019-10-07 13:38:05 +02:00 |
|
Laurent Destailleur
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +02:00 |
|
Laurent Destailleur
|
1060ac4608
|
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
Fix : LibStatut missing dolgetstatus usage
|
2019-10-07 13:08:33 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
Laurent Destailleur
|
ac8837d01f
|
Fix url
|
2019-10-05 19:28:00 +02:00 |
|
Laurent Destailleur
|
7f5ccf4b8e
|
Remove google+
|
2019-10-05 19:27:14 +02:00 |
|
Laurent Destailleur
|
031c5523d4
|
NEW Add link to the public interface on the ticket card.
|
2019-10-05 11:52:30 +02:00 |
|
stickler-ci
|
bc32d684a4
|
Fixing style errors.
|
2019-10-04 16:12:33 +00:00 |
|
florian HENRY
|
2d3dd9ed3c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-10-04 18:10:16 +02:00 |
|
Laurent Destailleur
|
503973cec9
|
FIX Edit of ticket module parameters erased others
|
2019-10-04 14:04:31 +02:00 |
|
ATM john
|
027c8224b0
|
Fix dolGetStatus unused
|
2019-10-03 21:34:01 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
ATM john
|
77f666a236
|
Fix dolGetStatus param
|
2019-10-03 21:28:11 +02:00 |
|
Alexandre SPANGARO
|
8668e7157a
|
Add bookmark fa-icon
|
2019-10-03 21:00:59 +02:00 |
|
Alexandre SPANGARO
|
d0840b038f
|
Remove constant MAIN_DISABLE_FONT_AWESOME_5
|
2019-10-03 20:42:02 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|
Frédéric FRANCE
|
0383fdbeee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 18:37:14 +02:00 |
|
Laurent Destailleur
|
c223c5635b
|
Merge pull request #12010 from laudeco/feature/12006-country-on-pdf-footer
[#12006] - adds the country in the address of the PDF's footer
|
2019-10-03 18:15:39 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Laurent Destailleur
|
e59c70116f
|
Merge pull request #12021 from frederic34/patch-14
fix broken search
|
2019-10-03 15:57:31 +02:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Frédéric FRANCE
|
feaa5e2bd0
|
json query path
|
2019-10-02 22:15:24 +02:00 |
|
Frédéric FRANCE
|
6d117a501a
|
Update company.lib.php
|
2019-10-02 22:11:27 +02:00 |
|
Frédéric FRANCE
|
453ae05030
|
Update company.lib.php
|
2019-10-02 22:09:50 +02:00 |
|
Frédéric FRANCE
|
9f7f263f79
|
fix broken search
|
2019-10-02 21:49:36 +02:00 |
|
Frédéric FRANCE
|
37bb548d21
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 20:56:32 +02:00 |
|
Laurent Destailleur
|
b6a95b4be5
|
Look and feel v11
|
2019-10-02 19:04:24 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
f89701b4d4
|
Fix technical id align on left
|
2019-10-02 18:55:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
florian HENRY
|
8c9cee1565
|
resolve conflict
|
2019-10-02 12:49:38 +02:00 |
|
florian HENRY
|
371ff76f5e
|
resolve copflict
|
2019-10-02 12:46:35 +02:00 |
|
Laurent Destailleur
|
ba7a288abb
|
Fix colspan and columns of contact of thirdparties
|
2019-10-01 23:28:13 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Frédéric FRANCE
|
26c34198bf
|
show contact
|
2019-10-01 21:38:16 +02:00 |
|
Laurent De Coninck
|
3a25beabe6
|
add the country in the address of the PDF's footer
|
2019-10-01 21:03:58 +02:00 |
|
ATM john
|
4d5ffbb5c4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-01 20:45:04 +02:00 |
|
florian HENRY
|
d48f0fa791
|
resolve conflixt
|
2019-10-01 18:07:59 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
Laurent Destailleur
|
fa921739ec
|
Remove duplicate code
|
2019-10-01 12:03:17 +02:00 |
|
Laurent Destailleur
|
11e01f5c86
|
Use correct style for table header
|
2019-10-01 12:02:28 +02:00 |
|
Laurent Destailleur
|
15e646cc62
|
Fix bad name of trigger
|
2019-10-01 11:34:35 +02:00 |
|
Laurent Destailleur
|
c7da05e4a1
|
Fix bad name of trigger
|
2019-10-01 11:28:10 +02:00 |
|
Laurent Destailleur
|
6ebd060315
|
Use php var with same name than html var
|
2019-10-01 11:23:38 +02:00 |
|
Laurent Destailleur
|
0828000626
|
Merge pull request #12005 from laudeco/feature/filter_contacts
working solution about filtering the contacs of one company
|
2019-10-01 11:19:29 +02:00 |
|
Laurent Destailleur
|
0f4f5d47f2
|
Update company.lib.php
|
2019-10-01 11:18:53 +02:00 |
|
Laurent Destailleur
|
955d9daf38
|
Update company.lib.php
|
2019-10-01 11:18:14 +02:00 |
|
stickler-ci
|
5e075d5d30
|
Fixing style errors.
|
2019-10-01 06:39:26 +00:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
ATM john
|
b01bd979b5
|
Unlock title button feature
|
2019-09-30 21:10:16 +02:00 |
|
Frédéric FRANCE
|
f32f528bc2
|
fix merge
|
2019-09-30 19:36:57 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
ecc2e8df67
|
Fix restore lost images
|
2019-09-30 17:58:31 +02:00 |
|
Laurent Destailleur
|
dc7ad61940
|
Add class reposition on button that switch the view mode
|
2019-09-30 17:46:53 +02:00 |
|
Laurent Destailleur
|
b390cff172
|
Fix css
|
2019-09-30 17:22:22 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Laurent Destailleur
|
d65af06d20
|
Merge pull request #11869 from atm-john/new_ticket_messaging_page
New ticket messaging page design
|
2019-09-30 15:34:35 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Laurent Destailleur
|
bbc98c19bc
|
Update functions.lib.php
|
2019-09-30 15:25:55 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
florian HENRY
|
885d958e63
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-27 20:12:09 +02:00 |
|
Laurent Destailleur
|
fd37a81e19
|
FIX #11861
|
2019-09-27 20:02:33 +02:00 |
|
Laurent Destailleur
|
981c5c877a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-27 20:02:08 +02:00 |
|
Laurent Destailleur
|
24ad67e0e1
|
Fix missing $conf
|
2019-09-27 20:01:57 +02:00 |
|
Laurent Destailleur
|
d0d884742f
|
FIX #11861 Not consistent code to manage measuring units
|
2019-09-27 19:45:33 +02:00 |
|
Laurent Destailleur
|
66cbb4020b
|
Merge branch 'develop' into patch-4
|
2019-09-27 14:46:39 +02:00 |
|
Alexandre SPANGARO
|
4b73e09c60
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-27 14:20:53 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
f96c9c3bb5
|
FIX #11931 #11963
|
2019-09-27 11:51:34 +02:00 |
|