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
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
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
