Matt Sidnell
f93bdf6b22
Fix so company_admin tabs do not show in Societe
...
fix
2020-03-27 23:09:40 +00:00
Matt Sidnell
815ae3cb09
Ability to add new tabs on company admin section
...
I have added the option to add a tab from a module to the main company setup section. I need this ability so thought that others might too.
2020-03-27 21:51:34 +00:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
stickler-ci
208049a8f2
Fixing style errors.
2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c
set as global
2020-03-26 08:24:20 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
3855ef6073
Add rounding code 'CR' (currency rate'
2020-03-25 17:41:39 +01:00
Laurent Destailleur
f509c6a266
Add user id into ajaxconst_onoff
2020-03-25 16:00:42 +01:00
florian HENRY
81d86f717d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-25 12:14:54 +01:00
Laurent Destailleur
92db075aa1
Add parameter morecss to img_credit_card()
2020-03-24 21:40:25 +01:00
florian HENRY
6e4038a051
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-24 19:50:19 +01:00
florian HENRY
46a4184f15
NEW : Project task list, add column selector and extrafields
2020-03-24 19:50:01 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
gauthier
4c0de74470
FIX : sort by default role makes no sense
2020-03-24 16:27:53 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46
Align color of graph of status on status color
2020-03-24 13:06:59 +01:00
Laurent Destailleur
f56de9f177
Fix autocalculation of timespent in monthy mode
2020-03-23 22:04:40 +01:00
Laurent Destailleur
063cf15bcb
Clean code
2020-03-23 20:16:51 +01:00
Laurent Destailleur
c249a1af14
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2020-03-23 17:39:09 +01:00
Laurent Destailleur
2a310b09af
Fix phpcs
2020-03-23 17:24:47 +01:00
Laurent Destailleur
b18d3e5588
Fix var not defined
2020-03-23 15:58:47 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
01e60562b9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
24dc202022
Doc
2020-03-23 15:33:52 +01:00
Laurent Destailleur
2177afecd9
Sort order
2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
7d22ccbd12
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-23 05:50:07 +01:00
Laurent Destailleur
c80c247a84
Fix phpcs
2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8
Fix phpcs
2020-03-22 20:22:08 +01:00
Laurent Destailleur
6f3cbe69e8
Fix phpcs
2020-03-22 19:40:58 +01:00
Laurent Destailleur
b0f3fba71a
Fix phpcs
2020-03-22 18:27:56 +01:00
Laurent Destailleur
3d6849dfea
Fix label of tabs
2020-03-22 17:27:08 +01:00
Alexandre SPANGARO
c05ef16e0b
Work on split module fournisseur
2020-03-22 05:51:14 +01:00
Laurent Destailleur
bcf17c79ef
FIX closing tags
2020-03-22 02:44:00 +01:00
Laurent Destailleur
e2acb0c65e
code indent
2020-03-21 19:37:09 +01:00
Laurent Destailleur
792b9228d3
Can search in several different type of containers
2020-03-21 19:09:14 +01:00
Laurent Destailleur
83b8497d28
Rename sample file so we can use color editor
2020-03-21 17:58:03 +01:00
Laurent Destailleur
4ce1665a15
Fix charset in RSS export
2020-03-21 17:36:07 +01:00
Laurent Destailleur
79086011f8
Work on RSS export of blog posts
2020-03-21 17:31:44 +01:00
Laurent Destailleur
666b38b44a
Fix charset in RSS export
2020-03-21 17:31:09 +01:00
Laurent Destailleur
7370268b13
Tool to regenerate files
2020-03-21 11:04:33 +01:00
Laurent Destailleur
27015fc6f6
NEW Add method to add social network sharing buttons on blog posts
2020-03-20 19:34:49 +01:00
Laurent Destailleur
a2f9f72973
Enhance website module
2020-03-20 18:58:45 +01:00
Laurent Destailleur
f904ff5240
Add dol_escape_json method
2020-03-20 17:10:35 +01:00
Laurent Destailleur
aa1f601528
FIX Backto link
2020-03-20 16:30:45 +01:00
Laurent Destailleur
a0086d73a1
Merge pull request #13371 from aspangaro/12.0_a23
...
Work on split module fournisseur
2020-03-20 10:37:54 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
7eb4522636
FIX missing token and save of survey description
2020-03-19 11:59:57 +01:00
Alexandre SPANGARO
bac099dc60
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-19 11:48:21 +01:00
Laurent Destailleur
8e1ffa5144
Fix management of token
2020-03-19 10:52:07 +01:00
Laurent Destailleur
a76392f944
Responsive
2020-03-17 21:26:25 +01:00
Alexandre SPANGARO
033f796398
Work on split module fournisseur
2020-03-17 14:51:48 +01:00
Laurent Destailleur
76fc722638
NEW Can get some variables (not available by default)
2020-03-17 13:33:21 +01:00
Laurent Destailleur
5f255a6c14
A new way to navigate between pages in list is available
2020-03-17 03:24:24 +01:00
Laurent Destailleur
aef827f826
Alias on same line than name
2020-03-14 14:47:01 +01:00
Laurent Destailleur
f92943bee2
css
2020-03-14 03:24:46 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a
NEW Another way to navigate between pages for some lists
2020-03-13 12:53:22 +01:00
Laurent Destailleur
d3447bb44b
Fix duplicate /
2020-03-13 10:14:26 +01:00
Laurent Destailleur
4bd1c6c717
Fix hreflink
2020-03-13 09:51:41 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
fc05e8d768
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
2020-03-11 18:03:15 +01:00
Laurent Destailleur
25eae4db9c
Fix missing __USER_EMAIL__ substitution
2020-03-11 16:28:00 +01:00
Laurent Destailleur
26fec2f366
Enhance website
2020-03-11 12:53:41 +01:00
Laurent Destailleur
99b1c773a7
FIX link when using anchor on "/"
2020-03-09 18:56:52 +01:00
Laurent Destailleur
e536ee87b8
FIX link when using anchor on "/"
2020-03-09 18:54:34 +01:00
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
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +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
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +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
Alexandre SPANGARO
e38bb89a2e
NEW Add fa_icon on load_fiche_titre
2019-09-27 11:48:40 +02:00
Laurent Destailleur
6fbb5c0db7
Merge pull request #11963 from aspangaro/11.0_fa_icon
...
#11931 NEW Add fa_icon "tools" for load_fiche_titre
2019-09-27 11:38:44 +02:00
Laurent Destailleur
e03667dc75
Merge pull request #11939 from frederic34/patch-17
...
fix badge linked resources on fichinter
2019-09-27 11:32:27 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Laurent Destailleur
aa5f35f14f
Fix image on ticket
2019-09-26 14:28:34 +02:00
Laurent De Coninck
040e7bdfdf
working solution about filtering the contacs of one company
2019-09-25 18:24:36 +02:00
Alexandre SPANGARO
f4929c5315
NEW Add fa_icon "tools" for load_fiche_titre
2019-09-25 15:24:52 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9
Fix az09 -> aZ09
2019-09-24 14:20:29 +02:00
Laurent Destailleur
6431e8e16d
FIX SQL injection on qty
2019-09-24 12:43:44 +02:00
Laurent Destailleur
7b3e64d67f
NEW Support of Extrafields on Leave requests.
2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8
FIX Substitution of __PROJECT_XXX__ not done
2019-09-23 13:04:22 +02:00
Frédéric FRANCE
44ba0deae6
fix badge linked resources on fichinter
2019-09-20 17:58:22 +02:00
Laurent Destailleur
345ac28c89
Fix js injection
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
John Botella
d72548bd76
add filters
2019-09-18 13:43:34 +02:00
Laurent Destailleur
3f6afa810c
Code comment
2019-09-17 17:55:30 +02:00
ptibogxiv
c8bfd2c7c2
NEW translation for member type
...
usefull for sync with API and multilanguage front end or application
2019-09-17 13:37:34 +02:00
Frédéric FRANCE
e43f3a0f58
Update functions.lib.php
2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a
Update functions.lib.php
2019-09-16 17:57:40 +02:00
John Botella
010e58d957
Add switch view behavior
2019-09-16 13:56:07 +02:00
Laurent Destailleur
544a1237bc
FIX regression with option to hide picto on top menu
2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2
FIX regression with option to hide picto on top menu
2019-09-15 15:09:36 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Laurent Destailleur
584549df11
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/index.php
2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/accountancy/index.php
2019-09-14 18:23:20 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Laurent Destailleur
166d56f7a3
Removed function dol_micro_time. Use native PHP microtime instead.
2019-09-13 11:15:49 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-12 21:52:06 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project
2019-09-12 21:39:57 +02:00
ATM john
859904587f
add private support and title buttons
2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Frédéric FRANCE
cd109d04cd
add function
2019-09-12 20:44:24 +02:00
John Botella
7dcb871048
Fix private message type
2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
florian HENRY
d6dcbc714c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-12 09:38:14 +02:00
stickler-ci
b2187c829a
Fixing style errors.
2019-09-11 22:44:17 +00:00
ATM john
bf924f113e
Add more style ans edit button
2019-09-12 00:37:36 +02:00
Laurent Destailleur
84e197e48a
Clean code
2019-09-12 00:09:49 +02:00
Laurent Destailleur
d7d764e5f9
Fix var not defined
2019-09-11 23:56:53 +02:00
ATM john
907669bb51
New ticket messaging page
2019-09-11 23:30:09 +02:00
Frédéric FRANCE
e0f17cc71c
add socialnetworks dictionary
2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Laurent Destailleur
3f3282400a
FIX SQL syntax error and CSRF check on vat reports
2019-09-11 13:57:15 +02:00
Laurent Destailleur
5f236fda2e
More complete error message with hour/min/sec
2019-09-11 00:28:09 +02:00
Laurent Destailleur
eb2f48332b
Show first line of code
2019-09-10 15:58:56 +02:00
Laurent Destailleur
48aedcee20
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55
FIX missing include (dol_convert_file not found)
2019-09-10 15:29:33 +02:00
florian HENRY
42cd15400d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-09 14:12:34 +02:00
Laurent Destailleur
d3bc05de76
Merge pull request #11848 from atm-john/add_progress_to_global_task_list
...
Add progress to global task list
2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b
Merge pull request #11846 from atm-john/fix_missing_total_progress
...
Fix missing total progress column
2019-09-09 13:07:10 +02:00
florian HENRY
63a83a0fa5
resolve conflict
2019-09-09 11:35:37 +02:00
Laurent Destailleur
73c3fa40bf
Update phpunit
2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8
NEW Public holidays are now in a table (no more hard coded per country)
2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380
resolve conflict
2019-09-09 10:15:44 +02:00
ATM john
ecddeb2b8b
Add progress to global task list
2019-09-08 21:19:15 +02:00
ATM john
fa5cda2e88
Fix missing total progress column
2019-09-08 18:03:14 +02:00
Laurent Destailleur
f08c07f315
Fix bugs reported by scrutinizer
2019-09-06 10:42:51 +02:00
florian HENRY
dff7be59c8
mostlyDone
2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +02:00
Laurent Destailleur
f893854986
Fix remove warnings
2019-09-05 14:24:13 +02:00
Laurent Destailleur
4a19f510fd
Fix scrutinizer reports
2019-09-05 13:58:35 +02:00
Laurent Destailleur
f4a7714f82
Fix bad log
2019-09-05 13:42:58 +02:00
Laurent Destailleur
9666200d6b
Enhance error management
2019-09-04 19:55:15 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
Laurent Destailleur
b445c0eec7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
florian HENRY
73c5b9617f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-03 17:07:59 +02:00
florian HENRY
6c20fbafdf
add trigger files
2019-09-03 17:04:42 +02:00
Laurent Destailleur
ca7ce63648
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2019-09-02 23:04:15 +02:00
Laurent Destailleur
a126b1e538
FIX Add char $ and ; in sanitizing of filenames.
2019-09-02 22:25:44 +02:00
florian HENRY
d811de4da2
let only triggers part
2019-09-02 22:01:48 +02:00
Laurent Destailleur
a96742ee9b
Can search into global site files.
...
Support of cancel to previous page
2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027
Work on search on global site files
2019-09-02 16:39:56 +02:00
florian HENRY
405c92640c
on going
2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9
start dev
2019-09-02 11:27:04 +02:00
Laurent Destailleur
29d2e7edd0
missing reposition
2019-09-02 04:39:36 +02:00
Laurent Destailleur
ee15ccf82e
missing reposition
2019-09-02 04:28:55 +02:00
Laurent Destailleur
40890ae345
Fix scrutinizer
2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e
Prepare reengeneering of project usage
2019-09-01 02:02:38 +02:00
Laurent Destailleur
7f5728ead9
A better message when database is off.
2019-08-31 19:39:39 +02:00
Laurent Destailleur
2f49fc6a7b
Fix scrutinizer
2019-08-31 02:49:54 +02:00
Laurent Destailleur
a3e221468a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7
Fix js injection
2019-08-30 16:22:24 +02:00
Laurent Destailleur
01962cbc67
Clean code
2019-08-29 13:17:14 +02:00
Laurent Destailleur
ff7c122b6d
Add class specific to web page ref
2019-08-29 02:36:32 +02:00
Laurent Destailleur
76ae0cebd6
We don't need anymore code to manage dol_use_jmobile = 3 or 4
2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619
Fix compatibility with old multicompany modules
2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09
NEW Add option multiselect for developers on the selector of language.
2019-08-28 16:06:19 +02:00
Laurent Destailleur
c0262f1e19
Fix type integer
2019-08-28 12:24:56 +02:00
Laurent Destailleur
9109eeaa77
Fix type integer
2019-08-28 12:24:35 +02:00
Laurent Destailleur
7236df37d4
FIX error management when adding a property with type real
2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201
FIX error management when adding a property with type real
2019-08-28 12:10:28 +02:00
Laurent Destailleur
e3a4ad00d7
Code comment
2019-08-28 10:22:40 +02:00
Laurent Destailleur
04e11bcbd1
Doxygen
2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85
Add context 'ws' for web services authentication.
2019-08-27 20:35:06 +02:00
Laurent Destailleur
69688a22e0
Merge
2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6
Fix remove warning
2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c
Add phpunit testDolStringIsGoodIso
2019-08-27 12:25:24 +02:00
Laurent Destailleur
60c3cefc53
FIX Api of documents work with value 'thirdparty'
2019-08-25 16:44:39 +02:00
Laurent Destailleur
69b2d03c47
FIX Api of documents work with value 'thirdparty'
2019-08-25 16:41:59 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
cdda08c0d3
FIX #11685
2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224
...
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Regis Houssin
90f60b0137
FIX add $context parameter in checkLoginPassEntity
2019-08-22 10:56:07 +02:00
Laurent Destailleur
b06dab6930
Fix add option to restore backward compatibility
2019-08-22 00:44:28 +02:00
Laurent Destailleur
bfbabbf626
Update geoip v1
2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e
Code comment
2019-08-21 17:28:54 +02:00
Laurent Destailleur
2c3b2cd1a0
Look and feel
2019-08-21 04:21:43 +02:00
Laurent Destailleur
c60fc6c3d4
Add param logcontext on dol_syslog
2019-08-20 13:57:25 +02:00
Laurent Destailleur
d304749eca
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-19 10:19:14 +02:00
Laurent Destailleur
cc3fd0f1f6
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
...
FIX/NEW task widget and add task progress bar
2019-08-19 10:05:16 +02:00
Laurent Destailleur
18886c701d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/lib/company.lib.php
2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3
FIX too many record in sql request. Whena criteria is a filter, we must
...
use an inner join.
2019-08-18 23:59:24 +02:00
Laurent Destailleur
4fd68798a3
Fix phpcs
2019-08-18 20:38:51 +02:00
Laurent Destailleur
2f46b40da2
Prepare feature "Never show this message again"
2019-08-18 18:36:18 +02:00
Laurent Destailleur
7e4cf224ec
Merge branch 'develop' into develop_new_task_progress_bar
2019-08-18 05:38:45 +02:00
Laurent Destailleur
3f105a97bf
Debug the new workboard
2019-08-18 04:56:48 +02:00
Laurent Destailleur
b8e1cc8d16
Enhance #11643
2019-08-18 03:42:38 +02:00
Laurent Destailleur
467ad3ed22
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00
Laurent Destailleur
898996da4a
FIX vulenrability in uploading file found by 美创科技安全实验室
2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4
Fix phpcs
2019-08-16 17:35:12 +02:00
Laurent Destailleur
1f2eb31e41
Set utf-8 in lowercase
2019-08-16 06:06:36 +02:00
Laurent Destailleur
318b27e084
Fix link
2019-08-16 05:33:45 +02:00
Laurent Destailleur
63520e1d9b
Fix link
2019-08-16 05:32:24 +02:00
Laurent Destailleur
62438b61f0
Better error message
2019-08-16 05:14:20 +02:00
Laurent Destailleur
9a455cf1d6
Fix link
2019-08-16 05:03:48 +02:00
Laurent Destailleur
d5ce7fbaaf
Fix links
2019-08-16 05:01:54 +02:00
Laurent Destailleur
7580efbd4e
Fix link replacement
2019-08-16 04:32:06 +02:00
Laurent Destailleur
2510c1e5e4
Better help text
2019-08-16 03:05:55 +02:00
Laurent Destailleur
08038e5078
FIX save of empty files
2019-08-16 02:31:06 +02:00
Laurent Destailleur
31c26edaf7
Fix link
2019-08-16 00:31:55 +02:00
Laurent Destailleur
0045428c6c
Fix link
2019-08-15 23:45:28 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu
...
NEW add new function "setEntity()" and better compatibility with Multicompany
2019-08-15 21:00:05 +02:00
Laurent Destailleur
c0ac8daa61
Introduce the color theme "flashy" to use the high contrast color as an
...
option because colors seems too agressive for sensible eyes.
2019-08-15 20:18:12 +02:00
Laurent Destailleur
76ae2695b2
Merge pull request #11690 from OPEN-DSI/new-expedition-list-massaction
...
NEW add mass actions and FIX type ent array not defined in shipment list
2019-08-15 19:14:34 +02:00
Laurent Destailleur
1c372251de
Merge pull request #11691 from jtraulle/feature-rest-api-supplierinvoices-payments
...
NEW Add GET and POST /supplierinvoices/payments REST API endpoints.
2019-08-15 19:13:32 +02:00
Laurent Destailleur
9cb5ba35dd
Merge pull request #11681 from hregis/10.0_mc
...
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
2019-08-15 19:08:42 +02:00
Laurent Destailleur
59625dceb5
Fix phpcs
2019-08-15 19:03:30 +02:00
Laurent Destailleur
b5d72edebc
Can add more samples of pages. Add an exemple of page with dynamic
...
content.
2019-08-15 18:07:36 +02:00
Laurent Destailleur
c92488986b
NEW Can have a preview of website template when loading a template
2019-08-15 02:32:07 +02:00
Laurent Destailleur
ca256a6635
Add shadow style
2019-08-15 01:58:22 +02:00
Laurent Destailleur
f81463af0c
Update templates
2019-08-15 00:55:47 +02:00
Jean Traullé
4252a2c868
Merge branch 'develop' into feature-rest-api-supplierinvoices-payments
2019-08-14 23:35:35 +02:00
Jean Traullé
c739b95666
Fix codestyle
...
lessc.class.php should be excluded from ruleset as it is an external lib
2019-08-14 23:33:06 +02:00
Laurent Destailleur
f753799810
FIX Support #tag into url of website module
2019-08-14 23:27:34 +02:00
Jean Traullé
6d55af2530
Merge remote-tracking branch 'remotes/upstream/develop' into feature-rest-api-supplierinvoices-payments
2019-08-14 23:24:15 +02:00
Jean Traullé
1d2c2f8551
NEW Add payments GET and POST REST API endpoints for supplierinvoices.
2019-08-14 23:00:40 +02:00
Laurent Destailleur
0818571827
Work on the edit inline tool.
2019-08-14 19:48:52 +02:00
VESSILLER
b19817194d
NEW add mass actions and FIX type ent array not defined in shipment list
2019-08-14 17:11:59 +02:00
VESSILLER
891cd155ea
NEW add mass actions and FIX type ent array not defined in shipment list
2019-08-14 17:04:13 +02:00
Laurent Destailleur
10a3e773ce
FIX Avoid to add new line in css file at each save
2019-08-14 16:28:41 +02:00
Laurent Destailleur
12bebdefbb
Fix can replace PclZip with ZipArchive
2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091
FIX Option to use ZipArchive instead of PclZip bugged with large files.
2019-08-14 04:07:02 +02:00
Laurent Destailleur
6de2118f11
FIX Bad error management in zip compress and web site export
...
Conflicts:
htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7
FIX Missing some replacements in website module
...
Conflicts:
htdocs/website/index.php
2019-08-14 04:02:57 +02:00
Laurent Destailleur
f1c6f1b375
Fix can replace PclZip with ZipArchive
2019-08-14 04:00:08 +02:00
Laurent Destailleur
b0172f136b
FIX Option to use ZipArchive instead of PclZip bugged with large files.
2019-08-14 03:43:15 +02:00
Laurent Destailleur
bc230c2d25
FIX Bad error management in zip compress and web site export
2019-08-14 01:43:06 +02:00
Laurent Destailleur
df53826426
FIX Missing some replacements in website module
2019-08-13 18:22:18 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php
2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-13 17:47:30 +02:00
Regis Houssin
34579dd4db
FIX phpcs
2019-08-13 07:46:03 +02:00
Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
Laurent Destailleur
49e61e237c
Better log
2019-08-13 07:08:45 +02:00
Laurent Destailleur
91cdb2a5a8
Add more logs
2019-08-13 07:05:06 +02:00
Laurent Destailleur
7891c8d856
Enhance logs
2019-08-13 06:52:07 +02:00
Laurent Destailleur
99473097a9
FIX Add log and type of content in dolWebsiteOutput and
...
dolWebsiteReplacementOfLinks
Conflicts:
htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
277a693c16
FIX Add log and type of content in dolWebsiteOutput and
...
dolWebsiteReplacementOfLinks
2019-08-13 06:37:06 +02:00
Laurent Destailleur
ae4bead85c
Fix missing function
2019-08-13 04:43:50 +02:00
Laurent Destailleur
7824731f17
NEW Add feature to search a string into containers
2019-08-13 00:34:42 +02:00
ATM john
b193f1b34e
Fix travis
2019-08-12 23:33:00 +02:00
Lenin Rivas
5c1a84746c
Add Linked objects Fichinter Ref. in PDF formats
2019-08-12 15:21:41 -05:00
Laurent Destailleur
8ad2081555
NEW Can select website templates from available default templates
2019-08-12 22:19:24 +02:00
Laurent Destailleur
c986dbc71f
NEW Add search into template
2019-08-12 20:32:18 +02:00
Laurent Destailleur
de1af78ae6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 17:38:54 +02:00
Laurent Destailleur
18e4d1b334
Fix to avoid to die page when there is a redirect.
2019-08-12 17:22:46 +02:00
ATM john
1ffb013371
add filter
2019-08-12 15:24:07 +02:00
Laurent Destailleur
446f0590dc
FIX VAT number for Monaco (it uses FR)
2019-08-12 13:45:04 +02:00
ATM john
53721ae606
move late warning sign
2019-08-10 23:09:27 +02:00
ATM john
89447acaf3
remove tooltip on progress bar
2019-08-10 23:07:12 +02:00
ATM john
eedd065f48
remove useless function usage
2019-08-10 22:59:09 +02:00
ATM john
09c1289802
Fix task widget and improve its display
2019-08-10 22:48:07 +02:00
ATM john
527e4dcf46
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar
2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5
Add progress bar for task list and visual status badges
2019-08-10 15:41:21 +02:00
John Botella
63191dab7d
Add user color blind option
2019-08-07 12:03:19 +02:00
John Botella
4aeaa580ea
Add color blind option
2019-08-07 11:11:47 +02:00
Laurent Destailleur
c34739ab3f
Fix A file for a hidden feature provides a service without security
...
checks.
2019-08-02 19:25:50 +02:00
Laurent Destailleur
b9ee95314a
SEC restrictedArea protects also the 'update' action
2019-08-02 17:12:59 +02:00
Laurent Destailleur
89a5a8188f
Fix A file for a hidden feature provides a service without security
...
checks.
2019-08-02 17:12:03 +02:00
Laurent Destailleur
a03771ce61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:40 +02:00
Laurent Destailleur
3d8f6dca76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:32 +02:00
Laurent Destailleur
bf14b4b3d5
Add Canada Dollar in currency that need symbol before
2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b
Merge pull request #11605 from grandoc/new_branch_01_08_2019
...
add CAN$ within list of currencies before
2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af
Update functions.lib.php
2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19
Update functions.lib.php
2019-08-01 16:14:53 +02:00
dolibarr95
b066431e0e
Add phone format for Jamaica
2019-08-01 15:46:34 +02:00
Laurent Destailleur
d6ae62478c
FIX #10984 FIX reposition on "Build backup" button
...
FIX Fatal error on dol_htmloutput_mesg with corrupted array
2019-08-01 15:42:44 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
Laurent Destailleur
12b530c418
FIX Setup of TakePos was not possible after a clean install
2019-08-01 11:27:35 +02:00
Philippe GRAND
4b8963587a
add CAN$ within list of currencies before
2019-08-01 10:02:53 +02:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
1f3e509603
Show message when a redirect is done.
2019-07-28 21:24:42 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-25 17:52:40 +02:00
Laurent Destailleur
8241bc414a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2019-07-25 17:52:17 +02:00
Laurent Destailleur
fe9ddd7649
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2019-07-25 17:50:07 +02:00
Laurent Destailleur
fe22f11f10
More generic code
2019-07-25 15:07:00 +02:00
Laurent Destailleur
351b877c05
Add structured data product
2019-07-25 14:39:22 +02:00
Laurent Destailleur
fb2a9e371c
Fix syntax
2019-07-25 14:27:53 +02:00
Laurent Destailleur
6674b8975b
Fix logo of organization
2019-07-25 14:26:48 +02:00
Laurent Destailleur
1978ffb370
Fix
2019-07-25 14:21:39 +02:00
Laurent Destailleur
e29023f155
Fix
2019-07-25 14:12:22 +02:00
Laurent Destailleur
5fd35c1bc9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/website.lib.php
2019-07-25 13:51:12 +02:00
Laurent Destailleur
d1aa15004e
NEW Add method getStructuredData for website
2019-07-25 13:49:56 +02:00
Laurent Destailleur
0bb92ff10d
NEW Add method getStructuredDataForBlogPost for website
2019-07-25 13:48:13 +02:00
Laurent Destailleur
151075402f
css
2019-07-24 17:15:25 +02:00
atm-josselin
0a1f4b7931
FIX : correct error in files with multiple spaces
2019-07-23 09:45:17 +02:00
Laurent Destailleur
bf55733678
NEW Replace the "info" tab on contract with the more complete "agenda"
...
tag.
2019-07-23 02:45:31 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Laurent Destailleur
de18d5d187
Enhance phpstan
2019-07-20 16:22:00 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Alexandre SPANGARO
8b8aaafc05
Merge branch 'develop' into 10.0_intracommreport
2019-07-20 05:47:31 +02:00
Laurent Destailleur
220f8300c1
FIX Responsive of public interface of ticket
2019-07-20 00:14:14 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
14751680d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-19 13:38:05 +02:00
Regis Houssin
7ffc46e1da
FIX When we are in update mode, so we use $this->entity
2019-07-19 09:47:05 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
6c3a30e872
Fix log
2019-07-19 03:05:55 +02:00
Laurent Destailleur
b9fe874b5f
Revert "Merge pull request #11022 from altatof/freetext"
...
This reverts commit 879b4d8e7fddc01b4c27
2019-07-18 18:19:51 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext
...
NEW : manage output languages for free text
2019-07-18 17:29:45 +02:00
Alexandre SPANGARO
21bd46fc15
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda
NEW Extrafields on salaries
2019-07-17 14:09:25 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
9b32763919
Fix label for report n ledger for transitionnal bank account on tranfer
2019-07-05 15:25:29 +02:00
Laurent Destailleur
e3359c6f0f
FIX Can't submit a ticket from public interface
2019-07-05 11:21:04 +02:00
Laurent Destailleur
4e00cfb455
Clean code
2019-07-04 16:02:04 +02:00
Laurent Destailleur
fb8c93a69d
FIX Bad sql request
2019-07-04 16:00:14 +02:00
Laurent Destailleur
c9477f5c4f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2019-07-01 13:29:33 +02:00
John Botella
9c2e83dcae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-07-01 09:51:26 +02:00
Laurent Destailleur
8f5b575b19
Fix missing php-intl is not blocking (not working on windows)
2019-06-30 16:19:26 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
Alexandre SPANGARO
8f0f8f74f7
WIP
2019-06-26 17:13:38 +02:00
atm-quentin
49db277368
FIX ending slash
2019-06-26 16:42:14 +02:00
Alexandre SPANGARO
9da91c06ed
Merge branch 'develop' into 10.0_intracommreport
2019-06-26 15:11:43 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared
...
NEW Add global task declared progression
2019-06-24 18:12:55 +02:00
Laurent Destailleur
3c4956838e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +02:00
John Botella
ec7446762c
Fix travis
2019-06-24 14:36:06 +02:00
Laurent Destailleur
76d49229cd
Fix log
2019-06-24 13:42:46 +02:00
Laurent Destailleur
1c86294f83
Enhance pdf_getFormat
2019-06-24 13:39:32 +02:00
Laurent Destailleur
1699413a4c
Add log
2019-06-24 12:59:16 +02:00
John Botella
9c414a7a57
Change function to camel case
2019-06-24 12:22:33 +02:00
John Botella
a83e7f3665
Add retained warranty to PDF
2019-06-24 12:00:55 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Alexandre SPANGARO
4a84dcaa62
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-06-23 21:47:34 +02:00
Laurent Destailleur
6cab4f03ba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 12:10:50 +02:00
Laurent Destailleur
a4cd7772ef
Fix title
2019-06-22 12:02:41 +02:00
John Botella
ec7ebe9f39
redo backported fix and update adherent substitution methode
2019-06-21 15:32:38 +02:00
John Botella
200b66d11f
Remove a backported fix because failling at init test
2019-06-21 14:52:12 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Maxime Kohlhaas
b0229d1b9a
Global task declared progression on project task tab
2019-06-20 14:07:44 +02:00
Laurent Destailleur
ff0f6295d8
Fix phpcs
2019-06-20 13:59:53 +02:00
Laurent Destailleur
6975e18233
Fix phpcs
2019-06-20 13:59:04 +02:00
Laurent Destailleur
4ffa48d9bd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 13:50:47 +02:00
Laurent Destailleur
29e3199639
Fix phpcs
2019-06-20 13:39:29 +02:00
Laurent Destailleur
e9da44e023
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 12:33:02 +02:00
Laurent Destailleur
cb057e9c6d
NEW Add hidden option to be ready for BREXIT
2019-06-20 12:32:14 +02:00
John Botella
b21006614c
Fix substitutions null
2019-06-20 12:00:44 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
ee8e7d66f8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
...
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf
...
FIX better method to check if pdf is protected/encrypted
2019-06-20 03:22:51 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
...
Allow zero as account number
2019-06-20 03:09:37 +02:00
Laurent Destailleur
d6b6f77e74
Fix support domains with 3 levels
2019-06-19 22:06:12 +02:00
Laurent Destailleur
68e9712f0c
Fix support domains with 3 levels
2019-06-19 22:05:38 +02:00
Alexandre SPANGARO
abfb708044
Merge branch 'develop' into 10.0_intracommreport
2019-06-19 21:43:40 +02:00
Alexandre SPANGARO
c59de49894
Translate rights
2019-06-18 22:38:52 +02:00
Laurent Destailleur
20e00ca290
FIX if last char of customercode is accent making the truncate of first
...
chars wrong.
2019-06-18 19:41:16 +02:00
Laurent Destailleur
42e58d9ea5
Fix preview of interventions
2019-06-17 18:38:14 +02:00
Eric Seigne
80d4d8754d
allow zero as accountancy code nomber (replace all empty tests by != '')
2019-06-17 18:28:11 +02:00
Regis Houssin
3afd4e15ad
FIX try to remove ob_* functions
2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf
2019-06-17 07:08:35 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction
...
FIX empty test
2019-06-14 13:51:34 +02:00
Laurent Destailleur
1fa1b91916
Update product.lib.php
2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db
Update product.lib.php
2019-06-14 13:38:52 +02:00
ATM john
e7d81a68f0
Fix Override Attribute
2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a
Fix empty test
2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf
Update product.lib.php
2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58
Fix measuring_units_string display function
2019-06-13 20:52:52 +02:00
Laurent Destailleur
f00c9a10db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
900e860f6d
Fix list of events for BOM module
2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d
Fix look and field v10
2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34
Fix cropping of image files for BOM module was ko
2019-06-12 19:00:34 +02:00
Laurent Destailleur
f6d8b46b40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
2019-06-07 22:58:58 +02:00
Laurent Destailleur
0a903da5dc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
2019-06-07 22:53:30 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php
2019-06-07 18:09:43 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable
...
warning with php 7.2
2019-06-06 09:49:32 +02:00
Laurent Destailleur
a08dcec7fc
Fix doc
2019-06-04 20:02:29 +02:00
Laurent Destailleur
210b2f37dc
Fix error message
2019-06-04 19:18:20 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
79a3e41418
Hook 'getAccessForbiddenMessage'
2019-06-04 12:48:06 +02:00
Lionel VESSILLER
490e85f494
Fix PSR2
2019-06-03 16:34:49 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Regis Houssin
e5e6111544
FIX wrong function name
2019-06-03 12:05:58 +02:00
Regis Houssin
b0042995ac
FIX add docs
2019-06-03 12:04:17 +02:00
Regis Houssin
38246b4088
NEW add new function "setEntity()"
2019-06-03 11:13:26 +02:00
Regis Houssin
7b8b1a9052
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-03 11:04:28 +02:00
Regis Houssin
43ada3fcd4
FIX better method to check if pdf is protected/encrypted
2019-06-03 09:36:00 +02:00
Laurent Destailleur
5530e003ba
Fix title
2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af
Fix missing title
2019-06-02 19:47:01 +02:00
Laurent Destailleur
ab73d8a6fc
Merge pull request #11258 from hregis/develop_security
...
FIX add Windows and Mac executable
2019-05-29 13:52:19 +02:00
Laurent Destailleur
05063016e8
FIX #11244 Enhance repair tool
2019-05-29 12:21:51 +02:00
Laurent Destailleur
a524fd17ce
Fix phpcs
2019-05-29 10:03:05 +02:00
Laurent Destailleur
3841fb5a85
Fix doxygen
2019-05-28 22:18:46 +02:00
Laurent Destailleur
454316a5fa
Fix getDomainFromURL
2019-05-28 22:18:22 +02:00
Laurent Destailleur
2404e6a521
Fix cast to int
2019-05-28 12:38:21 +02:00
Regis Houssin
3df6f0f6c3
FIX wrong extension
2019-05-27 11:43:06 +02:00
Regis Houssin
c1242f409b
FIX add Windows and Mac executable
2019-05-27 11:32:46 +02:00
Laurent Destailleur
c8970c0283
Fix vat validator
2019-05-22 16:50:53 +02:00
Laurent Destailleur
fb95fe0606
Check vat is not case sensitive
2019-05-22 16:15:26 +02:00
Laurent Destailleur
65acd6ef60
Fix function to check vat syntax
2019-05-22 15:48:07 +02:00
Laurent Destailleur
11bcfb4f5e
Fix check on VAT syntax not visible on list
2019-05-22 15:37:59 +02:00
Regis Houssin
4f2f23f522
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-22 08:45:31 +02:00
Laurent Destailleur
42f5ebed2d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/external_rss.php
htdocs/admin/system/database-tables.php
htdocs/admin/tools/export_files.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/files.lib.php
htdocs/core/lib/functions.lib.php
2019-05-21 15:13:25 +02:00
Laurent Destailleur
f283e24b48
Fix the noexe must be added for dangerous extension like js and shells
2019-05-21 13:53:12 +02:00
Laurent Destailleur
eafc35b00f
Look and feel v10
2019-05-21 13:27:45 +02:00
Regis Houssin
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +02:00
Alexandre SPANGARO
f9e3a958c4
NEW Module Intracomm report
2019-05-19 10:44:09 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:06:20 +02:00
Laurent Destailleur
7738787729
Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2019-05-19 02:03:16 +02:00
Maxime Kohlhaas
1d980342ec
Fix #8344
2019-05-19 00:05:23 +02:00
Laurent Destailleur
41cb13b1cc
Fix warning
2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a
FIX Disable a module
2019-05-18 19:22:17 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
...
FIX: scrutinizer feedback
2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb
FIX scrutinizer feedback
2019-05-18 15:53:07 +02:00
Laurent Destailleur
26d4875f8f
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-18 02:26:40 +02:00
Maxime Kohlhaas
2a2f0557cf
Fix : display hr tab on user if rights to read all
2019-05-17 17:07:38 +02:00
Laurent Destailleur
2d0b3b7b23
Fix dol_sort_array for objects
2019-05-16 12:25:14 +02:00
Laurent Destailleur
4a69541419
Several bug fixes using phpstan
2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213
Fix doc
2019-05-15 17:50:35 +02:00
Laurent Destailleur
75646e365d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/contrat/services_list.php
htdocs/expensereport/list.php
htdocs/product/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/contrat/services_list.php
htdocs/core/lib/files.lib.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php
2019-05-13 12:00:13 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
Laurent Destailleur
1c3bcea1f9
Merge pull request #11157 from ptibogxiv/patch-180
...
Fix img_credit_card with payment methods
2019-05-10 16:28:52 +02:00
Laurent Destailleur
cd8f601cdc
Fix length of vat number
2019-05-10 14:01:11 +02:00
ptibogxiv
f50280f13b
Fix img_credit_card with payment methods
2019-05-10 01:16:58 +02:00
Laurent Destailleur
314dc26b87
Look and feel v10
2019-05-09 19:32:19 +02:00
Laurent Destailleur
a5b1de4f6a
Fix tab that should not be visible
2019-05-09 17:52:55 +02:00
Laurent Destailleur
84714f39e2
Fix setup of terminal
2019-05-09 13:37:20 +02:00
Laurent Destailleur
96c021773e
Update takepos.lib.php
2019-05-08 19:11:17 +02:00
andreubisquerra
84cfa00bf1
Terminals
2019-05-08 18:29:00 +02:00
gauthier
f661b926fa
FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf
...
Example : if you upload a file like "my file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
2019-05-07 14:33:17 +02:00
Laurent Destailleur
eab49d4300
NEW Update Stripe library to 6.34.3
2019-05-03 02:22:27 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9
FIX Default value on form to send email
2019-05-02 15:34:29 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2
2019-05-02 12:38:38 +02:00
Laurent Destailleur
ceeb9752ce
Fix PHPCS
2019-05-02 12:28:40 +02:00
Laurent Destailleur
0f8c7df6fe
Debug api of module BOM
2019-05-02 12:19:43 +02:00
Laurent Destailleur
90a1181dc5
Debug module Ticket
2019-05-01 20:41:03 +02:00
Laurent Destailleur
a75c6a81d1
FIX Follow rule to create a new page
2019-05-01 17:15:42 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits
2019-04-30 20:37:59 +02:00
Frédéric FRANCE
5766bb0b8a
Merge remote-tracking branch 'upstream/develop' into patch-2
2019-04-30 20:16:43 +02:00
Laurent Destailleur
61bf731d17
FIX Balance of td
2019-04-30 18:11:35 +02:00
Frédéric FRANCE
3e99a40b9e
Update website.lib.php
2019-04-26 17:47:47 +02:00
Laurent Destailleur
4bd732cc40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb
FIX CVE-2019-11201
2019-04-25 23:21:25 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
6fe84a7962
Fix phpcs
2019-04-25 11:18:25 +02:00
Laurent Destailleur
68d438b697
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/user/class/user.class.php
2019-04-25 01:50:48 +02:00
Laurent Destailleur
560b026d68
Fix CSS
2019-04-25 01:26:29 +02:00
Laurent Destailleur
79c37f2226
Fix link for endpoint
2019-04-24 18:47:11 +02:00
Laurent Destailleur
684e09fdcd
NEW Add function isValidVATID()
2019-04-23 22:49:33 +02:00
Laurent Destailleur
4d92d7731c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
8d0825910a
Fix warnings
2019-04-23 10:38:20 +02:00
Laurent Destailleur
7c7c4f0d93
Removed warnings
2019-04-23 10:24:16 +02:00
Laurent Destailleur
f19d96bf8d
NEW Show enabled modules in dol_print_error
2019-04-23 10:24:05 +02:00
Laurent Destailleur
a50fc9189b
Fix phpcs
2019-04-22 15:45:44 +02:00
Laurent Destailleur
9e91826dea
Can set length of random password
2019-04-22 14:12:58 +02:00
Laurent Destailleur
be726c2376
Code comment
2019-04-22 12:44:25 +02:00
Laurent Destailleur
24572e2f82
Remove warnings
2019-04-22 12:42:46 +02:00
Laurent Destailleur
6da42941a8
NEW Add attached document on bank account visible in automatic ECM.
2019-04-21 19:54:30 +02:00
florian HENRY
83cf08f2eb
fix php warning
2019-04-18 20:37:27 +02:00
Frédéric FRANCE
4912c69d8a
Update functions2.lib.php
2019-04-18 10:12:00 +02:00
Laurent Destailleur
b5bf6830e9
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
...
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
ATM john
945e3db952
remove text
2019-04-16 22:03:11 +02:00
ATM john
965c973bda
Change class name
2019-04-16 22:02:23 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
Christophe Battarel
ce4b67ecaa
fix pagefoot
2019-04-16 16:45:43 +02:00
Christophe Battarel
502b1e4d31
add lang management to freetext
2019-04-16 16:16:37 +02:00
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
ATM john
07e6ce5460
Appli function to links
2019-04-15 21:33:31 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Laurent Destailleur
00eb0511f6
Make code simpler to sort list of files.
2019-04-13 12:41:50 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
Laurent Destailleur
cfa414b2de
Better log
2019-04-10 16:42:45 +02:00
Laurent Destailleur
26594fab98
Debug module ticket
2019-04-10 15:11:38 +02:00
Laurent Destailleur
ac25003d33
Dolibarize module ticket
2019-04-10 11:39:54 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
917b9d69fa
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
...
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +02:00
Laurent Destailleur
2b5e25188c
Merge pull request #10977 from IonAgorria/resources-product
...
NEW: Resources tab possible in products/services
2019-04-08 13:57:30 +02:00
Laurent Destailleur
7c91c1b9f1
Merge pull request #10962 from aspangaro/v10_p2
...
FIX: Problem with badge in tab in expedition card
2019-04-08 13:33:59 +02:00
Ion
b64cb4129f
Add resources tab for products/services
2019-04-07 23:52:49 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Ion
71f30266dc
Add service to getElementProperties
2019-04-07 12:53:52 +02:00
Laurent Destailleur
54714bc755
Deprecated property ->fk_departement is now ->state_id everywhere.
2019-04-05 20:06:13 +02:00
Laurent Destailleur
b6c19e0f35
Fix var not defined
2019-04-05 19:48:32 +02:00
Laurent Destailleur
becefeebff
Fix upload of files without extension
2019-04-05 19:39:49 +02:00
Laurent Destailleur
734b97e255
Fix upload of files without extension
2019-04-05 19:39:04 +02:00
Laurent Destailleur
00cdf13a15
Revert "Do not close php tags"
...
This reverts commit 1db134c2a0
2019-04-05 11:09:39 +02:00
Alexandre SPANGARO
b64ee3af70
FIX: Problem with badge in tab in expedition card
2019-04-04 17:02:18 +02:00
Laurent Destailleur
1f00e24abc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 18:52:47 +02:00
Laurent Destailleur
9e5d87e821
Fix warning
2019-04-03 18:39:27 +02:00
Laurent Destailleur
82c19a6372
FIX Avoid error 500 when extension php-intl not loaded
2019-04-03 18:38:27 +02:00
Laurent Destailleur
1db134c2a0
Do not close php tags
2019-04-03 18:13:39 +02:00
Laurent Destailleur
c5f5abc67d
Fix css for MD theme
2019-04-03 14:37:38 +02:00
Laurent Destailleur
80be77d95d
Merge pull request #10948 from ptibogxiv/patch-148
...
fix term autoOrManual
2019-04-03 11:03:44 +02:00
Laurent Destailleur
bb9cd05ea8
Fix phpcs
2019-04-02 20:02:43 +02:00
Laurent Destailleur
8a6e28860b
A better transition with deprecation
2019-04-01 22:09:24 +02:00
Laurent Destailleur
7db443e8ab
Better compatibility
2019-04-01 21:14:15 +02:00
ptibogxiv
5d25c33ff5
fix term
2019-04-01 20:49:41 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
fc983fa65c
Move a function into functions2.lib.php
2019-04-01 18:46:13 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
...
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
5d9a7e0d80
Fix phpcs
2019-04-01 18:21:59 +02:00
Laurent Destailleur
0091b65a83
Fix phpcs
2019-04-01 18:10:14 +02:00
Laurent Destailleur
c07159fee9
Fix regression in timesheet. Keep extrafield of task for the moment.
2019-03-31 22:06:41 +02:00
Laurent Destailleur
d572a9258c
Merge branch 'develop' into new_evol_time_spent_views
2019-03-31 19:12:27 +02:00
Laurent Destailleur
039e6034d1
Merge pull request #10936 from aspangaro/10.0_WARNING
...
LOG_WARNING on function dol_print_date with deprecated value
2019-03-31 18:45:01 +02:00
Frédéric FRANCE
ddd1c04eae
phpcs fix
2019-03-31 09:27:11 +02:00
Laurent Destailleur
fca404e8d5
Show price without tax to prepare tax per customer country.
2019-03-30 19:30:58 +01:00
Laurent Destailleur
be21755378
Add page id to help debug in header
2019-03-29 23:04:09 +01:00
Laurent Destailleur
697a2e5576
Show time to bill and billed in list of tasks
2019-03-29 14:34:55 +01:00
Alexandre SPANGARO
8163739a68
LOG_WARNING on function dol_print_date with deprecated value
2019-03-28 12:03:04 +01:00
ptibogxiv
2c71b98d0d
NEW automatic / manual selector form
2019-03-27 11:05:43 +01:00
Laurent Destailleur
513ef1e727
Fix label short
2019-03-25 16:16:08 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
a950d8389e
WIP Attach document to expense report lines
2019-03-24 20:22:05 +01:00
Laurent Destailleur
b2eee520df
Fix phpcs
2019-03-24 16:11:12 +01:00
Laurent Destailleur
152c27139f
Doc
2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0
NEW The preview of PDF files generates 1 png file even if several pages.
2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227
Better error message
2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c
WIP file attachment on expense report lines
2019-03-24 13:27:26 +01:00
Laurent Destailleur
df9e121ac6
Enhance the module debugbar. Do not scan the log anymore.
2019-03-23 14:37:54 +01:00
Laurent Destailleur
cd6a0bacdd
Look and feel v10
2019-03-22 14:32:15 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
atm-ph
b202169e9a
New evol "Input per day" display
2019-03-21 15:20:59 +01:00
atm-ph
fa41eeec7f
New evol "Input per week" display
2019-03-21 14:21:29 +01:00
Laurent Destailleur
70c2ffc816
FIX toggle of login_block was ko with eldy theme
2019-03-19 14:22:57 +01:00
Laurent Destailleur
1a8902f23e
Fix migration for compatibility
2019-03-19 12:03:02 +01:00
Laurent Destailleur
2a8056b075
Merge pull request #10881 from frederic34/patch-5
...
phpcs fix
2019-03-19 11:15:16 +01:00
Frédéric FRANCE
03cd321aeb
phpcs fix
2019-03-18 20:18:38 +01:00
Frédéric FRANCE
135df4b3ce
Usage of ELSE IF is discouraged; use ELSEIF instead
2019-03-18 11:24:56 +01:00
Laurent Destailleur
b3dc6d7d1d
NEW Generation of doc by modulebuilder can include README and CHANGELOG
2019-03-17 19:33:25 +01:00
Laurent Destailleur
5f9fa817fb
Fix bad log
2019-03-16 23:41:06 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
Laurent Destailleur
40c2ca4310
Fix label of status of third party record when using smartphone
2019-03-15 23:08:00 +01:00
Laurent Destailleur
7a5a561170
Fix label of status of invoice record when using smartphone
2019-03-15 23:00:50 +01:00
Laurent Destailleur
91f80934f3
Fix: On smartphone, hide label of status only on lists.
2019-03-15 20:39:55 +01:00
Laurent Destailleur
b6cacf3a20
Fix label of status for members on smartphone
2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407
Restore toggle of login_block because it was no more visible
2019-03-15 20:10:39 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
...
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
6f0fbc42c1
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
...
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
2019-03-15 15:13:28 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
d31b632d96
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
2019-03-15 11:06:49 +01:00
Laurent Destailleur
074ba0729a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-15 11:00:52 +01:00
Laurent Destailleur
84bff41543
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/security.lib.php
2019-03-15 11:00:00 +01:00
Laurent Destailleur
e326c4d579
Look and feel v10
2019-03-15 10:48:10 +01:00
gauthier
8375b47e74
FIX : in fact expensereport must be in $check array
2019-03-15 10:21:50 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
0afbd70c2c
Merge pull request #10833 from grandoc/new_branch_14_03_2019
...
update with html5 compliant code
2019-03-14 18:04:06 +01:00
gauthier
3fb6978bc8
FIX : no need to test anything to display documents tabs on expense report
2019-03-14 17:36:49 +01:00
Laurent Destailleur
8a752ae657
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
...
Fix sort by field in all events (action and emailing type)
2019-03-14 17:00:12 +01:00
Laurent Destailleur
be0535d11f
Merge pull request #10805 from frederic34/patch-2
...
update doc
2019-03-14 16:55:29 +01:00
Philippe GRAND
27b7ec8202
update with html5 compliant code
2019-03-14 14:24:17 +01:00
Philippe GRAND
d506cf7700
update with html5 compliant code
2019-03-14 14:21:54 +01:00
Philippe GRAND
68c6c0513d
update with html5 compliant code
2019-03-14 14:20:32 +01:00
Philippe GRAND
38822a9bb1
update with html5 compliant code
2019-03-14 14:18:44 +01:00
Philippe GRAND
6984cd25d8
update with html5 compliant code
2019-03-14 14:11:43 +01:00
Philippe GRAND
0832e9873c
update with html5 compliant code
2019-03-14 14:10:41 +01:00
Philippe GRAND
63b1a1459b
update with html5 compliant code
2019-03-14 14:09:54 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Laurent Destailleur
fcbd39fda9
Fix typo
2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c
Remove warnings
2019-03-13 19:06:45 +01:00
Laurent Destailleur
1bd9d6a8e5
Fix font awesome 5 picto for notes
2019-03-13 15:02:43 +01:00
Laurent Destailleur
7d82073eab
Use fontawesome for icon "setup".
2019-03-12 11:57:55 +01:00
Laurent Destailleur
d762766a56
Font awesome 5 by default
2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
2019-03-12 09:24:42 +01:00
Frédéric FRANCE
40a1562077
update doc
2019-03-12 09:09:26 +01:00
Laurent Destailleur
abdc2aa21a
Fix phpcs
2019-03-11 21:03:23 +01:00
Laurent Destailleur
e5f0c8e0e7
Look and feel
2019-03-11 20:54:25 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-11 14:40:19 +01:00
Laurent Destailleur
fac329e637
Clean code
2019-03-11 01:01:15 +01:00
Laurent Destailleur
935fe7c22a
Debug and enhance modulebuilder.
2019-03-10 19:33:28 +01:00
John BOTELLA
ccebb8d1a7
Fix travis errors
2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564
Add user friendly behavior
2019-03-08 14:26:06 +01:00
John BOTELLA
218690db00
add css behavior
2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092
fix travis
2019-03-07 15:49:16 +01:00
John BOTELLA
5ea5d51247
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 09:41:03 +01:00
John BOTELLA
89157234b7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-07 09:33:11 +01:00
Laurent Destailleur
0c2a0c643b
NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__
2019-03-06 14:33:05 +01:00
Lionel VESSILLER
bf5b482f3d
Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request
2019-03-06 09:05:07 +01:00
John BOTELLA
e382f13637
remove test
2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6
Fix condition
2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3
prepare badges
2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32
fix compatibility status
2019-03-05 16:58:05 +01:00
John BOTELLA
7a4540088a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-05 15:37:17 +01:00
John BOTELLA
95981ca14c
PR feedback
2019-03-05 15:26:19 +01:00
Lionel VESSILLER
9b797eb980
Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event
2019-03-05 14:55:04 +01:00
Laurent Destailleur
4a582485b9
Debug module ticket
2019-03-04 19:19:09 +01:00
John BOTELLA
7cadaca8fc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-04 11:37:16 +01:00
John BOTELLA
74caaca827
fix travis errors
2019-03-04 11:15:01 +01:00
John BOTELLA
c420cab500
fix travis errors
2019-03-04 11:11:15 +01:00
Laurent Destailleur
1931f43ce7
Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
...
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
2019-03-03 00:05:07 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
a5711a51ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
e215bfdb66
Merge pull request #10721 from frederic34/bad-exclude-pattern
...
fix exclude from phpcs
2019-03-02 18:23:02 +01:00
Laurent Destailleur
03237d1730
NEW Look and feel v10 - Add CSS tabBarNoTop
2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
Frédéric FRANCE
65551864d5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-03-02 12:24:15 +01:00
Laurent Destailleur
359f2c6e81
NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
...
Removed migration files
2019-03-02 12:16:37 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs
2019-03-02 10:00:51 +01:00
John BOTELLA
421c009e58
Standardise new function name
2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9
Add helper functions and little review size of badges
2019-03-01 12:01:25 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Laurent Destailleur
429da47d68
Fix default language of reminders
2019-02-28 13:11:14 +01:00
Laurent Destailleur
c444521abc
IFTTT
2019-02-28 11:00:40 +01:00
Frédéric FRANCE
ba4ca5d7c2
add visibility
2019-02-28 00:15:32 +01:00
Laurent Destailleur
29cfa03fa4
Fix font awesome 5 regressions
2019-02-27 13:54:39 +01:00
John BOTELLA
9f0a93f68f
Add color lib for color automation
2019-02-26 17:44:16 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
2019-02-24 20:53:54 +01:00
ptibogxiv
47f5ff3303
Fix declare functions2.lib.php for donations API
2019-02-24 20:51:00 +01:00
Laurent Destailleur
c002fd68ae
Merge pull request #10679 from ptibogxiv/patch-129
...
Fix declare functions2.lib.php for donations API
2019-02-24 20:49:59 +01:00
Laurent Destailleur
e349fe780e
Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing
...
Fix url for emailing type event (link to emailing card)
2019-02-24 20:48:57 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
...
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
ptibogxiv
efd27ec1d8
Fix declare functions2.lib.php for donations API
2019-02-24 16:11:52 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact
2019-02-24 14:47:47 +01:00
Frédéric FRANCE
cdf5348b47
Update ajax.lib.php
2019-02-23 18:15:56 +01:00
Laurent Destailleur
0a83bc474c
Merge pull request #10635 from grandoc/new_branch_19_02_2019
...
update with html5 compliant code
2019-02-23 14:09:17 +01:00
Lionel VESSILLER
cdc2c5ae77
Company Lib : Fix contact events with no thirdparty
2019-02-21 09:49:46 +01:00
Lionel VESSILLER
d10c5cab34
Company Lib : Fix url for emailing type event (link to emailing card)
2019-02-20 15:14:50 +01:00
Laurent Destailleur
a3a89b755f
NEW Gain space by moving the meteo on title line
2019-02-20 06:01:13 +01:00
Laurent Destailleur
abfd610bbc
Fix quote not closed
2019-02-20 03:44:08 +01:00
Philippe GRAND
d83b77432d
update with html5 compliant code
2019-02-19 17:42:12 +01:00
Regis Houssin
1c3541295b
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 09:24:30 +01:00
Laurent Destailleur
e644de4a70
Fix for font awesome 5
2019-02-15 15:30:21 +01:00
Laurent Destailleur
c480f4be68
FIX Bad remote ip address when user is using a proxy
2019-02-15 15:17:24 +01:00
Laurent Destailleur
a7af1b1765
Remove deprecated code
2019-02-14 16:29:13 +01:00
Laurent Destailleur
42f754cbc0
Merge pull request #10596 from frederic34/patch-33
...
Update functionsnumtoword.lib.php
2019-02-14 13:33:03 +01:00
Laurent Destailleur
6b00bb1a6f
Merge pull request #10583 from frederic34/patch-18
...
Update company.lib.php
2019-02-14 13:26:21 +01:00
Frédéric FRANCE
0594061ef4
Update functionsnumtoword.lib.php
2019-02-14 00:03:10 +01:00
Frédéric FRANCE
154ba78ee7
Update company.lib.php
2019-02-13 22:43:12 +01:00
Frédéric FRANCE
b9d37c276d
update doc in barcode.lib.php
2019-02-13 22:23:14 +01:00
Laurent Destailleur
2311912d8a
Merge branch 'develop' into dev_importproduct_measuringunit
2019-02-13 16:35:46 +01:00
Laurent Destailleur
69313cbf0d
Merge pull request #10567 from frederic34/patch-18
...
Update images.lib.php
2019-02-13 16:25:32 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
florian HENRY
d88475c61a
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
2019-02-13 08:59:18 +01:00
Frédéric FRANCE
e4b73e8273
Update images.lib.php
2019-02-12 23:39:59 +01:00
Frédéric FRANCE
2aae952760
fix doc in tax.lib.php
2019-02-12 23:25:26 +01:00
Laurent Destailleur
5fceee3048
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 19:02:19 +01:00
Laurent Destailleur
affbd20cdb
FIX Bad link in menu manager
2019-02-12 18:56:32 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Alexandre SPANGARO
b99149b940
Move error on function dol_include_once() to LOG_WARNING
2019-02-12 16:34:52 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
ATM-Nicolas
4e35ebe52a
FIX : Default sign out icon if not using Font Awesome 5
2019-02-12 10:43:00 +01:00
Laurent Destailleur
27cad29e1e
Fix regression of right alignement
2019-02-11 15:06:52 +01:00
Laurent Destailleur
0bd30b160a
Fix picto logout with fontawesome 5
2019-02-11 11:55:48 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
522afd8e7b
Fix font awesome 5
2019-02-09 13:11:02 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
471f11dace
Merge pull request #10502 from hregis/9.0_merge
...
FIX wrong merged conflict
2019-02-08 09:34:49 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
3bdf017d41
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-07 19:39:59 +01:00
Laurent Destailleur
8d82135033
Fix missing \n
2019-02-07 19:39:23 +01:00
Laurent Destailleur
491bfbdbfc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-07 19:39:04 +01:00
Laurent Destailleur
89af7b0e98
Add doctype to web site
2019-02-07 19:38:36 +01:00
Laurent Destailleur
789c089e14
Code comment
2019-02-05 13:08:28 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
49d695c9b2
Merge pull request #10479 from frederic34/patch-2
...
remove psr2 warning for else if usage
2019-02-03 19:06:38 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Frédéric FRANCE
25abceb116
remove psr2 warning for else if usage
2019-02-02 08:59:37 +01:00
Frédéric FRANCE
96de1b175c
clean missing spaces in the last merge
2019-02-02 08:51:30 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
08050434a1
Merge pull request #10435 from wdammak/patch-22
...
Wrapping for stock movements
2019-02-01 16:11:37 +01:00
Laurent Destailleur
cf89fbd165
Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab
...
New contact related item tab
2019-02-01 15:39:39 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
ATM-Nicolas
2cbb58c2eb
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab
2019-02-01 10:54:42 +01:00
ATM-Nicolas
f432a874e6
NEW : Contact related items tab
2019-02-01 10:51:28 +01:00
Laurent Destailleur
3e6aef472d
css
2019-01-31 20:53:59 +01:00
Laurent Destailleur
189323ad58
Fix when using image into description
2019-01-31 18:12:34 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Pierre Ardoin
b6df02e795
Correction oubli date de livraison
...
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
2019-01-29 11:47:39 +01:00
Laurent Destailleur
08a181bfbf
Fix substitution of REF_CLIENT and REF_SUPPLIER
2019-01-29 11:00:17 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
wdammak
388efb6773
Wrapping for stock movements
2019-01-28 04:36:26 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
462c1f9c1a
Merge pull request #10413 from mapiolca/patch-8
...
Add date_livraison substitution
2019-01-26 15:38:00 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php
2019-01-26 14:40:00 +01:00
Laurent Destailleur
fd192f10c4
Merge pull request #10341 from hregis/8.0_bug
...
FIX security broken with Multicompany
2019-01-26 14:28:13 +01:00
Pierre Ardoin
78f8607d41
Add date_livraison substitution
...
Complete the substitution for supplier orders.
2019-01-25 13:15:24 +01:00
Laurent Destailleur
e860d664d7
Fix substitution of __REF_CLIENT__
2019-01-23 11:54:20 +01:00
Laurent Destailleur
8104b7fa2d
look and feel v10
2019-01-22 15:40:51 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc
2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc
more validation fixes
2019-01-21 16:19:31 +01:00
torvista
07b2bb6715
Swap of align/valign/border/width for css
...
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Laurent Destailleur
7493ba018a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-01-20 20:38:26 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Regis Houssin
d5b66eeffb
FIX $user is already in parameters
2019-01-19 18:12:48 +01:00
Laurent Destailleur
4ffd7de9f7
doc
2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405
Fix hash for gol_getprefix must not contains special char.
2019-01-19 16:14:45 +01:00
Philippe GRAND
29fdad144d
update with html5 compliant code
2019-01-19 12:40:17 +01:00
Laurent Destailleur
05cc5b6398
Show duration of jobs
2019-01-17 17:50:21 +01:00
gauthier
d997309bcb
FIX : if(!method_exists(dol_loginfunction))
2019-01-17 14:49:30 +01:00
Regis Houssin
c4b9bdd569
FIX remove var_dump
2019-01-16 19:15:02 +01:00
Regis Houssin
45a7e03562
FIX a user can always read its own card
2019-01-16 19:13:21 +01:00
Laurent Destailleur
3a8afafabd
Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice
...
New manage multicompany for invoice
2019-01-16 18:51:01 +01:00
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
a72d92006b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 13:57:33 +01:00
Laurent Destailleur
638be67f96
Fix tooltip
2019-01-16 13:56:13 +01:00
Laurent Destailleur
c357cb8c4e
Clean code
2019-01-16 12:42:54 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
1f87b8bb18
FIX Position of price symbol (before) for nl_NL
2019-01-16 01:54:08 +01:00
ptibogxiv
c96f349c21
update head with schedule
2019-01-15 14:55:15 +01:00
Regis Houssin
7c9d85d091
FIX problem with multicompany transverse mode
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 12:18:04 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0
FIX #10299
2019-01-07 16:03:55 +01:00
AXeL-dev
66e1df753e
run_sql function: support for numbers in database prefix
2019-01-07 09:33:24 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
5638ac8f4d
FIX title on picto no more visible
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-01-04 15:25:14 +01:00
ldestailleur
b4fc4b0178
FIX title on picto no more visible
2019-01-04 15:22:59 +01:00
ldestailleur
ab9fe1a757
Add option to use fontawesome 5 with fontawesome 4
2019-01-03 21:14:59 +01:00
ldestailleur
7c1ed5b913
FIX #9972 #10297
2019-01-03 13:28:35 +01:00
ldestailleur
7cb3b8dfec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:26 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/user/param_ihm.php
2019-01-02 19:41:39 +01:00
ldestailleur
3d8479291d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-02 19:39:35 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
ldestailleur
8645a7f524
FIX Interface regression for bind people. Fix option
...
MAIN_OPTIMIZEFORTEXTBROWSER
2019-01-02 18:58:45 +01:00
Laurent Destailleur
294107bba0
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:06:37 +01:00
Regis Houssin
4ee09c9d5b
FIX remove old unused and deprecated function
2018-12-25 07:58:32 +01:00
Laurent Destailleur
35debd06fb
List of events show user firstname by default
2018-12-23 01:28:36 +01:00
Laurent Destailleur
2b3fbecd49
Fix when random_int is not available
2018-12-22 18:15:49 +01:00
Laurent Destailleur
b7b69b79dc
Fix phpdoc
2018-12-21 09:59:21 +01:00
Laurent Destailleur
8a70cf9ede
NEW Add parameter replaceambiguouschars on getRandomPassword function
2018-12-21 09:56:54 +01:00
Laurent Destailleur
eed4d9509b
Merge pull request #10243 from AXeL-dev/patch-3
...
fix executable files security check regex
2018-12-17 21:09:32 +01:00
Laurent Destailleur
3a4538f429
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 19:37:56 +01:00
Laurent Destailleur
c444ef3b4d
FIX wrapper could not download shared files
2018-12-17 19:37:17 +01:00
Laurent Destailleur
623afd1020
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f
Debug website module
2018-12-17 17:29:04 +01:00
Laurent Destailleur
4e940ebaf1
FIX Download of files with hashp when files are into user dir
2018-12-17 15:35:20 +01:00
Laurent Destailleur
17b2fd295f
FIX Css of amount on remain to pay on expense report
2018-12-17 13:57:30 +01:00
AXeL-dev
7f014d76cc
fix executable files security check regex
2018-12-17 12:31:12 +01:00
Laurent Destailleur
527ad04ae8
FIX Mandatory field feature should works on textarea
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52
FIX Mandatory field feature should works on textarea
2018-12-15 18:11:40 +01:00
Laurent Destailleur
319c571d76
Merge pull request #10125 from defrance/patch-131
...
NEW massfilesarea feature for plugin modules
2018-12-15 15:13:13 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
baf9b6f309
Fix regression (bad name of function)
2018-12-14 19:21:19 +01:00
Laurent Destailleur
4ffafae025
Merge pull request #10116 from defrance/patch-126
...
Introduce standard sql date format filter
2018-12-14 17:58:45 +01:00
Laurent Destailleur
77c01a1fae
Update date.lib.php
2018-12-14 17:58:33 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule
2018-12-14 10:54:09 +01:00
Laurent Destailleur
539e2c55cd
FIX #9629 #9625
2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91
FIX #9629 #9625
2018-12-14 10:31:09 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
1ee1b7a321
Merge pull request #10212 from atm-john/new_pdf_improve_desc_item_visibility
...
NEW Hidden conf to improve pdf desc item visibitity
2018-12-13 20:06:50 +01:00
Laurent Destailleur
434cf2e046
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-11 09:58:14 +01:00
Laurent Destailleur
3213b3be07
Standardize code: Move jabberid into social network module
2018-12-11 09:17:02 +01:00
Laurent Destailleur
cf74e5b9a8
Change order of tabs
2018-12-10 00:25:10 +01:00
ATM John BOTELLA
c6521dbfea
NEW improve pdf desc item visibitity
2018-12-08 17:56:03 +01:00
Laurent Destailleur
cd3716ff9f
Dolibarize module ticket
2018-12-08 16:37:41 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
5ce26bae1b
Fix form of bank info for CH
2018-12-04 22:01:35 +01:00
Laurent Destailleur
6d093b03f6
Code comment
2018-12-04 18:07:02 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Laurent Destailleur
ea119a26c7
Update ajax.lib.php
2018-12-02 17:03:11 +01:00
BENKE Charlene
044c54da94
Warning error if $conf->browser->layout is empty
2018-12-02 10:45:37 +01:00
Laurent Destailleur
a8009d4a72
Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources
...
FIX Work with new table actioncomm_resources and multiple contact affectation
2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76
Update company.lib.php
2018-12-01 16:15:34 +01:00
Laurent Destailleur
f94f7e15ca
Update date.lib.php
2018-12-01 15:07:55 +01:00
BENKE Charlene
60d0a5efab
massfilesarea feature for plugin modules
2018-12-01 14:44:34 +01:00
BENKE Charlene
fca332995b
scrutinizer major error
2018-12-01 11:37:50 +01:00
BENKE Charlene
19e4698488
Update date.lib.php
2018-12-01 10:32:37 +01:00
BENKE Charlene
085101376c
Introduce standard sql date format filter
...
refactoring standard sql filter for date
2018-12-01 00:41:46 +01:00
Laurent Destailleur
bbfd134733
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-29 11:24:18 +01:00
Laurent Destailleur
950dfeef58
Merge pull request #10081 from oscim/patch-1
...
Update company.lib.php
2018-11-29 11:15:52 +01:00
Laurent Destailleur
f3ce49806d
Update company.lib.php
2018-11-29 11:15:27 +01:00
Laurent Destailleur
10fc0149d8
responsive
2018-11-29 11:03:02 +01:00
Laurent Destailleur
b9c08853be
CSS
2018-11-28 16:54:21 +01:00
Laurent Destailleur
01181ba3a4
Fix avoid warning
2018-11-28 13:06:39 +01:00
Laurent Destailleur
70bd931d08
FIX empty page due to preg_replace JIT error on large strings
2018-11-27 16:20:31 +01:00
Laurent Destailleur
b9e544d291
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/resource/list.php
2018-11-26 23:08:06 +01:00
oscim
f5ebcca475
error space after comment
2018-11-26 15:47:51 +01:00
oscim
2af24903e9
Update company.lib.php
...
Fix list in agenda for tab customer / provider , no thirdparty selected because name of class is not Societe
2018-11-26 10:53:34 +01:00
Laurent Destailleur
2e139d1960
Fix var $hidedetails not defined
2018-11-25 12:08:49 +01:00
Laurent Destailleur
13e24dc894
Code comment
2018-11-23 15:35:40 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Laurent Destailleur
0fbf213739
Fix length of field
2018-11-22 13:08:18 +01:00
Laurent Destailleur
1d4c756783
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-22 11:44:37 +01:00
Laurent Destailleur
5e9abe6aad
Fix getLanguageCodeFromCountryCode
2018-11-21 16:28:36 +01:00
Laurent Destailleur
b6dac7da20
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-21 15:40:15 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Laurent Destailleur
c891f6ed10
Disable javascript feature with no javascript
2018-11-20 21:26:22 +01:00
Laurent Destailleur
1ecdaa548c
Remove the no more used and deprecated dol_print_graph function
2018-11-20 20:28:46 +01:00
Laurent Destailleur
929635d468
Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter
...
Fix Contact Agenda events filter when no Third Party
2018-11-19 18:35:55 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
atm-quentin
a0d5607ba5
FIX error travis
2018-11-16 15:29:05 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
François J
a5777d30e1
Fix Contact Agenda events filter when no Third Party
...
Handle case where the contact is not linked to any third party.
2018-11-16 10:09:25 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Regis Houssin
2350908d4e
FIX change getEntity doc and changelog
2018-11-15 19:00:14 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
...
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Regis Houssin
2bc25fc008
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-14 15:24:41 +01:00
Laurent Destailleur
a7989eb893
Fix menu
2018-11-14 13:55:10 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Regis Houssin
04edcaa89c
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-13 20:20:46 +01:00
Laurent Destailleur
77582b2a41
FIX the autofocus feature
2018-11-13 11:36:57 +01:00
François J
10dd5652ee
Add SELECT DISTINCT to show_actions_done() SQL request
2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4
Join llx_actioncomm_resources only if we have a contact object.
2018-11-12 12:20:07 +01:00
Regis Houssin
ce317e6110
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_project
Conflicts:
htdocs/admin/limits.php
2018-11-12 08:37:21 +01:00
Regis Houssin
854bb99cc0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_project
2018-11-11 08:52:20 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
3e844db74f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/stats/index.php
2018-11-08 20:19:28 +01:00
Laurent Destailleur
9a31a61c9d
FIX #9971
2018-11-08 20:05:01 +01:00
Laurent Destailleur
588de2cc86
Fix filter on entity on project
2018-11-08 18:45:02 +01:00
Laurent Destailleur
c55f83b0b7
Fix multicompany filter missing
2018-11-08 11:25:29 +01:00
François J
121297b5bd
SQL Join actioncomm_resources
2018-11-07 17:10:51 +01:00
François J
aea01b3208
NEW Work with new table actioncomm_resources and multiple contact affectation
2018-11-07 17:04:18 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599
Fix extrafields
2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518
Debug modulebuilder
2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Laurent Destailleur
c764d7f8d5
Fix remove var_dump
2018-10-30 21:34:17 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Regis Houssin
26b00dc5ca
NEW possibility to defined rounding rules by currency
2018-10-30 17:40:05 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27
...
make play and playdisable equals
2018-10-30 14:49:54 +01:00
Laurent Destailleur
4a71374cf7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
7a268d8d9f
Clean code
2018-10-30 14:27:14 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug
...
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-30 14:16:29 +01:00
Laurent Destailleur
d4fd55c4cf
FIX #9907
2018-10-30 13:54:11 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
...
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php
2018-10-30 12:41:06 +01:00
Frédéric FRANCE
450a837393
make play and playdisable equals
2018-10-29 18:50:15 +01:00
Laurent Destailleur
0266db7aa8
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:19:40 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Regis Houssin
866a7df510
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-26 18:23:48 +02:00
De Coninck Laurent
d347cf3a85
set a message
2018-10-26 16:18:27 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto
...
improve img_picto by returning ASAP
2018-10-26 15:20:40 +02:00
De Coninck Laurent
70cd68ebef
improve img_picto by returning ASAP
...
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
2018-10-25 18:21:00 +02:00
atm-ph
f41e7e05e1
Fix PHP warnings printed in javascript
2018-10-25 12:01:17 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
eaab953ba2
Renamed mouvement.php into movement_list.php to follow dev rules
2018-10-24 03:50:18 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
612e3a9805
Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
...
into aspangaro-9.0_accountancy
# Conflicts:
# htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
# htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
# htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
e0b20c2632
Add holiday for India
2018-10-23 12:49:48 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php
2018-10-19 22:52:18 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
36ae81c749
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
atm-greg
f0849aaf81
schedule as a tab
2018-10-18 17:16:38 +02:00
Alexandre SPANGARO
a5ebcff2ee
Fix lettering function
2018-10-16 22:27:34 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
c8607a74bf
Load websitepage
2018-10-16 01:39:04 +02:00
Laurent Destailleur
568197656f
Fix canonical of home
2018-10-15 21:43:01 +02:00
Laurent Destailleur
c246ef38c0
Fix canonical
2018-10-15 21:42:43 +02:00
Laurent Destailleur
96ddebad4a
Set canonical tag
2018-10-15 17:48:39 +02:00
Laurent Destailleur
ac143b28ae
Work on multilang
2018-10-14 20:54:28 +02:00
Laurent Destailleur
45860b2494
Work on multilang
2018-10-14 20:04:25 +02:00
Laurent Destailleur
fabc11191d
Merge pull request #9739 from frederic34/patch-11
...
fix size of $head when replacing by hook
2018-10-14 16:27:14 +02:00
Frédéric FRANCE
65c69c4564
fix standard prepare_head
2018-10-14 10:57:27 +02:00
Frédéric FRANCE
787658ac98
reduce complexity of payments.lib.php
2018-10-14 10:56:03 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php
2018-10-14 10:48:06 +02:00
Frédéric FRANCE
1f1a614b47
Update import.lib.php
2018-10-14 10:21:06 +02:00
Frédéric FRANCE
0f8ac57c85
remove var_dump
2018-10-12 22:34:23 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Laurent Destailleur
88ff7241f5
FIX Quick hack to solve pb of bad definition of public holidays
2018-10-11 13:12:36 +02:00
Laurent Destailleur
e1e1599a6d
FIX shared link ko on proposals
2018-10-11 11:59:14 +02:00
Laurent Destailleur
ced4038443
FIX qty not visible for a lot when making shipment on a dedicated stock
2018-10-11 11:56:52 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
2539f0047f
FIX Sending of reminder for expired subscriptions
2018-10-09 23:10:39 +02:00
Laurent Destailleur
1d04ce2185
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df
Merge
2018-10-09 17:06:08 +02:00
atm-quentin
c6ab79bad3
NEW note, contact and lines on card
2018-10-08 16:54:33 +02:00
atm-quentin
6a8092dfae
NEW entete reception card
2018-10-05 16:21:50 +02:00
Laurent Destailleur
5437c2ae85
Fix popup on img_picto
2018-10-05 14:32:19 +02:00
Laurent Destailleur
4e84ed0e80
FIX Symbol of currency in substitution variables
2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1
FIX Symbol of currency in substitution variables
2018-10-05 13:58:38 +02:00
florian HENRY
cba4676032
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161
2018-10-05 10:36:03 +02:00
florian HENRY
68c99d01a7
OMG!!!! var_dump....
2018-10-05 10:35:32 +02:00
Laurent Destailleur
ac86eac508
Merge pull request #9675 from atm-ph/fix_7.0_dom_error
...
Fix minor error in dom
2018-10-04 18:32:52 +02:00
Laurent Destailleur
31916c94f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
13759ea146
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2018-10-04 17:53:40 +02:00
Laurent Destailleur
3060647212
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-10-04 17:47:22 +02:00
Laurent Destailleur
1c735ea6d5
Merge pull request #9673 from atm-florian/dev_resource
...
NEW : add event tab on resource card
2018-10-04 17:45:01 +02:00
Laurent Destailleur
2aca9cb394
Update company.lib.php
2018-10-04 17:44:47 +02:00
atm-quentin
00f532c436
validation modèle de données
2018-10-04 09:50:39 +02:00
florian HENRY
e95921eb93
better test
2018-10-04 09:47:04 +02:00
florian HENRY
7f4f27ebfe
indent
2018-10-04 09:45:12 +02:00
florian HENRY
292dab192b
FIX : #9161
2018-10-04 09:42:11 +02:00
atm-ph
2acd69033c
Fix minor error in dom
2018-10-03 22:48:29 +02:00
florian HENRY
d09bbe4690
NEW : add event tab on resource card
2018-10-03 21:13:02 +02:00
Laurent Destailleur
378013b863
Better select language component
2018-10-03 20:58:45 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +02:00
atm-greg
583ea05567
fix missing letter...
2018-10-03 12:13:53 +02:00
gauthier
587766b39b
FIX : wrong function name
2018-10-03 10:38:47 +02:00
Laurent Destailleur
5f897eb7ee
Clean code
2018-10-01 00:40:02 +02:00
Laurent Destailleur
adc36e7d63
Clean code
2018-10-01 00:20:47 +02:00
Laurent Destailleur
851fd4cc18
NEW Can set the default focus of each page.
...
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830
Work on mandatory form fields
2018-09-27 16:38:18 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
7b86776f6b
Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression
...
on feature to report vat by rate when rate is zero
2018-09-27 12:42:52 +02:00
Laurent Destailleur
7e58662c6f
Merge branch 'develop' into patch-9
2018-09-27 09:18:42 +02:00
Laurent Destailleur
79ade6a1af
Work on website
2018-09-26 15:20:37 +02:00
Laurent Destailleur
f2d53e80e5
Optimize performance of cron that rotate logs
2018-09-26 01:45:24 +02:00
Laurent Destailleur
eff1d1c89e
Work on website module
2018-09-25 16:35:59 +02:00
Laurent Destailleur
e6be047178
Work on new management for website module
2018-09-25 15:00:37 +02:00
Laurent Destailleur
ba3ca550ce
Fix date in text for substitution. Removed not used translation keys.
2018-09-25 11:36:40 +02:00
Laurent Destailleur
f04b8eea6d
Work on website module
2018-09-24 19:21:21 +02:00
Frédéric FRANCE
86072ad1d7
remove superfluous space
2018-09-24 10:43:57 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
1569770855
Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC
2018-09-23 15:41:22 +02:00
gauthier
7b46bedce6
NEW : hidden configuration
2018-09-21 14:35:36 +02:00
Laurent Destailleur
3be13f0cb6
Fix css
2018-09-21 11:45:04 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
df395847d3
FIX #9567
2018-09-20 19:14:32 +02:00
Laurent Destailleur
12b449fe49
It's easier to select fields to show on list
2018-09-19 16:41:33 +02:00
Philippe GRAND
c3bbe70e2d
fix merge
2018-09-18 16:38:14 +02:00
Laurent Destailleur
4580ed0b09
Fix bad link
2018-09-18 15:31:25 +02:00
Laurent Destailleur
dcc1c855fb
Merge pull request #9542 from frederic34/patch-24
...
reduce complexity of company lib
2018-09-18 14:58:17 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Philippe GRAND
72f906683f
Standardize and update code
2018-09-18 11:02:18 +02:00
Laurent Destailleur
2d8eb034e3
FIX Maxi debug to allow to load chart of account with multicompany
2018-09-17 21:02:07 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib
2018-09-16 21:40:28 +02:00
Laurent Destailleur
eeb919dcda
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 14:24:13 +02:00
Laurent Destailleur
055a0b2859
Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0
2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2
Fix list of tasks on time consumed
2018-09-16 13:28:37 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
d06785e91a
Fix responsive
2018-09-16 12:48:36 +02:00
Laurent Destailleur
eebd329c7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modFacture.class.php
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang
htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Philippe GRAND
18f4755a90
Standardize and update code
2018-09-14 10:20:21 +02:00
gauthier
b68523b9c1
FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product
2018-09-13 14:37:12 +02:00
Laurent Destailleur
ca85356b45
Merge pull request #9427 from frederic34/patch-6
...
deprecate Form::select_date
2018-09-12 22:07:23 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Laurent Destailleur
c5e30b61c0
Fix translation
2018-09-12 21:25:14 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
6c17edd1d1
remove superfluous space
2018-09-12 18:23:58 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018
...
New branch 11 09 2018
2018-09-12 18:15:03 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54
...
New donation module
2018-09-12 17:34:21 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10
...
Completely comment unused code
2018-09-12 17:28:29 +02:00
Philippe GRAND
69bf43f851
Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018
2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Laurent Destailleur
53da80a79f
FIX Missing translation in predefined email to membership renewal
2018-09-12 12:55:10 +02:00
Philippe GRAND
05772f5327
Standardize and update code
2018-09-11 17:30:43 +02:00
Philippe GRAND
b4cbb0561d
Standardize and update code
2018-09-11 10:36:39 +02:00
Laurent Destailleur
016bc6851b
Fix generation of tpl
2018-09-10 23:37:51 +02:00
Laurent Destailleur
b0be1ddadb
Fix files generated
2018-09-10 23:20:31 +02:00
Laurent Destailleur
d2c6c7ddff
Fix import
2018-09-10 22:58:34 +02:00
Frédéric FRANCE
b7179fd500
fix phpcs
2018-09-09 14:47:33 +02:00
Laurent Destailleur
5719a38ea7
Work on website module. Support now links to company logos.
2018-09-09 14:05:23 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748
Standardize code for modulepart=mycompany like others modulepart.
2018-09-09 12:53:30 +02:00
Laurent Destailleur
d9eeb43118
FIX translation no visible for access forbidden
2018-09-09 11:59:38 +02:00
Frédéric FRANCE
8249756726
replace select_date
2018-09-09 10:40:00 +02:00
Laurent Destailleur
c2b3b0ce7b
Fix syntax error
2018-09-08 18:28:21 +02:00
Laurent Destailleur
4017a96aef
Debug website
2018-09-08 14:30:27 +02:00
Laurent Destailleur
ba71648c2d
Code comment
2018-09-08 14:10:29 +02:00
Philippe GRAND
e9c2a475bc
fix merge
2018-09-06 19:27:28 +02:00
Laurent Destailleur
2a471df828
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-09-05 20:39:38 +02:00
ptibogxiv
6e209b550b
add payment link for donation
2018-09-05 17:40:26 +02:00
Philippe GRAND
50a26aaf16
fix merge
2018-09-04 14:33:34 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Laurent Destailleur
252335318f
Update pdf.lib.php
2018-09-04 09:57:01 +02:00
Marc de Lima Lucio
e285b42a18
FIX: PDF address: handle when contact thirdparty different from document thirdparty
2018-09-03 17:57:30 +02:00
Laurent Destailleur
540999faa5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
2018-09-03 14:06:51 +02:00
Laurent Destailleur
6641a05744
Fix missing class
2018-09-03 11:59:19 +02:00
Philippe GRAND
4fba7cdf45
fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496
2018-09-03 09:45:06 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +02:00
Laurent Destailleur
ddd6ac296c
Fix missing class
2018-09-02 16:09:40 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
dee9442720
Fix regression
2018-09-01 13:12:09 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Laurent Destailleur
b89202572e
Merge pull request #9342 from ptibogxiv/patch-51
...
fix multicompany and footer ticket public page
2018-09-01 12:33:55 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Frédéric FRANCE
b015d05f07
function Comment Missing
2018-08-31 22:25:11 +02:00
Frédéric FRANCE
e47059fa36
function Comment Missing
2018-08-31 22:14:09 +02:00
Frédéric FRANCE
5d27318e3b
function Comment Missing
2018-08-31 22:03:12 +02:00
Frédéric FRANCE
df6eccc5dd
function Comment Missing
2018-08-31 22:01:13 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Laurent Destailleur
b08971b03b
FIX vat rate code not return by get_product_vat_for_country
2018-08-31 14:52:34 +02:00
Laurent Destailleur
8dc208c961
Fix missing legal ids in source address
2018-08-30 19:19:43 +02:00
Laurent Destailleur
151d84405a
FIX trans on null object
2018-08-30 17:01:49 +02:00
Laurent Destailleur
d14bd829fb
FIX trans on null object
2018-08-30 17:01:22 +02:00
ptibogxiv
de73f1545f
fix multicompany and footer
...
- fix viewimage and multicompany + no login
- delete ticket footer for common payment.lib.php footer
2018-08-30 02:42:14 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
74b3e3e814
Fix for compatibility with lines with no prices (some external modules)
2018-08-29 14:50:12 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
6f427cbed3
Merge pull request #9293 from frederic34/patch-25
...
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
2018-08-28 01:42:35 +02:00
Laurent Destailleur
5185d32cc9
Merge pull request #9286 from frederic34/patch-22
...
Update propal.lib.php
2018-08-28 01:40:58 +02:00
Laurent Destailleur
7a35b560a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
2018-08-23 19:50:58 +02:00
Frédéric FRANCE
6abd5d478a
Update functions.lib.php
2018-08-23 17:15:14 +02:00
Frédéric FRANCE
692352e0e4
Update propal.lib.php
2018-08-22 22:55:12 +02:00
Laurent Destailleur
cd09052e80
FIX badge on time spent on project and tasks
2018-08-21 14:52:22 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Frédéric FRANCE
391995c09b
Update propal.lib.php
2018-08-18 17:26:42 +02:00
Laurent Destailleur
ab22c9d0de
Work on import
2018-08-16 21:48:16 +02:00
Cédric
fe6779c223
Erreur de syntaxe ( + au lieu de . )
2018-08-16 17:20:38 +02:00
Laurent Destailleur
f7da76e1c0
Use session cache for stats
2018-08-16 14:24:59 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
37ca3ff230
Fix separator
2018-08-14 20:51:24 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
6954ab00f9
Update functions.lib.php
2018-08-12 18:11:27 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
ATM-Nicolas
70adfb135d
FIX : Missing behavior
2018-08-03 09:51:29 +02:00
Laurent Destailleur
e106fda5e6
Merge pull request #9113 from torvista/export-import
...
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
2018-08-02 18:38:46 +02:00
Laurent Destailleur
0e3473701a
Update bank.lib.php
2018-08-02 18:38:33 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
John BOTELLA
4ddca02bb9
fix situation line's total
2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b
FIX : Wrong position of firstname lastname
2018-07-31 12:15:18 +02:00
Laurent Destailleur
7af42c66cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
2018-07-27 12:54:45 +02:00
Laurent Destailleur
83ae27d122
FIX Deletion of files in migration
2018-07-27 12:33:36 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Philippe GRAND
7d5464cfbc
Clean and update code
2018-07-25 15:25:23 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Laurent Destailleur
a1bdc6022d
Website module
2018-07-24 01:10:38 +02:00
Laurent Destailleur
174394c476
Work on website module
2018-07-23 14:08:20 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
2018-07-22 17:27:02 +02:00
Laurent Destailleur
c4e207e8b7
Fix dol_string_onlythesehtmltags
2018-07-22 15:51:19 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
8247bb683c
Debug website module
2018-07-19 21:35:21 +02:00
Laurent Destailleur
445db58966
FIX website in inline edit mode
2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df
FIX website in inline edit mode
2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1
More complete list of allowed html tags
2018-07-19 15:24:48 +02:00
Laurent Destailleur
26507ee712
Code comment
2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:48:08 +02:00
Steve
9d3a0442c0
dolibarr-develop, php 7.2.7
...
On third party, add bank account. After spanish account has been added, on summary screen
..../htdocs/societe/paymentmodes.php
a correct account number causes the error:
Warning: A non-numeric value encountered in .......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359
This is
`$sum += $values[$i] * substr($InumCta, $i, 1);`
Since substr returns a string it cannot be summed (I assume).
I changed it to
`$sum += $values[$i] * (int)substr($InumCta, $i, 1)`
2018-07-16 17:10:33 +02:00
Laurent Destailleur
e5f2fbf8db
Fix trans
2018-07-16 15:21:29 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
c477ca8266
Fix scrutinizer
2018-07-16 11:25:21 +02:00
Laurent Destailleur
e3d9e609d5
Fix var not defined
2018-07-16 11:20:54 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Laurent Destailleur
1e42db0641
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-15 20:16:54 +02:00
Laurent Destailleur
bff4ed8103
Merge pull request #9098 from atm-florian/develop
...
fix list of event of thirdparty and unformize code
2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac
Code comment
2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes
...
fix sql error functions.lib.php
2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php
2018-07-15 20:00:43 +02:00
florian HENRY
09fe2f83fa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747
fix list of event unformize code
2018-07-12 18:27:09 +02:00
ias-ceo
076bf0a3a7
fix sql error
2018-07-12 05:09:36 +03:00
Laurent Destailleur
4c65f4d498
Log
2018-07-11 09:38:40 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3
Fix phpcs
2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7
Fix version
2018-07-10 13:54:20 +02:00
Laurent Destailleur
b6180fcb58
Fix fetch index in ecm when using multicompany
2018-07-10 12:00:09 +02:00
Laurent Destailleur
8e0a663b7c
Code comment
2018-07-10 10:53:59 +02:00
Laurent Destailleur
f5d9403c7d
Fix permission to see HR tab on user. All HR on same tabs.
2018-07-09 15:38:00 +02:00
Laurent Destailleur
e427496ddf
FIX Injection
2018-07-09 14:13:01 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
05ed721a8c
Fix name of constant for module TICKET
2018-07-06 13:09:07 +02:00
Laurent Destailleur
3a593f88f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Laurent Destailleur
5883899bc7
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-07-05 02:33:39 +02:00
Laurent Destailleur
91b7ee5fc2
NEW Add function isValidMXRecord
2018-07-04 11:07:28 +02:00
Laurent Destailleur
e1e813b895
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:26 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Regis Houssin
df718cca5c
Fix: better sql request with multicompany transverse mode
2018-07-02 10:09:56 +02:00
BENKE Charlene
43c5d7abdc
add holliday_admin_prepare_head
...
sorry eldy i forget it
2018-07-01 17:33:35 +02:00
Regis Houssin
80adac12c0
Fix: use object entity ID instead current entity
2018-07-01 16:01:30 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Laurent Destailleur
ee2d543781
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist
...
NEW support selllist in the module builder
2018-06-30 15:33:17 +02:00
Regis Houssin
f998f64db0
Works on use new list engine instead template for canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:52:26 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117
...
New : fichinter models (like factureRec)
2018-06-30 01:19:03 +02:00
Laurent Destailleur
b1d94af439
Merge pull request #8931 from ruistrecht-alt/MAIN_DOCUMENTS_DESCRIPTION_FIRST
...
NEW Add hidden option MAIN_DOCUMENTS_DESCRIPTION_FIRST
2018-06-29 20:04:24 +02:00
Laurent Destailleur
9eaca045e4
Fix default message with online payment link must be hidden when no
...
online payment mode exists.
2018-06-27 11:34:40 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
9f77ea0ece
Code comment
2018-06-25 17:05:15 +02:00
Laurent Destailleur
06342ff80c
FIX contextpage on contact list
2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
533c19cc2c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/lib/functions.lib.php
2018-06-22 15:29:26 +02:00
Laurent Destailleur
a3b9d4f01b
Fix tooltip on subsidiary list
2018-06-20 22:02:36 +02:00
Regis Houssin
8fc2f7441c
Fix: to avoid deleting line breaks
2018-06-20 09:06:16 +02:00
Laurent Destailleur
63fb82931c
Update functions.lib.php
2018-06-18 10:41:11 +02:00
Laurent Destailleur
186f08e67b
Fix preview of PDF for supplier objects
2018-06-16 15:08:13 +02:00
altatof
5d6cd381b9
Fix <br/> detection
2018-06-15 15:59:14 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
1d7d16649a
Code comment
2018-06-11 12:31:26 +02:00
Laurent Destailleur
f0446d2a3b
Fix for content editable sites
2018-06-11 10:25:22 +02:00
Laurent Destailleur
557db7661c
Fix for content editable sites
2018-06-11 10:19:42 +02:00
Laurent Destailleur
8142a672a7
PDF compatibility. Use hidden option to force PDF1/A instead of PDF-1.3
2018-06-07 21:12:30 +02:00
Rui Strecht
083acb1af5
Added MAIN_DOCUMENTS_DESCRIPTION_FIRST option to allow desc to appear before product/service label in documents
2018-06-07 16:24:45 +01:00
Laurent Destailleur
d10c9cf565
FIX dir for modules must not have s at end (fix contracts into contract)
2018-06-06 23:47:48 +02:00
Laurent Destailleur
bb97119233
Fix duplicate function name
2018-06-06 18:07:32 +02:00
Laurent Destailleur
30b04c0d3d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e
FIX: dol_delete_file must work in a context without db handler loaded
...
Conflicts:
htdocs/core/lib/files.lib.php
2018-06-05 18:12:14 +02:00
Laurent Destailleur
1671c8b6cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-05 18:06:30 +02:00
Laurent Destailleur
9c32e49bd3
FIX: dol_delete_file must work in a context without db handler loaded
2018-06-05 18:05:33 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
Laurent Destailleur
d8d4d15b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
02da9b6992
FIX #8893 to get formatted price as substitution vars
2018-05-30 11:04:44 +02:00
BENKE Charlene
4a7ac774f7
introduce fichinter rec models
2018-05-28 16:38:11 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
patrick Delcroix
ef37fccef4
Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist
2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc
Fix Show double(x,y) fields
2018-05-26 23:39:36 +02:00
Laurent Destailleur
75b6dc6f61
Update modulebuilder.lib.php
2018-05-25 12:23:39 +02:00
Laurent Destailleur
8303dc1e6f
Merge pull request #8815 from atm-florian/develop_fixproject
...
NEW: add filter on project task list
2018-05-25 10:56:10 +02:00
Laurent Destailleur
c56ef86bc3
Update project.lib.php
2018-05-25 10:50:16 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
delcroix Patrick
c85d216f8e
Merge branch 'develop' into patch-modulebuilder-supportsellist
2018-05-22 22:24:20 +02:00
patrick Delcroix
2ccaf1ad95
New: support sellist in modulebuilder
2018-05-22 22:00:20 +02:00
Laurent Destailleur
1b20ec05d1
Save translation
2018-05-21 19:37:47 +02:00
florian HENRY
dd946dd197
add ressource
2018-05-21 11:03:48 +02:00
florian HENRY
f5c245cd19
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject
2018-05-21 10:59:10 +02:00
florian HENRY
986b4f78ba
fix eldy comment
2018-05-18 13:54:07 +02:00
florian HENRY
a27c263747
NEW: add filter on project task list
2018-05-18 10:33:32 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24
...
Update module assets
2018-05-18 09:05:46 +02:00
Laurent Destailleur
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
Alexandre SPANGARO
9c6f92986e
Upgrade works
2018-05-11 21:48:22 +02:00
Laurent Destailleur
63b9384ef6
No transmormation of data objectid before calling trigger
2018-05-10 12:34:23 +02:00
Laurent Destailleur
2fb5de6136
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e
Reorder permissions
2018-05-10 12:29:58 +02:00
Laurent Destailleur
fddd628f08
Merge pull request #8764 from hregis/develop_email
...
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-10 12:08:58 +02:00
Laurent Destailleur
9077f18dd6
Update security.lib.php
2018-05-10 11:37:22 +02:00
Laurent Destailleur
8837193545
Merge branch 'develop' into permissions_hook
2018-05-10 11:36:08 +02:00
Laurent Destailleur
bc9eaaab84
Update security.lib.php
2018-05-10 11:34:20 +02:00
Laurent Destailleur
7be804dcf5
Update security.lib.php
2018-05-10 11:32:08 +02:00
Laurent Destailleur
0891766a3e
Update security.lib.php
2018-05-10 11:31:27 +02:00
Laurent Destailleur
ea4c48047a
All new hooks must be addreplace hooks
2018-05-10 11:30:27 +02:00
Regis Houssin
415b7425fd
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-08 09:45:10 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
altatof
a8ecce9e6d
add hook for more permissions control
2018-05-05 14:31:17 +02:00
Laurent Destailleur
5cff4c152b
Add tab "time spent" in project view. Can swith gantt/list.
2018-05-04 11:25:21 +02:00
Laurent Destailleur
08cf034e2f
FIX to allow IRPF not null even if main VAT is null.
...
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
2018-05-03 13:39:44 +02:00
Laurent Destailleur
124abd39b6
Code comment
2018-05-01 20:31:57 +02:00
Laurent Destailleur
dc9892f803
Fix bad log
2018-05-01 20:17:03 +02:00
Laurent Destailleur
3cad7c6998
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-01 12:51:46 +02:00
Laurent Destailleur
4eb4cf6506
Merge pull request #8693 from Librethic/fix-api-product-check-perm
...
FIX : missing english name for object
2018-05-01 10:19:27 +02:00
Laurent Destailleur
55f982e504
Removed deprecated FPDI option and reorganise PDF setup page
2018-04-30 09:28:24 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
94d6e178f7
Work on vat report code rewrite
2018-04-28 16:06:46 +02:00
jfefe
7cedf55c27
FIX : missing english name for object
...
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
2018-04-27 20:54:48 +02:00
Laurent Destailleur
257dc1cf77
Work on rewriting VAT reports
2018-04-27 19:17:34 +02:00
Laurent Destailleur
19d15c79dd
Merge pull request #8673 from frederic34/variantonservice
...
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
3faeb08b78
Merge pull request #8672 from ATM-Nicolas/fix_action_contact
...
FIX : Related contact printed in societe agenda
2018-04-27 10:00:18 +02:00
Laurent Destailleur
1d40d34123
Merge pull request #8669 from tomours/develop
...
Fix french bank holidays (Easter related)
2018-04-27 09:56:01 +02:00
Laurent Destailleur
42722da824
Update date.lib.php
2018-04-27 09:55:44 +02:00
Laurent Destailleur
dde86628e7
Update date.lib.php
2018-04-27 09:49:52 +02:00
Laurent Destailleur
e1cfe0e2dd
Update date.lib.php
2018-04-27 09:49:15 +02:00
Laurent Destailleur
59e5545aa7
Fix phpunit
2018-04-27 09:18:25 +02:00
Laurent Destailleur
69db960a92
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/activity/perweek.php
2018-04-26 18:33:02 +02:00
Laurent Destailleur
d988585f86
Save spaces in timesheet report page
2018-04-26 11:07:20 +02:00
Laurent Destailleur
6b2bd93469
NEW Add dol_is_link function
2018-04-25 17:59:05 +02:00
Laurent Destailleur
39aef07c6b
FIX Only voters can send comments in public survey page
2018-04-25 17:14:18 +02:00
Laurent Destailleur
83b762b681
FIX CVE-2018-9019
2018-04-25 16:01:06 +02:00
Laurent Destailleur
75a4891113
Add az09comma to sanitize sortfield/sortorder
2018-04-25 15:47:42 +02:00
Frédéric FRANCE
5f4e2dc565
variant on services
2018-04-24 11:01:17 +02:00
ATM-Nicolas
736c56705b
FIX : Related contact printed in societe agenda
2018-04-24 10:02:26 +02:00
Thomas OURSEL
4fd0ab3f31
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-23 15:57:09 +02:00
Thomas OURSEL
f402753fa3
Fix french holidays (Easter related)
2018-04-23 15:14:34 +02:00
Laurent Destailleur
e9a2894727
Fix PSR2
2018-04-22 20:59:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
0358e0f29f
Debug ticketsup
2018-04-19 15:11:26 +02:00
Laurent Destailleur
fc167612c2
NEW class reposition can also work on POST (not only GET)
2018-04-19 13:59:20 +02:00
Laurent Destailleur
4472234637
Can set email in dol_print_error_email
2018-04-19 12:12:54 +02:00
Laurent Destailleur
d8e05c90f7
Can set email in dol_print_error_email
2018-04-19 12:12:19 +02:00
Laurent Destailleur
0f16ccbc4a
Enhance dol_encode/dol_decode function
2018-04-19 12:03:42 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
a0f8aa50d5
CSS
2018-04-18 00:00:37 +02:00
Laurent Destailleur
4dadfac74b
Debug usage of the new extrafield architecture
2018-04-17 14:34:17 +02:00
Laurent Destailleur
7b53ec5198
FIX timestamp must be an int not a float
2018-04-17 12:41:13 +02:00
Laurent Destailleur
c3970f1a52
Code comment
2018-04-17 09:44:57 +02:00
Laurent Destailleur
1e0a660d24
More font awesome picto instead of img
2018-04-16 19:57:46 +02:00
Laurent Destailleur
f19abe38d7
FIX pdf thumb for expense report
2018-04-16 18:17:35 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +02:00
Laurent Destailleur
6450f95c90
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 19:13:38 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
57c03553dd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Laurent Destailleur
13ba69e085
Merge pull request #8595 from hregis/develop_ldap
...
Fix: broken $pdf object !
2018-04-15 11:38:51 +02:00
Laurent Destailleur
da66e5c5a7
Update pdf.lib.php
2018-04-15 11:38:29 +02:00
Laurent Destailleur
37e4da30d0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-15 11:33:27 +02:00
Laurent Destailleur
ffffd848a9
Look and feel v8
2018-04-14 22:34:46 +02:00
Laurent Destailleur
77b686500c
css
2018-04-14 21:07:20 +02:00
Regis Houssin
fb4765c472
Fix clean code
2018-04-14 15:24:52 +02:00
Regis Houssin
732f019fb2
Fix: json format in llx_const
2018-04-14 15:17:51 +02:00
Regis Houssin
25a87507b9
NEW add new parameters for tcpf encryption
2018-04-14 15:12:51 +02:00
Juanjo Menent
bfed1b9db1
FIX: some localtaxes errors
2018-04-14 12:45:40 +02:00
Regis Houssin
d97c052d08
Fix: broken $pdf object !
2018-04-14 10:41:38 +02:00
Laurent Destailleur
c25e21de4b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 23:19:22 +02:00
Laurent Destailleur
ecfabc6633
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-13 23:18:39 +02:00
Laurent Destailleur
a0e243a29b
Clean code
2018-04-13 23:11:19 +02:00
Laurent Destailleur
93ea46c58c
Merge branch 'develop' into develop-ecmfiles
2018-04-13 23:08:26 +02:00
Laurent Destailleur
374a0723bf
Fix VAT report by rate
2018-04-13 22:20:14 +02:00
Regis Houssin
556a418132
Fix: best method
2018-04-13 19:30:11 +02:00
Regis Houssin
199bf4c044
Fix: avoid focus problem when select2 is in a modal dialog window
2018-04-13 17:10:07 +02:00
fappels
e054d1ae8d
Try to fix travis
2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca
Clean code
2018-04-13 16:18:33 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +02:00
All-3kcis
21df700325
Add option to save file with product batch ref
...
+ use batch number like ref instead of id
+ debug access to shared link
2018-04-12 15:55:08 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder
...
FIX: various modulebuilder-related issues
2018-04-11 18:01:04 +02:00
Laurent Destailleur
e543a6bf85
Merge pull request #8549 from atm-greg/fix_multiselect_filter
...
FIX #8480
2018-04-11 17:38:30 +02:00
Laurent Destailleur
1aace69b1a
Update functions.lib.php
2018-04-11 17:37:00 +02:00
Laurent Destailleur
c70e0c1cda
FIX #8475 #8540
2018-04-11 17:14:34 +02:00
Marc de Lima Lucio
fa8cf98249
FIX: modulebuilder: handle 'price' fieldtype
2018-04-11 12:18:54 +02:00
Marc de Lima Lucio
2f75bfcd83
FIX: modulebuilder: could not create html fields
2018-04-11 11:46:47 +02:00
atm-greg
8a0baaad17
fix #8480
2018-04-10 16:25:06 +02:00
atm-greg
4f13a4f45b
fix #8521
2018-04-10 14:16:01 +02:00
Laurent Destailleur
65996c47ff
Fix clean email syntax to remove , to avoid error RFC-5321 address
2018-04-10 11:15:21 +02:00
Laurent Destailleur
24f4d5040a
Move isInEEC from common to thirdparty class.
2018-04-09 14:25:02 +02:00
Laurent Destailleur
4d2d9193b9
Work on VAT reports to use option MAIN_INFO_VAT_RETURN
2018-04-07 15:47:13 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
0abcf5694c
Fix message of discount
2018-04-06 20:18:36 +02:00
Laurent Destailleur
1a321e19c8
FIX XSS in company setup page
2018-04-06 19:12:13 +02:00
Laurent Destailleur
a886fadc2d
Merge pull request #8493 from aspangaro/8.0-a13
...
NEW Module Assets
2018-04-06 12:41:56 +02:00
Laurent Destailleur
956fc2376d
FIX #8483
2018-04-06 12:27:55 +02:00
Regis Houssin
b43aca0f8d
Fix: use dol_string_nohtmltag instead (with strip_tags)
2018-04-06 08:52:02 +02:00
Alexandre SPANGARO
06dc70df09
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-05 20:42:28 +02:00
Laurent Destailleur
48ff89c63b
Fix regression
2018-04-05 19:52:54 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda
...
FIX: img_pictos for remove assigned user in agenda card
2018-04-05 16:42:40 +02:00
Laurent Destailleur
d19514fd99
Merge pull request #8496 from hregis/develop_bug5
...
Fix: multiple avoid Warning and errors
2018-04-05 16:16:48 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
88b3e08b22
FIX filter/sorting on extrafield on contact list from contact tab
2018-04-05 11:34:26 +02:00
Rui Strecht
e8a700caab
Fixed issue with img_picto no showing icon in agenda assigned users
2018-04-03 12:13:40 +01:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Alexandre SPANGARO
3779b6ff1c
Update work on assets type
2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
a5428cc8c7
NEW Module Assets
2018-04-01 21:26:52 +02:00
Laurent Destailleur
99ada20f6d
Add picto bank
2018-03-29 19:08:51 +02:00
Laurent Destailleur
39f25c9fc2
Fix phpcs
2018-03-29 08:28:36 +02:00
Laurent Destailleur
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Laurent Destailleur
0edba4b4a7
Manage field showoncombobox
2018-03-27 23:44:49 +02:00
Laurent Destailleur
7a45527983
Generate the foreign key into key.sql file
2018-03-27 23:26:20 +02:00
Laurent Destailleur
e28307ede4
Merge pull request #8449 from hregis/develop_dict
...
NEW add "moreHtmlRef" hook
2018-03-27 18:07:57 +02:00
Regis Houssin
2b8fe93fc8
Fix: remove unused global
2018-03-27 17:40:17 +02:00
Regis Houssin
35b6cb750f
Fix: move "moreHtmlRef" hook in "showrefnav" function
2018-03-27 17:36:25 +02:00
Laurent Destailleur
51cd793d80
Fix log and duplicate vat_by_date function
2018-03-27 14:37:29 +02:00
Laurent Destailleur
b44e791c0a
Work on vat reports
2018-03-26 21:39:18 +02:00
Laurent Destailleur
c50b772b11
Clean duplicate code for payment page. Redirect on common page.
2018-03-25 19:15:55 +02:00
Laurent Destailleur
852191010a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:29:11 +02:00
Laurent Destailleur
53dde8dc0c
Fix confirmation email for membership payment
2018-03-25 15:00:43 +02:00
Regis Houssin
180f2a0336
Fix: multi_dir compatibility
2018-03-25 12:56:43 +02:00
Regis Houssin
d5ed29c567
NEW add "moreHtmlRef" hook
2018-03-25 12:13:29 +02:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6
...
Fix: uniformize getEntity('intervention')
2018-03-24 16:36:27 +01:00
Laurent Destailleur
224fa1c03e
Fix external links ko when substitution key are inside domain
2018-03-24 12:48:33 +01:00
Laurent Destailleur
ab9edef3c7
Fix external links ko when substitution key are inside domain
2018-03-24 12:46:52 +01:00
Laurent Destailleur
c7e93a5a3b
Serious enhancement in auto subscription for member module
2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb
Make sending of email for member module ok with new email template archi
2018-03-23 19:35:25 +01:00
Laurent Destailleur
6e32e9961f
Syn transifex
2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
Regis Houssin
9cf66e53f6
Fix: wrong module name
2018-03-22 16:39:47 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
Laurent Destailleur
6e52c896f2
Dolibarrize module ticket
2018-03-22 10:46:42 +01:00
Laurent Destailleur
35938b1942
NEW Variable __ONLINE_PAYMENT_URL__ available in email templates
2018-03-21 20:06:22 +01:00
Laurent Destailleur
7e5c3cc807
Code comment
2018-03-21 13:30:30 +01:00
Laurent Destailleur
42b0a22df2
Use font-awsome for play icon
2018-03-21 13:16:05 +01:00
Laurent Destailleur
fc50fcd59e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-20 20:07:24 +01:00
Laurent Destailleur
a3a416aa7a
Can remove comment added due to lack of test
2018-03-20 16:46:09 +01:00
Laurent Destailleur
ae17ce6f9a
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:52:09 +01:00
Laurent Destailleur
91b3ffc3da
Merge pull request #8409 from aspangaro/8.0-a10
...
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:40:44 +01:00
Laurent Destailleur
51b6723b08
Dolibarrize module ticket
2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Alexandre SPANGARO
17b98b84ad
Merge remote-tracking branch 'uptream/develop' into 8.0-a10
2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0
NEW Add a tab to specify accountant/auditor of the company
2018-03-18 06:09:50 +01:00
Laurent Destailleur
cb1069cf0b
Use font-awesome for the picto to move/transfer a line
2018-03-17 13:21:27 +01:00
Laurent Destailleur
46e8692620
Escape db
2018-03-16 12:17:20 +01:00
arnaud
32ce42610a
FIX show status on societe banner
2018-03-16 11:18:00 +01:00
Laurent Destailleur
ba47b6d051
NEW Add tab contact on supplier proposals
2018-03-16 10:21:53 +01:00
Laurent Destailleur
8bfac66f04
Escape db
2018-03-16 09:52:45 +01:00
Laurent Destailleur
6f95a7c2b1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 23:48:14 +01:00
Laurent Destailleur
ce7da41bef
Fix save setup
2018-03-15 23:47:16 +01:00
Laurent Destailleur
71c51eb789
NEW Add hook printEmail
2018-03-15 22:22:42 +01:00
Laurent Destailleur
7f8f0c5dc1
Fix parameter silent was inverted
2018-03-15 21:48:51 +01:00
Laurent Destailleur
7c62f22408
Remove doubtful code
2018-03-15 14:02:32 +01:00
Laurent Destailleur
6a70d268e0
Fix SQLi reported by op7ica
2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be
Fix SQLi reported by op7ica
2018-03-15 01:21:44 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84
Update company.lib.php
2018-03-14 10:48:56 +01:00
Laurent Destailleur
da617f7d32
Can work both with remote and local payment modes
2018-03-13 22:43:50 +01:00
Laurent Destailleur
2566170c68
Use code of societeaccount
2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8
Add unique key. Dolibarrize view of stripe card.
2018-03-13 17:32:49 +01:00
Laurent Destailleur
e6d8219396
Dolibarrize module ticket
2018-03-13 13:26:03 +01:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
Laurent Destailleur
0d1e26b02c
Fix error management
2018-03-12 13:19:09 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
Regis Houssin
a09bad6d69
Fix: wrong year
2018-03-11 18:59:45 +01:00
Regis Houssin
7c3984c9db
Fix: dolibarrizzzz
2018-03-11 18:54:38 +01:00
Laurent Destailleur
d9b55f2275
Merge branch 'develop' into dev_ticketsup
2018-03-11 18:12:47 +01:00
Laurent Destailleur
0005b1bc48
Merge pull request #8342 from atm-florian/dev_fixscrunitiz
...
fix scrunitizer
2018-03-11 18:11:13 +01:00
florian HENRY
cfdaa7c88d
ticket sup make it work
2018-03-11 16:07:13 +01:00
florian HENRY
6d8566a238
fix scrunitizer
2018-03-11 12:41:48 +01:00
jfefe
0f96575b41
Fix PHPCS errors with ticketsup module
2018-03-11 12:06:57 +01:00
Laurent Destailleur
e14d2f08b8
Dolibarize
2018-03-11 11:12:38 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
florian HENRY
888afe0e33
fix scrunitizer
2018-03-11 00:25:14 +01:00
Laurent Destailleur
65aa5953f4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-08 20:36:07 +01:00
Laurent Destailleur
bf1bada435
Contact tab after main tab
2018-03-08 20:35:50 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405
Enhance OAuth module to store the stripe account in llx_oauth_token
2018-03-08 19:51:18 +01:00
Laurent Destailleur
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Laurent Destailleur
af9fff4f83
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5
...
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-08 16:24:05 +01:00
Regis Houssin
861a831e24
Fix: debug
2018-03-08 11:53:46 +01:00
Laurent Destailleur
c02e8e9831
Css
2018-03-07 19:13:15 +01:00
Regis Houssin
a0774d523d
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-07 15:24:23 +01:00
Laurent Destailleur
1419eaf15f
Debug last stripe PR
2018-03-07 15:05:49 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop
2018-03-07 13:19:25 +01:00
Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-07 13:03:40 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1
FIX natural search double quote
2018-03-07 11:42:47 +01:00
Laurent Destailleur
23a4a60970
Fix status of task
2018-03-06 21:51:43 +01:00
ptibogxiv
10b16187d4
NEW convert rib.php to gateway.php
2018-03-06 13:26:40 +01:00
Marc de Lima Lucio
c4950d4f0c
FIX: supplier discounts: wrong source invoice ref in DOCs
2018-03-05 11:49:04 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
6338328c90
Fix scrutinizer errors
2018-03-04 11:09:53 +01:00
Laurent Destailleur
eac1b2efe9
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:22:15 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf
CSS
2018-03-01 02:37:18 +01:00
Laurent Destailleur
e2c7585ae7
NEW Support alternative aliases of page name in website
2018-02-28 14:36:22 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Laurent Destailleur
7e48db2869
Clean code
2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
1666f371bf
css
2018-02-26 00:13:16 +01:00
Laurent Destailleur
029ef534d0
Clean deprecated code (property "special" removed from mod descriptor)
2018-02-25 10:55:02 +01:00
Laurent Destailleur
a5b1f114c2
FIX Generic substitution of constant disabled for sensitive constant
2018-02-24 14:03:32 +01:00
Laurent Destailleur
1ec5a5d0bf
FIX Generic substitution of constant disabled for sensitive constant
2018-02-24 14:02:27 +01:00
Laurent Destailleur
d8bf553ea9
Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing
2018-02-23 19:55:15 +01:00
Laurent Destailleur
863cab362f
NEW Cat set the encryption algorithm for extrafields of type password
2018-02-23 14:38:41 +01:00
Laurent Destailleur
b6737d3607
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-02-23 11:24:45 +01:00
Laurent Destailleur
194f5a2cef
Fix substitution key
2018-02-23 11:03:48 +01:00
Laurent Destailleur
3f9a9f20ce
Fix missing substitution key
2018-02-22 17:06:18 +01:00
Laurent Destailleur
76543023a1
Fix missing substitution key
2018-02-22 17:05:24 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
cb644665bd
Fix output dir of grab
2018-02-20 06:02:53 +01:00
Laurent Destailleur
6ef3b330e4
Fix output dir of grab
2018-02-20 00:04:43 +01:00
Laurent Destailleur
5ada5c18f9
url in generator
2018-02-19 23:19:54 +01:00
Laurent Destailleur
1cb58a308c
Fix redirect
2018-02-19 22:25:12 +01:00
Laurent Destailleur
1f412bd1d4
Fix infinite redirects
2018-02-19 22:10:15 +01:00
Marc de Lima Lucio
44b0d1ca0f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-19 17:33:20 +01:00
Laurent Destailleur
f3114765a3
Work on website module
2018-02-19 16:46:29 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Laurent Destailleur
60a77a6d85
Add option to grab images into same dir or subdir
2018-02-19 14:56:37 +01:00
Laurent Destailleur
60fe1fa503
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
ab6d0d2530
Fix errors
2018-02-17 01:16:52 +01:00
Laurent Destailleur
9bed2ce8e2
Fix ignore file integrity check on filefunc.inc.php for deb/rpm package
2018-02-16 22:03:13 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
03e58f86f3
Merge pull request #8199 from dolibarr95/patch-37
...
Fix : Bad copy/paste in var name
2018-02-15 17:28:46 +01:00
Laurent Destailleur
4f0ba4982b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
5eee292663
FIX #8189
2018-02-15 13:40:17 +01:00
dolibarr95
634f3bc025
Bad copy/paste
2018-02-15 13:38:21 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052
Add phone format for several countries
2018-02-15 10:47:32 +01:00
Laurent Destailleur
dde5c186e7
Fix duplicate html tag
2018-02-15 00:53:03 +01:00
Laurent Destailleur
b789a50ce6
Fix duplicate html tag
2018-02-15 00:38:11 +01:00
Laurent Destailleur
bab5c41b98
Fix duplicate html tag
2018-02-15 00:24:15 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
Laurent Destailleur
434980bb22
Fix svg image preview ko
2018-02-13 18:15:39 +01:00
Laurent Destailleur
92e67ebb8f
Fix svg image preview ko
2018-02-13 16:33:45 +01:00
Laurent Destailleur
8a32ae6935
Move ajax_autoselect into functions.lib.php
2018-02-13 15:46:39 +01:00
Laurent Destailleur
1a4aa89489
NEW Can share any file from the "Document" tab.
2018-02-13 13:55:36 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Laurent Destailleur
a4f48fcfb6
Fix feature must be hidden (not stable)
2018-02-12 16:09:22 +01:00
Laurent Destailleur
b2835fc803
Fix check of vat only for european countries
2018-02-12 15:54:24 +01:00
Laurent Destailleur
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Laurent Destailleur
c03ceb2205
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-12 02:56:51 +01:00
Laurent Destailleur
f88874c1f7
Code comment
2018-02-12 02:53:08 +01:00
Laurent Destailleur
ec66bde3c9
Add option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-02-10 12:15:24 +01:00
Laurent Destailleur
2315997aad
CSS enhancement
2018-02-10 00:00:12 +01:00
Laurent Destailleur
e984d7df9f
NEW Add total of time spent in timespent page at top of page too.
2018-02-09 23:52:43 +01:00
Laurent Destailleur
633dc507fe
NEW Use a css style for weekend in time spent
2018-02-09 20:11:32 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Rui Strecht
3a7cb43ad5
Forgot withregion condition if we want no state code
2018-02-07 16:06:58 +00:00
jh z
131eed97a1
New: Add a tab of Docments to expedition module
2018-02-07 22:56:14 +08:00
Rui Strecht
31372f8948
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/core/class/commonobject.class.php
2018-02-06 10:26:38 +00:00
Laurent Destailleur
ea92f6beae
Fix for multicompany
2018-02-06 10:57:53 +01:00
Laurent Destailleur
51847dfa8a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2018-02-05 15:34:50 +01:00
arnaud
3c816acb05
FIX order contactlist on Thirdparty by name
2018-02-05 15:06:28 +01:00
Laurent Destailleur
8fe773204e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
fd8f89c708
FIX a discount is a percent, not an amount, so we use vatrate not price
2018-02-04 11:13:47 +01:00
Laurent Destailleur
c6fba7273d
Api interventions
2018-02-03 20:58:26 +01:00
Laurent Destailleur
2e705b5a88
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:41:20 +01:00
Laurent Destailleur
d3a6342034
Fix regeneration of PDF after creation of payment.
2018-02-02 10:37:10 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
b2536d8ebb
FIX #8110
2018-02-01 15:44:35 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2018-01-31 11:19:39 +00:00
Laurent Destailleur
bbcc1e54d5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-30 18:03:26 +01:00
Laurent Destailleur
f761c9efab
Add param morecss on error message
2018-01-30 18:02:24 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
0d90ab0c6c
Fix when counter is corrupted in database
2018-01-30 14:42:13 +01:00
Laurent Destailleur
06f2382e39
Fix compatibility with old actioncomm record
2018-01-30 11:05:11 +01:00
Laurent Destailleur
6fb90682cf
Merge pull request #7931 from grandoc/new_branch_09_12_17
...
enhance image using awesome icon
2018-01-30 00:08:42 +01:00
Laurent Destailleur
fec551631e
Merge pull request #8066 from grandoc/new_push_16_01_2018
...
NEW Add linked file tab to vat
2018-01-29 21:28:14 +01:00
Laurent Destailleur
bee64962fe
Fix css
2018-01-27 19:40:11 +01:00
Laurent Destailleur
a61b420759
Fix css
2018-01-26 23:29:49 +01:00
Laurent Destailleur
e379b02b81
Merge pull request #8009 from dolibarr95/patch-33
...
NEW add a hook in dol_print_phone
2018-01-26 18:02:27 +01:00
Laurent Destailleur
ae1641f4b9
Merge pull request #8063 from Alabate/develop
...
NEW : Add password_hash as hash algorithm
2018-01-26 18:01:13 +01:00
Laurent Destailleur
6cae36cc33
NEW Add key __USER_REMOTE_IP__ into available substitution variables
2018-01-26 17:23:30 +01:00
Laurent Destailleur
82c2079d40
Fix var not initialized
2018-01-26 10:23:24 +01:00
Laurent Destailleur
c922498e79
Code comment
2018-01-25 20:35:25 +01:00
Laurent Destailleur
8d7f6843a4
Must be able to export lockedlog for a dedicated year.
...
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
005bccc63d
Fix missing badge of nb of permissions
2018-01-25 12:06:22 +01:00
Laurent Destailleur
9cdb7f0f27
Code comment
2018-01-24 14:37:26 +01:00
Laurent Destailleur
7a1a2cf90d
Fix send into ledger for bank line record. Show accounted status.
2018-01-22 04:13:29 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Laurent Destailleur
3987033aab
Fix substitution in public notes of pdf
2018-01-21 20:53:36 +01:00
Laurent Destailleur
dcd579242f
Fix <br /> (xml) into <br> (html)
2018-01-17 13:26:57 +01:00
Laurent Destailleur
26ba0a9ec2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
Laurent Destailleur
94b1d59f2b
Fix missing check on object entity
2018-01-16 19:52:14 +01:00
Laurent Destailleur
59eefa46e6
Fix duplicate search field
2018-01-16 18:02:36 +01:00
Philippe GRAND
cd0dc2dbde
Add linked file tab to vat
2018-01-16 16:22:32 +01:00
Laurent Destailleur
926683763b
Modulebuilde fix sort of fields, fix generation of files
2018-01-15 17:38:15 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder
...
7.0 fix module builder
2018-01-15 11:32:40 +01:00
Aurélien Labate
b86a5d5623
FIX add password_hash compatibility test for PHP < 5.5
2018-01-15 11:02:08 +01:00
Aurélien Labate
8088d92bbb
NEW Add password_hash as hash algorithm
2018-01-15 00:33:25 +01:00
Laurent Destailleur
90fc086814
Fix minor
2018-01-14 20:11:38 +01:00
Laurent Destailleur
cc5dcde9e1
Fix protection to avoid errors
2018-01-14 18:55:55 +01:00
fappels
d6ed968c51
html modulebuilder type is a text type in database
2018-01-14 15:41:37 +01:00
Laurent Destailleur
f0d6099e5f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/DoliDB.class.php
htdocs/core/lib/functions.lib.php
2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52
Code comments
2018-01-14 03:12:22 +01:00
Laurent Destailleur
7a087327e1
Fix deprecated code
2018-01-13 19:33:40 +01:00
Laurent Destailleur
c947502efa
Fix typo
2018-01-13 17:22:59 +01:00
Laurent Destailleur
7c480f76e3
Fix thumbs of pdf at wrong place
...
Fix param not provided
Fix css
2018-01-13 16:09:05 +01:00
Laurent Destailleur
8d793c680e
Fix dol_delete_preview
2018-01-13 15:48:30 +01:00
Laurent Destailleur
7bfcfd4574
Fix recursive path when dir is '0'
2018-01-12 17:12:38 +01:00
Laurent Destailleur
95d2a9f88d
Responsive and css
2018-01-12 01:10:03 +01:00
Laurent Destailleur
46d28deee7
Fix substitution of thirdparty
2018-01-11 12:25:40 +01:00
Laurent Destailleur
3f4d7dbce6
Fix substitution of thirdparty
2018-01-11 12:24:47 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
f83ea80d6a
Merge pull request #8041 from dolibarr95/patch-35
...
NEW Add class in societe/card.php
2018-01-11 00:47:53 +01:00
Laurent Destailleur
436b653fa0
Error report
2018-01-11 00:16:45 +01:00
Laurent Destailleur
167ab17927
Fix substitution of user_signature
2018-01-10 10:31:27 +01:00
dolibarr95
6fdbd4cc17
Update company.lib.php
2018-01-09 14:29:01 +01:00
dolibarr95
b9b42e3e9d
Add class
...
Add oddeven class to show_contacts() list.
2018-01-09 14:04:18 +01:00
Laurent Destailleur
86227d77d6
Fix link of images
2018-01-08 01:37:10 +01:00
Laurent Destailleur
c13a7709f5
Fix link on image for website module
2018-01-08 00:20:38 +01:00
Laurent Destailleur
de94c77a98
Fix url to alias when dolibarr is server for website module
2018-01-07 20:32:59 +01:00
Paul Dermody
a1ac285a25
Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.
2018-01-07 12:42:14 -06:00
Laurent Destailleur
dbf7603118
Debug blockedlog for loi finance 2016
2018-01-05 04:31:48 +01:00
Laurent Destailleur
07d991cc8d
Code comment
2018-01-05 01:27:48 +01:00
Laurent Destailleur
6e9e4e13c1
Code comment
2018-01-05 01:26:57 +01:00
Laurent Destailleur
21506f25b9
Merge pull request #8022 from OPEN-DSI/core_access_rights_resource_multientities
...
Fix: Access rights for resource in multi-entities
2018-01-04 21:03:55 +01:00
Laurent Destailleur
e10a9912dc
Fix missing worload
2018-01-04 19:54:30 +01:00
KHELIFA
7d824b3ef2
Fix: Access rights for resource in multi-entities
2018-01-04 15:05:11 +01:00
Laurent Destailleur
48261f793d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/admin/product.php
2018-01-03 20:21:10 +01:00
Laurent Destailleur
ca14dd790b
Fix module website
2018-01-02 22:58:37 +01:00
Laurent Destailleur
c98b5c7ec7
Fix css background
2018-01-02 17:27:05 +01:00
dolibarr95
3438cfb1e7
Update functions.lib.php
...
syntax error $withpicto
2018-01-02 11:48:41 +01:00
dolibarr95
e794a3b321
Update functions.lib.php
...
add more parameters and add if empty
2018-01-02 11:44:54 +01:00
dolibarr95
ab896dc49d
Update functions.lib.php
2018-01-02 11:39:00 +01:00
dolibarr95
12e414509c
Add a hook in dol_print_phone
...
To allow more controls in this print function as in dol_print_address (there is a hook so we can create links to maps...).
Eg : create a other click to dial functions (different from dolibarr ones with more parameters, because each provider give differents api ) etc
Hope this one will be accepted and usefull for the community.
And happy new year :)
2018-01-02 11:24:28 +01:00
Laurent Destailleur
6f107e3fee
Fix API to download/build doc
2017-12-27 15:48:20 +01:00
Regis Houssin
59a89b250d
Fix: avoid warning ( https://github.com/Dolibarr/dolibarr/issues/7993 )
2017-12-27 11:56:58 +01:00
Laurent Destailleur
57272dc5fe
API to get list of available document is ok for invoice
...
order, proposal, shipment
2017-12-22 19:49:31 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
d20062df73
Fix jquery css theme
2017-12-20 20:18:41 +01:00
Laurent Destailleur
12d91d7444
Fix missing messages in error report.
...
Fix test on non empty array
2017-12-19 18:26:27 +01:00
Laurent Destailleur
feaff433b8
Debug module website
2017-12-19 12:54:10 +01:00
Laurent Destailleur
89a62103ca
Debug module website
2017-12-19 11:40:29 +01:00
Laurent Destailleur
d4afb8300d
Fix several pb of duplicate functions in some cases
2017-12-19 00:15:22 +01:00
Laurent Destailleur
2204790602
Fix filter on project id when id is list with comma
2017-12-18 19:04:57 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Laurent Destailleur
54db0d31b4
Fix GETPOST for intcomma
2017-12-18 11:32:24 +01:00
Laurent Destailleur
8d671b2b26
Debug website module
2017-12-17 16:24:47 +01:00
Laurent Destailleur
2163db446b
NEW Can test signature of a version from API
2017-12-16 17:24:23 +01:00
Laurent Destailleur
9cdf322bfb
Fix scrutinizer bugs
2017-12-15 22:14:28 +01:00
Laurent Destailleur
e774beffc3
Fix the symbol of Yuan must be before amount
2017-12-15 17:17:35 +01:00
Laurent Destailleur
5af153550d
Debug blockedlog:
...
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
2017-12-15 16:56:08 +01:00
Laurent Destailleur
2eea3a1afa
Fix backlink of module setup pages
2017-12-15 10:36:35 +01:00
Laurent Destailleur
427f1490f8
Fix css
2017-12-14 13:52:32 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
f886aac75a
Merge pull request #7944 from lampi87/develop
...
public holiday in austria
2017-12-12 14:59:23 +01:00
Laurent Destailleur
06e63615e3
complete api detection
2017-12-12 13:05:22 +01:00
Laurent Destailleur
9880ef7364
Fix module website
2017-12-12 01:40:34 +01:00
Laurent Destailleur
48aada6090
Export of website
2017-12-11 21:27:43 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-11 15:21:22 +01:00
Laurent Destailleur
f2e429e28f
Fix file integrity checker (exclude files excluded from package)
2017-12-11 15:03:34 +01:00
Laurent Destailleur
acf2d2ee9a
Fix scrutinizer reported bugs
2017-12-11 11:48:11 +01:00
Alexander Lampret
46aeb7068c
public holiday in austria
2017-12-11 10:51:58 +01:00
Laurent Destailleur
066e04f33d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2017-12-11 00:22:05 +01:00
Laurent Destailleur
dbd96d1ac7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
2017-12-10 21:46:23 +01:00
Laurent Destailleur
4017d09613
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-10 21:28:36 +01:00
Laurent Destailleur
f18edd5787
Update security.lib.php
2017-12-10 21:08:13 +01:00
Laurent Destailleur
7d553f58f5
Debug website module
2017-12-10 20:34:35 +01:00
patrick Delcroix
033016da7f
fix: unable to remove salaries, plus correct default rights management
2017-12-10 20:02:26 +01:00
Laurent Destailleur
2dae21259e
Fix the switch show more/less
2017-12-10 19:03:18 +01:00
Laurent Destailleur
e1f0483b23
Fix grabber of url when url is on second level dir. More phpunits
2017-12-10 17:59:19 +01:00
Laurent Destailleur
02d9e93ed4
Fix badge and use of data-html instead of html tag
2017-12-10 15:46:35 +01:00
Laurent Destailleur
4443c0f0a0
Fix style
2017-12-10 15:24:47 +01:00
Maxime Kohlhaas
3db4d10fc0
Fix event late alert on third event list #7912
2017-12-10 08:12:49 +01:00
Laurent Destailleur
e3dcff7f5b
Fix substition for menus title and urls
2017-12-09 15:35:01 +01:00
Philippe GRAND
8fa7b924d5
enhance image using awesome icon
2017-12-09 12:08:50 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
56b5eab2e4
Merge pull request #7911 from atm-alexis/NEW_blockedlog_reset_warning
...
NEW warning on module blocked log reset if country code is FR
2017-12-08 13:47:44 +01:00
alexis Algoud
62cd77d999
NEW automatic activation of external module on country set
2017-12-08 10:13:03 +01:00
Laurent Destailleur
cf5265d405
Minor fix
2017-12-07 21:44:12 +01:00
Laurent Destailleur
c6e1087834
Fix test on vat amount
2017-12-05 19:47:46 +01:00
Laurent Destailleur
78c4b7f912
Fix look and feel v7
2017-12-04 20:17:07 +01:00
Laurent Destailleur
2458244ee3
Fix css
2017-12-02 16:24:38 +01:00
Laurent Destailleur
7b47ef3ca1
Change order or field
2017-12-02 11:34:56 +01:00
Laurent Destailleur
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +01:00
Laurent Destailleur
46b281f703
Fix for #7697
2017-12-01 19:29:29 +01:00
Laurent Destailleur
89ef597690
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-01 18:12:52 +01:00
Laurent Destailleur
4969ae2abb
Fix missing the badge on virtual product tab
2017-12-01 17:48:51 +01:00
Laurent Destailleur
e36b62f539
Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref-
...
Fix dispatch not adapted for label to ref change for warehouse
2017-12-01 16:26:21 +01:00
fappels
1c72dc608f
Fix travis
2017-12-01 16:22:34 +01:00
Laurent Destailleur
1d2b5dbe97
Merge pull request #7892 from atm-maxime/fix_contactlist_empty
...
Fix filters on contact list must always appear
2017-12-01 15:54:03 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
6796c08cb8
Debug/rewrite Blockedlog
2017-11-30 14:21:55 +01:00
Maxime Kohlhaas
879a0812d7
Fix filters on contact list must always appear
2017-11-29 20:04:15 +01:00
Laurent Destailleur
9fa6bfd1a5
Fix edit external user or not
2017-11-29 15:30:41 +01:00
Laurent Destailleur
a15a57317b
Debug accountancy module
2017-11-28 11:12:13 +01:00
Laurent Destailleur
533a82187a
NEW Add a protection so we can't journalize non balanced transactions
2017-11-27 17:12:48 +01:00
Scrutinizer Auto-Fixer
aab2799981
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
a0406bc741
Standardize view of events for products
2017-11-26 20:24:20 +01:00
Laurent Destailleur
7e40ee5e4b
Fix substitution key for constant ok with php 5.3
2017-11-25 23:16:15 +01:00
Laurent Destailleur
c02528a479
NEW Accept substitution key __[ABC]__ replaced with value of const ABC
2017-11-25 19:55:31 +01:00
Laurent Destailleur
2fc5d9fefb
The form to test email can now use all sending profiles.
2017-11-25 18:52:47 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
4cff4c6935
Simplify and standardize code for agenda pages
2017-11-25 00:12:45 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
b0cecab22b
Removed useless code
2017-11-22 21:26:24 +01:00
Laurent Destailleur
240f67d82b
Disable tab if not on develop mode
2017-11-22 21:23:42 +01:00
Laurent Destailleur
5fa8db1650
Work on timesheets
2017-11-22 21:19:40 +01:00
Laurent Destailleur
c3d8ef2104
Update functions.lib.php
2017-11-22 11:14:52 +01:00
Regis Houssin
a9bfe0f48f
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
2017-11-22 10:12:51 +01:00
Regis Houssin
848a27283b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member
2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148
NEW add possibility to remove address field
2017-11-22 09:51:46 +01:00
Laurent Destailleur
4b4412d5da
Standardize file names for ECM
2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4
Work on generic filemanager
2017-11-20 18:19:41 +01:00
Laurent Destailleur
304819a726
Work on module builder
2017-11-19 16:26:39 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:29:42 +01:00
Laurent Destailleur
2cb190fc5c
Fix return code
2017-11-17 15:27:59 +01:00
Laurent Destailleur
ead629708c
Look and feel v6
2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
Laurent Destailleur
68f477eaf7
Merge pull request #7818 from dolibarr95/patch-29
...
Fix : syntax error in dol_print_graph()
2017-11-17 13:18:11 +01:00
Laurent Destailleur
e06087888b
NEW Show line "other filtered task" when using filter on timesheet.
2017-11-16 22:55:04 +01:00
Laurent Destailleur
f153d9c9ff
Fix time spent counted twice
2017-11-16 19:41:31 +01:00
Laurent Destailleur
4f25bc5e3b
NEW detection of edge browser
2017-11-16 14:44:55 +01:00
Laurent Destailleur
c527189088
Standardize page name
2017-11-16 12:18:25 +01:00
dolibarr95
c6c1552c01
syntax error
...
bad syntax when add an url in dol_print_graph()
2017-11-15 11:11:45 +01:00
Laurent Destailleur
451d3ed8ed
NEW Add API to activate/unactivate a contract
2017-11-14 17:51:04 +01:00
florian HENRY
e195cf0b95
fix : return vat code for supplier price
2017-11-14 09:53:06 +01:00
Laurent Destailleur
97c9549087
Fix ref supplier must be output if it exists, even for free products
2017-11-13 11:30:41 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
Laurent Destailleur
356525730d
FIX #7786
2017-11-12 20:12:56 +01:00
Laurent Destailleur
955ed7dbbf
NEW Show the supplier ref into supplier cards
2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
...
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Laurent Destailleur
cb6bf91044
Merge pull request #7787 from libersoft/feature/correct-italian-address-format
...
NEW Support Italian addresses format. Fixes #7785
2017-11-11 17:38:29 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd
CSS
2017-11-10 20:20:59 +01:00
Laurent Destailleur
c2d7b88bdd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54
Work on filemanager generic component
2017-11-10 13:45:38 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Laurent Destailleur
9b07f33649
Clear code
2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2017-11-09 01:25:41 +01:00
Laurent Destailleur
ad71a22994
Code comment
2017-11-09 01:21:02 +01:00
Laurent Destailleur
c8a551e7de
Reorganize javascript at end of page.
2017-11-09 01:00:43 +01:00
Valerio Baldisserotto
15a501467e
FR: Support Italian address format. Fixes #7785
2017-11-08 11:43:52 +01:00
Laurent Destailleur
e7abc92f97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
2017-11-06 21:37:19 +01:00
Laurent Destailleur
bc093ef969
FIX #7775 Order of deletion in delete method (trigger first)
2017-11-06 19:27:10 +01:00
Laurent Destailleur
bc9b816719
Fix deletion of files that contains __
2017-11-06 17:54:18 +01:00
Laurent Destailleur
864af9cc3b
Fix error not returned if output directory not writable
2017-11-06 11:47:03 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
534c50f46e
Move api that are admin features into a dedicated /admin api
2017-11-06 09:55:31 +01:00
Laurent Destailleur
7139cbb490
Fix regression
2017-11-05 19:00:43 +01:00
Laurent Destailleur
fd8f65341b
Merge pull request #7765 from bomuux/patch-3
...
Fix: vat reports now include expense reports vat
2017-11-05 18:37:25 +01:00
Laurent Destailleur
1e939ec90c
Merge pull request #7761 from hregis/develop_member
...
Fix: broken feature (add more attr and css class)
2017-11-05 18:33:43 +01:00
Laurent Destailleur
202d36d582
Work on modulebuilder
2017-11-05 18:15:59 +01:00
Laurent Destailleur
e4ba6cfa10
Debu website module
2017-11-05 03:57:26 +01:00
Laurent Destailleur
c78c06776b
Fix bug reported by scrutinizer
2017-11-05 03:39:27 +01:00
Laurent Destailleur
91950ccbc7
Fix regression in getRandomPassword
2017-11-05 03:03:17 +01:00
Laurent Destailleur
05ee3e3825
Fix show message "files uploaded" only once even when n files.
2017-11-05 01:06:34 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
bomuux
0a2d8a820b
FIX: make vat reports work with expensereports
...
function tax_by_date : Fixed sql query for expense reports vat, now returning pad vat for expense report, previously returning nothing.
2017-11-03 21:06:56 +01:00
Laurent Destailleur
e78406e120
Debug cronjob
2017-11-03 20:04:18 +01:00
Laurent Destailleur
f32f3ff17f
Better default function to generate passwords
2017-11-03 18:02:17 +01:00
Laurent Destailleur
a346a1a5e9
Work on website module
2017-11-03 15:56:16 +01:00
Regis Houssin
2d4717b745
Fix: broken feature (add more attr and css class)
2017-11-03 14:46:45 +01:00
Laurent Destailleur
fa1fbe7db7
Work on websiteaccounts
2017-11-03 13:25:49 +01:00
Laurent Destailleur
ce3e586bd0
Fix doxygen
2017-11-03 11:44:31 +01:00
Laurent Destailleur
2a2c0aaa5f
Clean and debug code to execute CLI commands
2017-11-02 20:17:27 +01:00
Laurent Destailleur
f5e1ca3178
Fix break on project
2017-11-02 15:33:04 +01:00
Laurent Destailleur
cfacfab6cf
NEW Show badge with nbr of shipment on shimpen tab of order
...
NEW Add button cancel on shipment creation
2017-11-02 12:38:36 +01:00
Laurent Destailleur
dbd85321b3
Merge pull request #7735 from grandoc/new_branc_30_10_17
...
Warning: trim() expects parameter 1 to be string, array given in /htt…
2017-11-02 09:58:57 +01:00
Laurent Destailleur
6ea558b639
Update functions.lib.php
2017-11-02 09:58:22 +01:00
Laurent Destailleur
f26d970d58
Remove option MAIN_HTML5_PLACEHOLDER (on by default now)
2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Laurent Destailleur
d39a19e976
Replace on/off img tick with fa-font
2017-10-31 12:32:30 +01:00
Laurent Destailleur
bd94ec0f1d
Use fontawesome for picto for on/off default.
2017-10-31 12:25:06 +01:00
Laurent Destailleur
068f5e32cb
NEW Tooltip for substitutions variables on tooltips on admin pages
2017-10-31 11:17:44 +01:00
Laurent Destailleur
b29f32171c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Philippe GRAND
f904c46a10
Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520
2017-10-30 14:22:34 +01:00
Laurent Destailleur
33aa0f3160
Code comment
2017-10-29 17:49:24 +01:00
Laurent Destailleur
cd5e43483e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
adc4db0f85
Standardize code
2017-10-28 16:55:25 +02:00
Laurent Destailleur
9676b83574
Google tag enabled also on mobile
2017-10-28 16:00:46 +02:00
Laurent Destailleur
9e382a7f1b
Can disabled output of notify messages
2017-10-28 13:36:23 +02:00
Laurent Destailleur
9a5d532786
Fix website
2017-10-27 18:45:12 +02:00
Laurent Destailleur
013ab9405e
Work on website module
2017-10-27 17:58:38 +02:00
Laurent Destailleur
01af1e3252
Work on website module
2017-10-27 15:42:48 +02:00
Laurent Destailleur
f02e731c67
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/project.lib.php
2017-10-27 02:32:09 +02:00
Laurent Destailleur
fed0f3d09e
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/class/task.class.php
2017-10-27 02:30:33 +02:00
Laurent Destailleur
90bd9f2f4f
Fix trad
2017-10-26 20:57:23 +02:00
Laurent Destailleur
a1f862eba6
NEW Enhance framework so we can use html/icons into SELECT options.
2017-10-26 20:06:23 +02:00
Laurent Destailleur
67e5d72bd0
Fix doxygen
2017-10-26 14:56:07 +02:00
Laurent Destailleur
82b333e423
Fix migration to select2 4.0.5
2017-10-26 14:06:23 +02:00
Laurent Destailleur
5f5cbec1cf
Debug module website
2017-10-26 13:09:11 +02:00
Laurent Destailleur
6d6c4bf088
Fix export web site
2017-10-26 10:43:47 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f381361c8b
Work on modulebuilder
2017-10-24 19:57:36 +02:00
Laurent Destailleur
53d2f29cdd
Fix regression
2017-10-23 10:27:50 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
efb369f857
Merge pull request #7497 from atm-florian/dev_accountancy
...
NEW : lettrage in accountancy
2017-10-22 15:28:53 +02:00
Laurent Destailleur
b9bbba813a
Update company.lib.php
2017-10-22 15:28:03 +02:00
Laurent Destailleur
fb843430bf
FIX #7671
2017-10-22 03:22:31 +02:00
Laurent Destailleur
dbcf3ddbe8
NEW Upgrade jquery select2 to 4.0.4
2017-10-21 19:05:24 +02:00
Laurent Destailleur
1426737a26
Work on website
2017-10-21 12:26:14 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Laurent Destailleur
ab4f5a3aea
Clean code
2017-10-20 18:15:43 +02:00
Laurent Destailleur
985675d680
Clean code
2017-10-20 18:04:46 +02:00
Laurent Destailleur
d82af57b57
NEW Add tab "Expense report" on user card
2017-10-19 20:56:23 +02:00
Laurent Destailleur
abd5251330
Better responsive
2017-10-19 19:53:29 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
gauthier
3793ae323a
FIX : wrong personnal project time spent
2017-10-19 09:46:19 +02:00
florian HENRY
63f3ac2f2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy
2017-10-18 14:49:06 +02:00
Laurent Destailleur
69b131b919
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/societe/class/api_thirdparties.class.php
2017-10-18 11:28:20 +02:00
florian HENRY
4273e507c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
...
dev_accountancy
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
htdocs/accountancy/class/lettering.class.php
2017-10-18 09:52:56 +02:00
Laurent Destailleur
aa1ff189e1
Fix var not correctly initialized when using api + multicompany
2017-10-17 12:58:26 +02:00
Laurent Destailleur
41464bf5ac
Merge pull request #7633 from defrance/patch-101
...
template file not only odt/ods
2017-10-16 20:25:20 +02:00
Rui Strecht
447cc208fe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/societe/class/societe.class.php
2017-10-16 09:34:24 +01:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Laurent Destailleur
afdc176f47
Fix scrutinizer
2017-10-16 08:52:00 +02:00
BENKE Charlene
c44207f7d3
template file not only odt/ods
2017-10-14 12:39:39 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
Laurent Destailleur
6497ca5394
prepare tzuserrel
2017-10-12 18:14:02 +02:00
Laurent Destailleur
50da6a0c9e
Prepare code for removing adodb
2017-10-12 14:59:38 +02:00
Laurent Destailleur
3f36cf23f5
NEW Break lines per project on the new timesheet page
2017-10-12 13:17:22 +02:00
Laurent Destailleur
cf3dd4be12
Merge pull request #7606 from dolibarr95/patch-23
...
NEW More picto for phone
2017-10-11 11:51:07 +02:00
Laurent Destailleur
eb75c2f98e
Merge pull request #7596 from hregis/develop_bug2
...
Fix: wrong POST GET name
2017-10-11 11:30:36 +02:00
dolibarr95
572a64bdbf
display mobile picto
...
runs with #6617
2017-10-10 10:19:04 +02:00
Laurent Destailleur
9427655dd0
Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default
2017-10-09 18:18:34 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Rui Strecht
1a5cdf2406
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/admin/company.php
# htdocs/core/class/commonobject.class.php
2017-10-09 11:36:38 +01:00
Regis Houssin
64d9b625ff
Fix: wrong POST GET name
2017-10-09 11:03:16 +02:00
Laurent Destailleur
245c048b40
Merge pull request #7577 from OPEN-DSI/fix_0001
...
Fix carriage return when get full address formated for output on documents
2017-10-09 10:48:26 +02:00
Laurent Destailleur
3e0ccd6312
FIX #7585
2017-10-09 10:43:19 +02:00
KHELIFA
d77dfb9199
Fix return chariot
2017-10-09 09:26:25 +02:00
Laurent Destailleur
67c33840cf
Code comment
2017-10-08 23:19:19 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Laurent Destailleur
7465daa0da
Merge pull request #7583 from hregis/develop_admin
...
NEW add '$moreatt' parameter in picto_from_langcode function
2017-10-07 13:45:16 +02:00
Laurent Destailleur
66978a3bb4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2017-10-07 13:44:27 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
74deb05527
Clean code. Use constant for status of supplier order process.
2017-10-07 13:04:31 +02:00
Laurent Destailleur
4347bc06a2
do no transform data:image
2017-10-07 02:40:03 +02:00
Laurent Destailleur
3cc48f156f
The new website module become wonderfull
2017-10-07 02:29:27 +02:00
Laurent Destailleur
aa3fd067fc
Fix regex UNGREEDY
2017-10-06 23:54:45 +02:00
Laurent Destailleur
8e187c2759
Debug module website
2017-10-06 22:49:08 +02:00
Regis Houssin
e0e10ff830
NEW add '$moreatt' parameter in picto_from_langcode function
2017-10-06 20:53:41 +02:00
Laurent Destailleur
df38f60617
Export website into zip
2017-10-06 18:29:18 +02:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
KHELIFA
dc87133e0b
Fix carriage return when get full address formated for output on documents
2017-10-06 15:06:59 +02:00
Laurent Destailleur
1becbb8805
Fix bad date on time spent view
2017-10-06 14:38:33 +02:00
Laurent Destailleur
f9d9642340
FIX #6981
2017-10-06 14:07:28 +02:00
Laurent Destailleur
777486d74c
Keep usage of function dol_hash to encrypt a non encrypted data
2017-10-06 13:13:51 +02:00
Laurent Destailleur
4bc7eb0ec1
Merge pull request #7520 from hregis/develop_ldap
...
Fix: Set LDAP password when LDAP key changed
2017-10-06 13:09:28 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
edacf6789b
Remove dead code
2017-10-06 10:47:58 +02:00
Laurent Destailleur
848aadb48a
FIX Do not lose selected id after ENTER the TAB on autocomplete
2017-10-06 10:47:02 +02:00
Regis Houssin
8a79198769
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/core/class/comment.class.php
2017-10-04 20:00:39 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Regis Houssin
c563c3d3ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 13:19:07 +02:00
Laurent Destailleur
9b3826a54c
Invert left and right (my own comment on left)
2017-10-04 13:17:16 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Regis Houssin
66ad30feb0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 11:23:50 +02:00
Laurent Destailleur
75a7e086b3
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
...
New comment generic element
2017-10-04 11:13:39 +02:00
Regis Houssin
feea6246c2
NEW add possibility to hide LDAP tab for non admin
2017-10-04 09:13:41 +02:00
Regis Houssin
8d3ad9ddc8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 08:43:07 +02:00
Laurent Destailleur
436ec93084
FIX is_erasable report bad value when thirdparty was not loaded
2017-10-04 03:22:41 +02:00
Laurent Destailleur
a6cf934973
Add log
2017-10-04 02:46:01 +02:00
Laurent Destailleur
5ddd77c950
Fix We must use dol_escape_htmltag for input field not dol_htmlentities
2017-10-03 18:35:35 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
422a3425a8
Merge pull request #7539 from defrance/patch-28
...
unable to delete salaries
2017-10-03 16:16:49 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Laurent Destailleur
c4b3dc40c3
Allow : into file names
2017-10-03 10:54:51 +02:00
Laurent Destailleur
888e5ed2c5
Fix sanitize uploaded filename
2017-10-03 10:54:09 +02:00
Laurent Destailleur
793f1318de
Fix sanitize uploaded filename
2017-10-03 09:35:45 +02:00
Laurent Destailleur
26564cc79c
Allow : into file names
2017-10-02 20:38:15 +02:00
BENKE Charlene
41ba7af9fe
unable to delete salaries
...
compta/salaries/cards ask for a salarie/payement/delete right to delete
2017-10-02 18:49:25 +02:00
Regis Houssin
e65b21a3bf
Fix: change the parameter value of dol_getIdFromCode
2017-10-02 11:59:17 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
7c30b3ca5d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-10-02 01:28:20 +02:00
Laurent Destailleur
f785203c0d
Creating a page from an external url can grab images too.
2017-10-01 18:27:54 +02:00
Laurent Destailleur
3ddd5d3d3a
The default value feature is sensitive to url parameters.
2017-10-01 14:54:17 +02:00
Laurent Destailleur
b7810d95b9
Fix permissions
2017-09-30 20:43:15 +02:00
Regis Houssin
46cc23c568
Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used
2017-09-30 10:41:35 +02:00
atm-ph
7ba2dd8397
Fix the pdf_getlineprogress hook isn't use because hookmanager is null
2017-09-28 15:25:51 +02:00
Rui Strecht
4839d0f84d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-28 09:36:52 +01:00
Laurent Destailleur
537a551bb5
Fix vat visiblity on pdf
2017-09-27 21:58:42 +02:00
Laurent Destailleur
6bdfa99fc2
FIX The backtopage
2017-09-27 20:07:01 +02:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Laurent Destailleur
8242469e40
FIX The unique index on email templates can work now.
2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44
Add email template to send SEPA mandate
2017-09-27 17:40:14 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
Rui Strecht
3ebb18ab16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-26 16:34:59 +01:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
florian HENRY
6fcfe89565
NEW : lettrage in accountancy
2017-09-26 13:02:29 +02:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Regis Houssin
92ff974c5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-25 06:47:34 +02:00
Laurent Destailleur
4246cf24f3
Perf enhancement: Remove one include of js.
2017-09-24 20:36:27 +02:00
Laurent Destailleur
49e9326a6d
Code comment
2017-09-24 19:50:32 +02:00
Regis Houssin
06ee9f4775
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-24 16:10:55 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
b4e461e7ea
Debug modulebuilder
2017-09-23 18:17:34 +02:00
Laurent Destailleur
bee94b32d9
Debug modulebuilder
2017-09-23 15:12:25 +02:00
Laurent Destailleur
57adc28256
Work on modulebuilder
2017-09-23 01:45:03 +02:00
Laurent Destailleur
96aed9c29d
Work on modulebuilder
2017-09-22 23:38:25 +02:00
Regis Houssin
791c385e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/adherents/card.php
2017-09-22 20:26:22 +02:00
Laurent Destailleur
63ec14e47d
Convert sode to send member info email into new generic email template
...
system.
2017-09-22 20:18:11 +02:00
Laurent Destailleur
6d7db96359
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 16:31:05 +02:00
Laurent Destailleur
d4bde2a4ea
Fix date substitution for contracts
2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Laurent Destailleur
beac7a7439
Work on direct download links
2017-09-20 21:29:27 +02:00
Rui Strecht
9fc8012663
Tiny fix to php doc variables
2017-09-20 14:30:53 +01:00
Rui Strecht
395100ca70
Added missing comments for new function parameters, removed unused parameter $searchlabel
2017-09-20 12:45:18 +01:00
Rui Strecht
42a57aab26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-20 12:16:09 +01:00
Rui Strecht
f1126b65bf
Updated method to fetch state name, code and id to match method used with country
...
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
2017-09-20 12:06:35 +01:00
Regis Houssin
1f59e4f7e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-20 12:47:35 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
c38ed54990
Disable old datepicker
2017-09-19 17:31:37 +02:00
Laurent Destailleur
5f7631a95d
NEW Days where user is on vacation use different colors in timesheet.
2017-09-19 17:07:39 +02:00
Laurent Destailleur
2a04d497da
Use a different css into timespent entry page when user is on holiday
2017-09-19 16:40:55 +02:00
Laurent Destailleur
978702d04b
Fix false deprecated warning
2017-09-19 01:41:57 +02:00
Laurent Destailleur
b723d2c2d2
Fix scrutinizer bugs
2017-09-19 01:39:22 +02:00
Rui Strecht
76a2513c76
Added self to contributors list
2017-09-18 17:49:31 +01:00
Rui Strecht
998eea09bd
Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values.
...
Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)
2017-09-18 16:48:13 +01:00
arnaud
e7bb7a3588
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-18 17:28:03 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Laurent Destailleur
70b11f18b5
FIX #7367
2017-09-18 16:06:58 +02:00
Laurent Destailleur
da6b1e92b2
NEW Add the total in the perday view of the time spent form.
2017-09-18 14:18:34 +02:00
Laurent Destailleur
85d59b32b3
Add timespent entry into HR top menu too
...
Faster update of total of timespent
2017-09-18 13:15:24 +02:00
Regis Houssin
f550e27579
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-18 12:15:01 +02:00
Laurent Destailleur
0355b0d9ed
Merge pull request #7414 from aspangaro/7.0-4
...
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
e244ee6715
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-17 21:17:04 +02:00
Laurent Destailleur
2c3428a1bf
Fix css
2017-09-17 20:48:09 +02:00
Laurent Destailleur
a3c555049d
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:23 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Regis Houssin
bdc425c203
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd
NEW add members types ldap group management
2017-09-16 21:41:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
695c231e78
Update code comment
2017-09-16 10:26:27 +02:00
Laurent Destailleur
bd7c4fe940
NEW Summary of last events on a card are sorted on decreasing date.
2017-09-16 10:12:44 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Alexandre SPANGARO
c2e1e2491d
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-16 06:53:29 +02:00
Laurent Destailleur
961d475a9d
More complete substitution system.
...
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
2017-09-16 03:45:29 +02:00
Laurent Destailleur
b13dbf1f06
Clean code. Make selection of template working even if public.
2017-09-16 00:49:46 +02:00
Laurent Destailleur
087e22ab94
Fix bad status picto
2017-09-16 00:14:39 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
25c4dba8a0
Merge pull request #7402 from hregis/develop_ldap
...
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
2017-09-15 15:51:38 +02:00
tysauron
2abb38afdf
Beaucoup beaucoup plus rapide
...
Pour moi passe de 4 secondes a 0,8 (grosse base)
2017-09-15 12:48:57 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Regis Houssin
b9e0879847
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
...
NEW: complete_head_from_modules() in ldap_prepare_head()
2017-09-15 10:57:22 +02:00
Laurent Destailleur
8f5206accf
NEW The lot of a product uses the link and picto when shown into list.
2017-09-15 10:45:41 +02:00
Laurent Destailleur
f16d88fd53
FIX #7391
2017-09-14 13:17:31 +02:00
Laurent Destailleur
2f80618545
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
...
Fix task comment design
2017-09-14 12:21:58 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
2d7916f77d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/lib/json.lib.php
2017-09-14 11:49:02 +02:00
Laurent Destailleur
fe1ce5b3ac
Fix php 7.2 compatibility
2017-09-14 11:44:47 +02:00
Laurent Destailleur
205989b64b
Fix phpunit
2017-09-14 09:16:57 +02:00
Laurent Destailleur
b3b00f63e4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-13 22:30:43 +02:00
Laurent Destailleur
fed3165b53
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/lib/price.lib.php
2017-09-13 21:53:03 +02:00
Laurent Destailleur
6d40f797d2
Fix regression
2017-09-13 21:50:14 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
f2cd96b9c0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
ChangeLog
htdocs/adherents/class/adherent.class.php
htdocs/core/lib/price.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/supplier_proposal/list.php
2017-09-13 20:55:22 +02:00
Laurent Destailleur
dc38ec5051
Fix regression
2017-09-13 20:48:24 +02:00
Laurent Destailleur
9b22f046f5
FIX multicompany better accuracy in rounding and with revenue stamp.
2017-09-13 19:31:32 +02:00
Laurent Destailleur
a5a08006e9
FIX multicompany better accuracy in rounding and with revenue stamp.
2017-09-13 19:27:21 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +02:00
arnaud
4b6553d360
FIX comment color and create colorIsLight function
2017-09-13 10:43:44 +02:00
Laurent Destailleur
d340ce6380
Fix bugs
2017-09-12 19:59:27 +02:00
Laurent Destailleur
bc15a0f8e0
Fix search criteria list
2017-09-12 14:50:12 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
627dd15b44
Suggested link for online payment use the generic link
2017-09-12 12:18:26 +02:00
Laurent Destailleur
fcf82f1163
Enhancement into setup of member module
2017-09-12 11:17:23 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Laurent Destailleur
029f1c411f
Merge pull request #7357 from hregis/6.0_medias
...
Fix: some problems with medias in multicompany
2017-09-11 14:13:51 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
214bad26db
Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
...
timezone > 0
2017-09-11 03:30:10 +02:00
Laurent Destailleur
3e6ac36025
Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
...
timezone > 0
2017-09-11 02:09:48 +02:00
Laurent Destailleur
cf56da8102
NEW Default filter and sort order can use partial list of query
...
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
3afc90c88f
Fix missing translation
2017-09-10 22:26:45 +02:00
Laurent Destailleur
9f1e349506
Add hidden option message ONLINE_PAYMENT_MESSAGE_FORMIFVAT
2017-09-10 22:24:26 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Regis Houssin
762b4eb876
Fix: some problems with medias in multicompany
2017-09-09 17:48:04 +02:00
Laurent Destailleur
026f9d8e2a
Can set a dedicated message on payment forms
2017-09-09 10:54:30 +02:00
Laurent Destailleur
c7537732d2
NEW Can set a dedicated message on payment forms
2017-09-09 10:03:09 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
arnaud
fdd758abb4
FIX empty test on conf fortask comment was bad
2017-09-08 09:17:22 +02:00
arnaud
82440fd399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
2017-09-07 16:24:34 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
7c2c496823
Fix pagination on account list page
2017-09-06 19:53:28 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
33e2179b65
FIX SQL injection
2017-09-06 18:17:57 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
0c066b471d
Debug modulebuilder
2017-09-05 22:33:55 +02:00
Laurent Destailleur
f29a4c1fb1
Make accountancy pages responsive
2017-09-05 20:42:34 +02:00
Laurent Destailleur
f23a681dc0
Clean code
2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da
Standardize code
2017-09-05 09:43:22 +02:00
Laurent Destailleur
8de51ede18
Add warning to warn against json emulation
2017-09-04 13:22:21 +02:00
Laurent Destailleur
e6f0e76988
Add option MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH
2017-09-02 15:30:00 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
1da71d48cd
Work on export site
2017-09-01 11:10:03 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Juanjo Menent
bfc5f01e1e
NEW Add detail of all tax rates into pdf column tax sale.
...
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
2017-08-30 14:36:00 +02:00
Laurent Destailleur
991a33f7b6
Make different vat rates visible
2017-08-29 20:40:51 +02:00
Laurent Destailleur
6c202c5fa1
Fix vat rate to show and not vat amount
2017-08-29 19:55:49 +02:00
Laurent Destailleur
8f34de1036
NEW Can include tag {uuu} into some numbering masks to replace with user
2017-08-29 19:44:35 +02:00
Laurent Destailleur
dabd882056
Use a slash
2017-08-29 17:24:49 +02:00
Laurent Destailleur
e862ba9daf
NEW Add detail of all tax rates into pdf column tax sale.
2017-08-29 17:22:03 +02:00
Laurent Destailleur
eebaff95cf
Fix pb with imagick
2017-08-29 13:41:44 +02:00
Laurent Destailleur
560d975063
Code comment
2017-08-29 12:59:13 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
1b1ce4fdf5
Code comment
2017-08-27 19:40:43 +02:00
Regis Houssin
526ccc870b
Fix: add compatibility with old modules
2017-08-27 13:53:08 +02:00
Regis Houssin
1ce1899a46
Fix: add comment
2017-08-27 13:42:46 +02:00
Regis Houssin
d800d10766
Fix: use resprint instead resarray
2017-08-27 13:19:57 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
4052e15565
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/comm/action/card.php
2017-08-26 21:58:29 +02:00
Laurent Destailleur
03eb870576
Fix sql syntax error
2017-08-26 20:16:12 +02:00
Laurent Destailleur
254d92070f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-26 19:58:01 +02:00
Laurent Destailleur
c64a21f47b
Fix regression in cleaning sql
2017-08-26 19:57:22 +02:00
Laurent Destailleur
b3f77ed9f7
Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec
...
NEW extrafield on facture_rec
2017-08-26 19:26:09 +02:00
Laurent Destailleur
d9a85e6d3b
FIX Install run_sql function accept -- into sql content.
2017-08-26 19:19:23 +02:00
Laurent Destailleur
ebe84b6ac5
Fix run sql with large data
2017-08-26 16:24:55 +02:00
Laurent Destailleur
f2a437fa89
Enhance modulebuilder
2017-08-26 15:22:13 +02:00
Laurent Destailleur
98f5fbab5d
Fix error on contact/address not linked on thirdparty
2017-08-25 13:50:45 +02:00
Laurent Destailleur
d8ead2693f
Fix field position
2017-08-24 17:59:20 +02:00
John
0653a5d177
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
2017-08-24 14:35:01 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Regis Houssin
982fca541d
Fix: (Agenda) Allowed if link to third party is empty
2017-08-24 08:33:40 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d
FIX #7239
2017-08-23 15:02:38 +02:00
Laurent Destailleur
e25a428118
Fix compatibility with Internet Explorer
2017-08-23 12:32:28 +02:00
Laurent Destailleur
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
a2b41a30fc
Fix duplicate header in website module
2017-08-22 15:44:28 +02:00
Laurent Destailleur
ec56ff59d6
Fix invalid link after renaming a website key.
2017-08-22 15:32:45 +02:00
John
b18104788e
New extrafield on facture_rec
2017-08-22 15:22:41 +02:00
Laurent Destailleur
14cd150762
NEW Introduce experimental feature to search dolistore from application
2017-08-22 14:47:01 +02:00
Regis Houssin
e86d3d7905
Fix: Travis error "Missing parameter name"
2017-08-22 09:47:33 +02:00
Laurent Destailleur
583fc485a9
Work on website module
2017-08-21 03:13:44 +02:00
Laurent Destailleur
68c31c55c5
FIX delete dir when there is symlinks
2017-08-21 01:26:22 +02:00
Laurent Destailleur
eedf5e0a22
FIX delete dir when there is symlinks
2017-08-21 01:24:34 +02:00
Laurent Destailleur
ac3a270e17
FIX Do not delete files into sym links
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-08-21 00:43:52 +02:00
Laurent Destailleur
b9511fd4c6
FIX Do not delete files into sym links
2017-08-21 00:40:32 +02:00
Laurent Destailleur
5c5c4046a1
Prepare setup for email reminder
2017-08-20 16:07:22 +02:00
Laurent Destailleur
260beed512
NEW Generated files are now indexed in database
2017-08-18 23:19:55 +02:00
Laurent Destailleur
097b660c41
Mutualize code
2017-08-18 16:25:00 +02:00
Laurent Destailleur
4d46b2ae58
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/filefunc.inc.php
2017-08-17 22:21:30 +02:00
Laurent Destailleur
744f0ab198
Merge remote-tracking branch 'origin/5.0' into 6.0
2017-08-17 22:03:26 +02:00
Juanjo Menent
3330f040ba
FIX: Bad tax calculation with expense report
2017-08-16 11:19:28 +02:00
Laurent Destailleur
d37d1a033a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/core/lib/admin.lib.php
htdocs/install/mysql/migration/repair.sql
2017-08-11 19:56:17 +02:00
Laurent Destailleur
975fd0a6d3
Fix font size
2017-08-07 15:43:42 +02:00
Laurent Destailleur
66ffc9ca47
Debug modulebuilder
2017-08-05 11:44:27 +02:00
Laurent Destailleur
180b7d3c11
Debug modulebuilder
2017-08-05 11:35:42 +02:00
Laurent Destailleur
1c157c7c3d
Fix pb with mix collation. Add a way to fix this in repair.
2017-08-04 21:23:40 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
7c840b8348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-04 15:32:30 +02:00
Laurent Destailleur
a7dda865c9
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-08-04 15:29:54 +02:00
Laurent Destailleur
a3beceade2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-08-04 15:28:55 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
2a92ee6008
Fix look and feel v6
2017-08-02 14:10:43 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Ferran Marcet
09c271b7c5
Fix: Correction in the calculation of the next week
2017-08-02 10:31:16 +02:00
Laurent Destailleur
71d49f1c6f
Fix pb in ecm
2017-08-01 18:44:34 +02:00
Laurent Destailleur
f9dc628f0b
Add tool to fix missing thumbs
2017-08-01 15:53:22 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
7d6d4adcdb
Fix combo for multicompany not visible where there is other hooks by
...
other modules
2017-07-31 18:16:41 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
7a69df08c5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/cron/class/cronjob.class.php
2017-07-31 02:39:42 +02:00
Laurent Destailleur
69357dd91c
Merge pull request #7113 from atm-ph/new_develop_expense_report
...
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
bb8d458468
Fix menu editor
2017-07-30 19:41:45 +02:00
Laurent Destailleur
5e17c2efb9
Fix into filters of time consumed
2017-07-28 23:32:55 +02:00
Laurent Destailleur
25c5ed8f72
Fix for compatibility
2017-07-28 18:09:38 +02:00
Laurent Destailleur
b0e62f9d24
Enhance image replacement
2017-07-28 17:17:40 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
atm-ph
1f3f9e40b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-27 16:01:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
7e0a165131
Fix some pb in search using phone
2017-07-26 20:33:25 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
bd85d87e3e
Fix pb with .svg
2017-07-25 23:02:48 +02:00
Laurent Destailleur
ab72fbffc6
Fix pb with .svg files
2017-07-25 23:02:14 +02:00
Laurent Destailleur
e62a8d7bfa
Debug modulebuilder
2017-07-25 01:22:06 +02:00
Laurent Destailleur
73c7aa378e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 20:30:03 +02:00
Laurent Destailleur
9043cf759b
Fix clone function
2017-07-23 20:27:30 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
2efb86b5d8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
44023606c6
Fix pb in dolGetFirstLineOfText. Add PHPunit
2017-07-22 12:47:35 +02:00
Laurent Destailleur
f64a9968a9
Debug modulebuilder
2017-07-22 01:00:43 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
f97ecd0a45
The css files is also parsed with function to clean images
2017-07-21 20:16:53 +02:00
Laurent Destailleur
058e88c6f3
Fix title in html header
2017-07-21 12:26:11 +02:00
Laurent Destailleur
23d9353a3d
Fix title in html header
2017-07-21 12:21:48 +02:00
Laurent Destailleur
302ee97d31
Debug module website
2017-07-21 02:51:56 +02:00
Laurent Destailleur
28254655e9
Debug module website
2017-07-21 02:30:02 +02:00
Laurent Destailleur
3b8f60f90e
Fix pb of recursive include in website module
2017-07-20 16:49:20 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
4582b54e91
Fix use command standard @... to mark a change in official code
2017-07-17 20:09:19 +02:00
Laurent Destailleur
d832bfc056
Some fix into dol_compress_dir function.
2017-07-17 11:05:38 +02:00
Laurent Destailleur
330f3af74d
Fix pb in recursive dol_dir_list return.
2017-07-17 10:26:36 +02:00
Laurent Destailleur
4d9ae5bb44
Work on modulebuilder
2017-07-16 14:57:30 +02:00
Laurent Destailleur
7b2a71802b
Do some TODO on modulebuilder module.
2017-07-16 13:00:35 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
ab6646d16b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-07-15 03:54:50 +02:00
Laurent Destailleur
312b153005
Fix phpcs
2017-07-13 23:46:01 +02:00
Laurent Destailleur
7eb4562432
Code comment
2017-07-13 15:22:07 +02:00
Laurent Destailleur
85d9a2f790
Merge pull request #7145 from hregis/6.0_bug2
...
Fix: missing group name with dol_banner_tab
2017-07-13 14:36:17 +02:00
Laurent Destailleur
23fbef3dae
Fix the delete dir functions does not return real nb of deleted files.
2017-07-13 00:26:05 +02:00
Regis Houssin
d63e15f0c6
Fix: missing group name with dol_banner_tab
2017-07-12 15:52:58 +02:00
Laurent Destailleur
33ceb22b8b
Fix error management into modulebuilder
2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15
Debug modulebuilder
2017-07-12 11:52:07 +02:00
Laurent Destailleur
11cc1f04c4
Work on modulebuilder
2017-07-12 01:55:07 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Dinclaux
64a5be3e00
Fixes travis error: Arguments with default values must be at the end of the argument list
2017-07-10 14:14:21 +11:00
Laurent Dinclaux
244574f8e6
Fixes functions comments
2017-07-10 13:19:59 +11:00
Laurent Dinclaux
253f7e252d
Fixes local taxes repports by rate
2017-07-10 13:15:14 +11:00
