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
Laurent Destailleur
aa66676b7d
Quick hack to solve missing alias name on doc.
2017-07-09 15:15:23 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
ba3b6b6aa5
Better support of vat with code in expense report
2017-07-08 18:09:45 +02:00
Laurent Destailleur
2ea7f38d38
Fix migration of version that is not a final version
2017-07-08 12:48:17 +02:00
Laurent Destailleur
eff4282cc2
Clean files
2017-07-07 22:19:01 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
c56ea50251
Currency symbol for peru is before value
2017-07-02 14:30:24 +02:00
Laurent Destailleur
658fe93d8c
Fix menu editor (data not aligned)
2017-07-01 12:42:49 +02:00
Laurent Destailleur
b308cfef1d
Fix dol_trunc
2017-06-30 18:30:01 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
05318bb4ec
More complete dol_string_nospecial
2017-06-28 19:02:09 +02:00
Laurent Destailleur
1a860c42ee
Look and feel v6
2017-06-27 16:42:11 +02:00
Laurent Destailleur
1fafa4017d
Fix test on currency name
2017-06-27 12:33:29 +02:00
Laurent Destailleur
3b7667292b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-27 11:59:40 +02:00
Laurent Destailleur
08af9bf365
List before
2017-06-27 10:37:00 +02:00
Laurent Destailleur
2be848025f
Fix parameter withcode of currency_name function. Add PHPUnit tests
2017-06-26 10:09:22 +02:00
Laurent Destailleur
4a21457b8a
Fix position of page nb
2017-06-26 09:28:02 +02:00
Laurent Destailleur
63dcdc3a03
Fix API was loading definition of all APIs at each call.
2017-06-25 17:09:08 +02:00
Laurent Destailleur
693b2fe3b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
45004493e0
Fix multicurrency and vat_src_code not propaged on invoice from
...
shipment.
2017-06-23 11:12:17 +02:00
Laurent Destailleur
014cb4b004
Fix navigation on security event list
2017-06-21 12:03:49 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
ec9bbe2b52
Help/Need debug of some online instances with the log view
2017-06-20 16:54:37 +02:00
Laurent Destailleur
08a86fa03d
Start #6981
2017-06-20 12:17:13 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
eef5df583e
Fix php 7.2
2017-06-20 00:50:30 +02:00
Laurent Destailleur
287e727e71
Fix detection of relative URL
2017-06-19 13:47:25 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
996ec4926b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Laurent Destailleur
0ef507ae7f
Fix rename of file to remove .noexe extension.
2017-06-18 21:52:51 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
dcc152d4a4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-18 06:52:20 +02:00
Laurent Destailleur
b73228899a
Merge pull request #7024 from defrance/patch-14
...
Introduce weight conversion lb & oz
2017-06-17 17:52:20 +02:00
BENKE Charlene
12cab2dfe0
Once to Ounce
2017-06-17 16:30:03 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
7c41c9a3e4
Fix activation of dependency for a dedicated country.
...
BlockedLog depends now on CashDesk only.
2017-06-17 11:43:00 +02:00
Laurent Destailleur
bebe7baa80
Fix images into medias not reabable into send emails
2017-06-17 10:44:08 +02:00
BENKE Charlene
17247c64f0
add WeightUnitonce
2017-06-17 10:26:01 +02:00
Laurent Destailleur
1d91ce90d3
FIX image from medias directory into PDF free text
2017-06-17 00:16:22 +02:00
Laurent Destailleur
b228fe6a2a
Fix auto focus on module page
2017-06-16 16:06:20 +02:00
Regis Houssin
c656856ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-06-16 10:52:43 +02:00
Laurent Destailleur
ac708a8ee9
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-15 23:58:56 +02:00
Regis Houssin
9410466d72
Fix: better check and security
2017-06-15 21:51:31 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
70c7bcc85f
Complete css to get value unique
2017-06-13 15:57:30 +02:00
Laurent Destailleur
c8856182a6
Fix look and feel v6
2017-06-13 15:34:18 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
2916444f6c
Fix check on module product for external user
2017-06-12 15:30:00 +02:00
Laurent Destailleur
0207f86aa5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-06-12 12:03:26 +02:00
Laurent Destailleur
6d130351a0
Fix css
2017-06-12 11:32:10 +02:00
atm-ph
946e72f269
Fix 6982 missing parameter to get more informations about files
2017-06-11 12:26:51 +02:00
Regis Houssin
6cac4b15d3
Fix: Parameter must be an array or an object that implements Countable
2017-06-11 06:54:40 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
36b18f0300
Save MAIN_VERSION_FIRST_INSTALL that is not erased.
2017-06-10 22:11:12 +02:00
Laurent Destailleur
9c482b9f2a
FIX CVE-2017-7886
2017-06-10 21:37:27 +02:00
Laurent Destailleur
d037515e37
FIX SQL injection on user/index.php parameter search_statut.
...
Conflicts:
htdocs/user/index.php
2017-06-10 20:10:57 +02:00
Laurent Destailleur
b62da4bb7a
Fix a parameter is required to know what we share.
2017-06-10 20:04:24 +02:00
Laurent Destailleur
890ac81e4d
Fix menu entried must be greyed, sub menus not visible fi not allowed on
...
parent.
2017-06-10 19:16:42 +02:00
Laurent Destailleur
87c8659e72
Fix responsive
2017-06-10 00:45:18 +02:00
phf
c1f3a168cd
Fix wrong attribute name for loop
2017-06-09 16:57:20 +02:00
Regis Houssin
0e8f36dc92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
929946ad47
Fix several problem with hook printFieldListWhere
2017-06-09 10:12:01 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
c95b5a4567
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 08:04:08 +02:00
Laurent Destailleur
a63050bf46
FIX Warnings
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/images.lib.php
2017-06-09 00:38:30 +02:00
Laurent Destailleur
75624376a5
FIX Warnings
2017-06-09 00:27:19 +02:00
Regis Houssin
ade915af5f
New: add dictionnary sharing (multicompany)
2017-06-08 16:36:42 +02:00
Regis Houssin
4b98a1aefd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-08 15:05:45 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Regis Houssin
1baa620688
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-08 10:33:26 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Regis Houssin
44dba391c1
New: add dictionnary sharing (multicompany)
2017-06-08 10:24:16 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
9e629bdb02
Work on modulebuilder
2017-06-02 20:01:25 +02:00
Laurent Destailleur
c59d216cf5
NEW Can read time spent of others (hierarchy only or all if granted)
2017-06-02 13:24:45 +02:00
Laurent Destailleur
5c58ed8ca7
Add a better error message when payment link is not valid.
2017-06-02 09:13:04 +02:00
Laurent Destailleur
976c8e0752
Fix security to test access on a task
2017-06-01 19:53:54 +02:00
Laurent Destailleur
76e1438fe6
FIX REST api to get project when user has permission to read all.
2017-06-01 17:29:47 +02:00
Laurent Destailleur
f4cdb6b254
Fix month on 2 chars. Some setup return on 1 char only. More phpunit
...
assert.
2017-06-01 15:33:23 +02:00
Laurent Destailleur
7ad92c3a4d
Fix new generic substitution system
2017-06-01 13:32:20 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Laurent Destailleur
417f71a8be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-01 02:01:34 +02:00
Laurent Destailleur
c70beaa56b
Complete work for mutualizing generic substitution system.
2017-06-01 01:57:22 +02:00
Laurent Destailleur
40334dbe14
Merge pull request #6905 from atm-quentin/NEW_project_mask_with_user_extrafield
...
NEW_extrafield_in_project_mask
2017-05-31 19:46:22 +02:00
Laurent Destailleur
a49174313f
Replace {extra_ with {user_extra_
2017-05-31 19:45:54 +02:00
Laurent Destailleur
6c7179d281
Test of commit with autoremove trail space
2017-05-31 19:20:33 +02:00
Laurent Destailleur
d5f83d6bbe
NEW #6915 Simplest change.
2017-05-31 19:15:39 +02:00
Laurent Destailleur
145cb628cd
FIX dol_string_nohtmltag make 2 passes to clean html into html
...
attributes.
2017-05-31 11:11:25 +02:00
Laurent Destailleur
c39ca4cff8
NEW Introduce function dol_compress_dir
2017-05-31 00:20:35 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
fa6bc03765
Fix typo
2017-05-30 01:34:20 +02:00
Laurent Destailleur
d56cd44ebc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-29 19:11:41 +02:00
Quentin Vial-Gouteyron
f563746310
NEW_extrafield_in_project_mask
2017-05-29 15:38:40 +02:00
Laurent Destailleur
c71488e58b
Removed deprecated code
2017-05-29 15:09:13 +02:00
Laurent Destailleur
0c5bf21f3a
Merge pull request #6900 from aspangaro/6.0-d1
...
Review expense report - Look and feel v6
2017-05-29 10:56:57 +02:00
Laurent Destailleur
452579150d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
16456cf19f
Merge pull request #6891 from hregis/develop_api
...
NEW add REST api "memberstypes"
2017-05-29 10:29:04 +02:00
Laurent Destailleur
425192ef84
Merge branch 'develop' into 6.0-multijournal
2017-05-29 10:23:46 +02:00
Laurent Destailleur
70636cc59f
FIX SQL injection on user/index.php parameter search_statut.
2017-05-29 09:59:21 +02:00
Laurent Destailleur
c4f09b8894
Work on modulebuilder
2017-05-28 14:43:17 +02:00
Laurent Destailleur
c651f1da45
Work on modulebuilder tool
2017-05-27 19:05:36 +02:00
Alexandre SPANGARO
570f9aaa9e
Review old payment page for expense report
2017-05-27 08:18:53 +02:00
Regis Houssin
18886849eb
New: add REST api "memberstypes"
2017-05-25 08:54:30 +02:00
Alexandre SPANGARO
ba7e754174
Remove old code (journal)
2017-05-25 05:32:13 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
6d4c5e4b4a
Code comment
2017-05-24 11:37:44 +02:00
Laurent Destailleur
67b3e3da99
FIX #6784
2017-05-23 15:51:39 +02:00
Laurent Destailleur
3e37185b74
FIX download attached file on resource
2017-05-23 13:44:18 +02:00
Laurent Destailleur
a3eef35ce6
Fix travis error
2017-05-22 01:19:16 +02:00
Laurent Destailleur
ecce1c2037
Remove conf
2017-05-21 23:58:19 +02:00
Laurent Destailleur
090a7028d7
Fix constant usage
2017-05-21 23:41:04 +02:00
Laurent Destailleur
965e23b711
Test to fix a regression
2017-05-21 19:45:47 +02:00
Laurent Destailleur
5cb38ece19
Fix travis errors
2017-05-21 19:37:15 +02:00
Laurent Destailleur
6aa6ef1f9f
Fix travis error
2017-05-21 18:30:43 +02:00
Laurent Destailleur
52b5a8ece7
More powerfull dol_move function.
2017-05-21 14:06:43 +02:00
Laurent Destailleur
5992175b68
Standardize code between customer and supplier invoice list.
2017-05-21 03:23:44 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
2dd2ab1003
Look and feel v6
2017-05-20 20:59:54 +02:00
Laurent Destailleur
7e25cc0475
FIX Phpunit on file submit with REST API
2017-05-20 17:09:15 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
601f3ea75e
Fix dol_check_secure_access_document in write mode, add phpunit tests
2017-05-20 11:31:03 +02:00
Laurent Destailleur
06b37d0e82
Work on dol_check_secure_access_document to support write question
2017-05-19 20:17:33 +02:00
Laurent Destailleur
30cedd154e
Fix default value must apply only if restore_lastsearch_values is on
2017-05-19 15:42:11 +02:00
Laurent Destailleur
4e7353f8a0
Clean code
2017-05-19 13:39:00 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
ff2a268831
NEW Architecture to manage search criteria persistance (using
...
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
2017-05-19 00:52:13 +02:00
Laurent Destailleur
92d7b907be
Merge pull request #6844 from defrance/patch-10
...
problems with additionnal template type
2017-05-18 17:48:30 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
5a79d11389
Avoid warning
2017-05-18 13:14:56 +02:00
Laurent Destailleur
4a46480ef5
Fix preview of PDF contract
2017-05-18 12:40:20 +02:00
Laurent Destailleur
a36a9fab2f
Look and feel v6
2017-05-18 12:12:36 +02:00
Laurent Destailleur
58f789659d
Remove one picto loading
2017-05-18 02:53:49 +02:00
Laurent Destailleur
b29f325fcf
Work on search criteria persistence
2017-05-16 23:38:23 +02:00
florian HENRY
3890c67210
fix event thirdparty agenda do not show good owner
2017-05-16 19:08:59 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef
Debug default value feature.
2017-05-16 12:22:55 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
BENKE Charlie
8e68aa86ac
problems with additionnal template type
...
If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex :
odt folder defined : c:\toto
xml folder defined : c:\tata
folder scanned with odt : c:\toto
folder scanned with odt : c:\toto,c:\tata
2017-05-14 15:17:40 +02:00
Laurent Destailleur
54088f38fb
Code standardization on online payment code
2017-05-13 14:03:09 +02:00
Laurent Destailleur
f7e042d7b8
Look and feel v6
2017-05-13 13:02:55 +02:00
Laurent Destailleur
b09300ab61
NEW Can edit background color for odd and even lines in tables
2017-05-11 13:02:29 +02:00
Laurent Destailleur
d3917b6065
FIX Bad return code of dolCpyDir
2017-05-11 12:25:53 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
5a96ae54b9
FIX Link to files on bank account tab broken with multicompany
...
FIX Link to preview on thirdparty broken with multicompany
2017-05-10 19:08:07 +02:00
Laurent Destailleur
0156e99894
Code comment
2017-05-10 13:46:02 +02:00
Laurent Destailleur
fe053c8603
Better escaping of error message.
2017-05-10 12:03:40 +02:00
Laurent Destailleur
8e25155fc9
Better escaping of error message.
2017-05-10 12:02:41 +02:00
Laurent Destailleur
c4722e3694
FIX XSS
2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f
FIX XSS
2017-05-10 11:47:34 +02:00
Laurent Destailleur
ecf3b6ab33
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-10 00:51:27 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
2fc64b8e11
Fix XSS
2017-05-10 00:44:54 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
667e3c2876
Add another security sanitizing option
2017-05-09 19:26:28 +02:00
Laurent Destailleur
081d0e7ec2
Debug module RH. Edition of user bank account is ok.
2017-05-09 11:09:21 +02:00
Laurent Destailleur
fd6518182b
Fix can force tls version
2017-05-08 12:08:43 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Laurent Destailleur
44bdf91715
Add badge with nb of imported calendard on user tab
2017-05-06 12:43:45 +02:00
Laurent Destailleur
56140ae572
Work on default focus
2017-05-06 01:09:22 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
d7e10085b8
Clean code. Using 2 different key for a param is not more allowed.
2017-05-05 18:42:11 +02:00
Laurent Destailleur
57e540af53
For better compatibility with module for 6.0
2017-05-05 17:46:40 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
db8c4a5ac4
Merge pull request #6760 from fappels/4.0_fix_download_delivery_doc
...
Fix download delivery and donation document
2017-05-05 09:21:19 +02:00
Laurent Destailleur
f069ef9844
FIX #6767
2017-05-05 09:16:11 +02:00
Laurent Destailleur
089b882033
Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone
...
FIX ajax autocomplete on clone
2017-05-04 21:05:40 +02:00
Laurent Destailleur
39d9a0f979
Support of pdf preview on supplier orders
2017-05-04 19:11:19 +02:00
Laurent Destailleur
88917afa08
Merge pull request #6740 from Hugome/fix-length_accounta
...
FIX: length_accounta return variable name
2017-05-04 12:45:45 +02:00
Laurent Destailleur
c7d736376f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-04 12:41:49 +02:00
Laurent Destailleur
e096974b2c
Merge pull request #6735 from defrance/patch-6
...
NEW Add option SITUATION_DISPLAY_DIFF_ON_PDF to display progress or difference for situation invoices
2017-05-04 12:40:05 +02:00
Laurent Destailleur
f543461e9b
Complete the substitution array with substitution array with all
...
possible keys
2017-05-04 11:21:28 +02:00
Laurent Destailleur
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +02:00
Laurent Destailleur
6e1f825190
Look and feel v6
2017-05-01 13:01:05 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
Laurent Destailleur
afc5ab0242
Fix label
2017-04-29 15:10:24 +02:00
Laurent Destailleur
8ec44615cd
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:54:21 +02:00
Laurent Destailleur
faddcb28ac
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:53:29 +02:00
Laurent Destailleur
2e6d865c7d
NEW Can define default values for create forms.
...
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
2017-04-29 00:44:25 +02:00
BENKE Charlie
058b43f342
display the good value on pdf
2017-04-28 16:50:30 +02:00
Laurent Destailleur
defce63a24
Work on management of default values
2017-04-28 14:05:28 +02:00
fappels
18981ab0c9
Fix download donation document
2017-04-28 11:39:33 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
d390acc888
FIX A non admin user can not download files attached to user.
2017-04-27 02:03:59 +02:00
Laurent Destailleur
95788c9699
FIX A non admin user can not download files attached to user.
2017-04-27 00:53:13 +02:00
fappels
c69a1205c0
Fix download delivery document
2017-04-26 19:06:41 +02:00
Quentin Vial-Gouteyron
4ab5674ffb
FIX ajax autocomplete on clone
2017-04-25 15:10:46 +02:00
hugome
54256773c5
FIX: length_accounta return variable name
2017-04-21 10:27:48 +02:00
BENKE Charlie
1792ff2d3b
oups inverted value
2017-04-21 09:41:08 +02:00
BENKE Charlie
b7f1e74f6f
New SITUATION_DISPLAY_DIFF_ON_PDF feature
...
allow to display or
the progress situation percent value
the diférential situation percent value
2017-04-20 10:27:44 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Christian Seiler
e23a44bcdf
Added missing Slashes
...
fixed line where two slashes were missing, that caused an error when creating barcodes.
2017-04-16 11:09:18 +02:00
Juanjo Menent
006ad4cef8
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
2017-04-15 20:04:45 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
4490477cfb
Fix scrutinizer warning
2017-04-15 03:14:31 +02:00
Laurent Destailleur
d99de641e8
Fic on vat npr
2017-04-15 03:06:25 +02:00
Laurent Destailleur
1e4dd5d095
Fix bug reported by scrutinizer
2017-04-15 03:05:04 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
6c069e9a1a
Fix label of long status
2017-04-13 15:15:44 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
d78f3923ee
Support of preview for pdf with several pages
2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
BENKE Charlie
2af3f010bf
expedition->dir_output is used by livraison
...
not livraison->dir_output who not exist
2017-04-11 11:33:14 +02:00
Laurent Destailleur
e68ad408af
Merge pull request #6687 from defrance/patch-5
...
expedition->dir_output is used by livraison
2017-04-11 11:32:16 +02:00
Laurent Destailleur
e08b92d913
Merge pull request #6665 from defrance/patch-4
...
Add invoice_rec_prepare_head for reccuring invoice
2017-04-11 11:13:12 +02:00
Laurent Destailleur
759315aef5
NEW Mass action delete available on project and tasks
2017-04-11 02:48:16 +02:00
Laurent Destailleur
37939e7cbd
NEW Add key __USERID__ and __ENTITYID__ as key for dynamic filters.
2017-04-11 02:17:47 +02:00
Laurent Destailleur
d15792bdf4
Minor fix
2017-04-11 00:59:47 +02:00
BENKE Charlie
20202871eb
expedition->dir_output is used by livraison
...
not livraison->dir_output who not exist
2017-04-10 15:54:02 +02:00
Laurent Destailleur
f1ae0eb7c6
Default value
2017-04-10 12:51:52 +02:00
Laurent Destailleur
0a47245ba5
NEW Add mass actions (pdf merge and delete) for interventions
2017-04-09 14:31:56 +02:00
Laurent Destailleur
ddd101757e
FIX Bulk pdf merge on supplier proposals
2017-04-09 13:26:26 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
BENKE Charlie
a0a9c8fa0c
Update invoice.lib.php
2017-04-09 11:33:56 +02:00
BENKE Charlie
feebd4252a
add invoice_rec_prepare_head for reccuring invoice
2017-04-09 11:29:54 +02:00
Laurent Destailleur
bb7c164752
Work on page to set/edit default values
2017-04-08 14:18:10 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
a99a4be9e0
Work on 6.0 look and feel
2017-04-06 22:31:45 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Laurent Destailleur
01d69e4b58
NEW Better reponsive design
2017-04-04 12:55:54 +02:00
Laurent Destailleur
9df4bac202
NEW Bookmarks are into a combo list.
2017-04-04 11:56:19 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
cab944a1a1
Merge pull request #6602 from aspangaro/6.0-multijournal
...
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
f01815519a
Fix trigger of automatic events
2017-03-30 11:25:28 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Alexandre SPANGARO
06c2f04927
Finish work on multijournal admin part
...
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
b5b0eba470
Several enhancement for 6.0
2017-03-28 12:47:48 +02:00
Alexandre SPANGARO
fc2b9a858b
New : [FP17] Add multijournals in accountancy admin
2017-03-28 06:35:03 +02:00
Laurent Destailleur
e38ad37ce3
FIX #6517 #6525 Autocompletion of thirdparty after n chars not
...
implemented
2017-03-26 05:02:06 +02:00
Laurent Destailleur
df59a595de
Fix link to files
2017-03-25 01:29:19 +01:00
Laurent Destailleur
292bcae592
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-25 00:05:04 +01:00
Laurent Destailleur
278bbf184c
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
...
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Laurent Destailleur
df17de9d48
Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf
...
add 'fusion pdf' in mass action of expense report
2017-03-24 22:50:54 +01:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
22b4d0c276
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-23 21:23:28 +01:00
Laurent Destailleur
fec3a89aa5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 11:38:46 +01:00
Laurent Destailleur
996cb9d3f1
NEW Add function ajax_autoselect
2017-03-23 11:16:30 +01:00
Laurent Destailleur
0a35d17207
CSS enhancement
2017-03-23 10:59:13 +01:00
Laurent Destailleur
8199ac9f89
FIX Can't download delivery receipts (function
...
dol_check_secure_access_document)
2017-03-22 19:49:58 +01:00
Laurent Destailleur
a0fe79a113
Fix duplicate include.
2017-03-21 16:46:12 +01:00
Laurent Destailleur
b5e646daa0
NEW Show by default README.md file found into root dir of ext module.
2017-03-21 16:43:09 +01:00
Laurent Destailleur
a5c11dc840
NEW Add function dolMd2Html
2017-03-21 16:03:13 +01:00
Laurent Destailleur
36630b9404
FIX Picto of project on dol_banner and box
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:05 +01:00
Laurent Destailleur
68257283e4
Enhance select list
2017-03-21 13:39:42 +01:00
Laurent Destailleur
0e997c973f
FIX Picto of project on dol_banner and box
2017-03-21 13:13:00 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
47e325cc66
NEW Can set the default value of any field on any create page with
...
option MAIN_DEFAULT_FOR_path-to-file_fieldname
2017-03-20 20:35:24 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
36f279837f
Update work
2017-03-19 08:17:32 +01:00
De Coninck Laurent
a05ebb6c65
add 'fusion pdf' in mass action of expense report
...
Add a mass action 'fusion pdf (build doc)' in expense report list
2017-03-18 11:51:45 +01:00
Laurent Destailleur
dba6d99686
Minor look enhancement
2017-03-16 17:02:30 +01:00
Laurent Destailleur
0d6a99b35a
Fix space
2017-03-16 11:01:35 +01:00
Laurent Destailleur
888675016d
NEW Can use dol_fiche_end without showing bottom border.
2017-03-15 11:13:30 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Regis Houssin
017d73792c
Fix: add md5 password for OpenLdap
2017-03-13 15:00:44 +01:00
Laurent Destailleur
a40142460d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-13 02:30:00 +01:00
Laurent Destailleur
6aeae12775
Fix medias could not be loaded
2017-03-13 02:28:58 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
106d74184c
CSS change.
...
More information on project list of thirdparty.
2017-03-11 00:43:06 +01:00
Laurent Destailleur
29c66b43a3
Fix responsive
2017-03-11 00:07:14 +01:00
Laurent Destailleur
618c27d63c
Optimize space
2017-03-10 16:26:43 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
e7ad91d5a3
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-10 14:50:23 +01:00
Laurent Destailleur
277fa7dbe1
FIX #6444
2017-03-10 14:08:53 +01:00
Laurent Destailleur
fbbcec2ba3
FIX #6444
2017-03-10 14:04:06 +01:00
Laurent Destailleur
f7b387513f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 13:55:28 +01:00
Laurent Destailleur
e6f294d18d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2017-03-10 13:42:55 +01:00
Laurent Destailleur
1a57d1864a
FIX #6443
2017-03-10 13:39:11 +01:00
Laurent Destailleur
3f69b1fdf5
Revert "Fix remove a line that look useless"
...
This reverts commit 1610926ccd
2017-03-10 13:14:02 +01:00
Laurent Destailleur
1610926ccd
Fix remove a line that look useless
2017-03-10 13:11:12 +01:00
Laurent Destailleur
fbb80b54df
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-10 12:23:09 +01:00
Laurent Destailleur
bf34543085
FIX #6443
2017-03-10 12:19:50 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
Laurent Destailleur
fda84995e8
If manage zero is set, we must NOT set length. So we can here make a
...
shortcut to avoid useless code.
2017-03-10 11:50:57 +01:00
Laurent Destailleur
c962daabac
NEW add property to show warnings when activating modules
2017-03-09 15:16:16 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
6ee286f5f7
FIX #6404
2017-03-03 15:11:41 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
34e5e5f721
FIX #6460
2017-03-03 14:19:46 +01:00
arnaud
abeba95de9
New USER odt
2017-03-02 15:13:42 +01:00
Laurent Destailleur
8ccc57e70f
Fix compatibility with multicompany
2017-03-02 11:46:31 +01:00
Laurent Destailleur
1562df8f93
Fix responsive design
2017-03-02 01:26:15 +01:00
Laurent Destailleur
3de288ef45
Fix badge not compatible with multicompany
2017-02-28 21:33:18 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
d12caab69a
The hook getNodeList has been replaced by a normalized 'addreplace' hook
...
getDirList.
2017-02-27 02:04:47 +01:00
Laurent Destailleur
08915d88d0
FIX the dolCopyDir fails if target dir does not exists.
2017-02-25 11:53:50 +01:00
Laurent Destailleur
bf591f5f91
Work on module website
2017-02-24 21:13:40 +01:00
Laurent Destailleur
47ea9b57e8
Fix Remove debug var_dump
2017-02-24 14:41:12 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
e981e719a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/comm/action/card.php
2017-02-23 02:54:40 +01:00
Laurent Destailleur
a79903a2fc
Fix responsive design
2017-02-23 01:29:35 +01:00
Laurent Destailleur
1e45e64a9a
Files sent from ECM module are also indexed in database.
2017-02-22 20:35:42 +01:00
Laurent Destailleur
b66ba6c57c
Fix warning
2017-02-22 19:48:15 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
bb72121179
Fix menu loading
2017-02-22 01:47:22 +01:00
Laurent Destailleur
32678015c9
FIX protection against infinite loop on hierarchy
2017-02-21 23:52:13 +01:00
arnaud
842859c394
FIX travis bis
2017-02-20 10:16:28 +01:00
arnaud
26b8112d4e
FIX travis check
2017-02-20 09:22:57 +01:00
Laurent Destailleur
2dbae7b808
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
arnaud
fc0abe659a
NEW PDF with numbertoword
2017-02-17 16:39:36 +01:00
Laurent Destailleur
49afc83a7f
Merge pull request #6437 from defrance/patch-80
...
"Preview" not translated
2017-02-17 13:28:29 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
BENKE Charlie
e4ede5aef3
"Preview" not translated
2017-02-17 12:32:06 +01:00
Laurent Destailleur
c61c13d9fd
Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies
...
fix the enabling of a dependency module already ON
2017-02-17 10:47:29 +01:00
De Coninck Laurent
fd6c4fd4d0
fix the enabling of a dependency module already ON
...
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
2017-02-16 09:26:18 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
868f2e5473
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
Laurent Destailleur
0e6ba5df4e
Merge pull request #6410 from aspangaro/5.0-25
...
Fix : Bank account label not shown in dol_banner_tab
2017-02-12 20:42:38 +01:00
Laurent Destailleur
7e3785d446
FIX the dolCopyDir fails if target dir does not exists.
2017-02-11 15:42:57 +01:00
Laurent Destailleur
3fa19f84e3
FIX the dolCopyDir fails if target dir does not exists.
2017-02-11 15:40:25 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Alexandre SPANGARO
5c9c761911
Fix : Bank account label not shown in dol_banner_tab
2017-02-09 05:58:39 +01:00
Laurent Destailleur
6fef6ac2fb
Optimize code and performance of module variant
2017-02-08 14:07:54 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
9220a638b5
NEW Filechecker can include custom dir and report added files.
2017-02-06 15:29:07 +01:00
Laurent Destailleur
bda915c63a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-03 15:34:59 +01:00
Laurent Destailleur
3dea950c24
Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project
...
New htmlid can be use instead of htmlname for select projects
2017-02-03 11:44:54 +01:00
Laurent Destailleur
76280f8ae2
Fix #6365
2017-02-03 11:42:49 +01:00
atm-ph
ac20a1a874
Fix remove param htmlid in ajax_combobox
2017-02-02 20:47:45 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
fappels
8e675fa039
Improve lot qty separation
...
Add spaces to lot info separation.
Use implode params according PHP doc.
2017-01-31 12:54:00 +01:00
phf
e73c60b526
New htmlid can be use instead of htmlname for select projects
2017-01-31 12:20:45 +01:00
Laurent Destailleur
d7c2bdba38
Fix: link was useless with a nofollow tag.
2017-01-29 16:42:59 +01:00
Laurent Destailleur
3321d865d7
Merge pull request #6304 from IonAgorria/fix-objelem
...
NEW: Add supplier order/invoice to elementproperties
2017-01-27 00:34:17 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
3a2d9c8610
Fix for rtl languages
2017-01-21 16:12:25 +01:00
BENKE Charlie
e6697c32c4
Update images.lib.php
...
in fact $dir is not used in the function
Conflicts:
htdocs/core/lib/images.lib.php
2017-01-21 12:56:39 +01:00
Laurent Destailleur
a250ba5f56
Close #6307 #6306
2017-01-20 17:52:52 +01:00
Laurent Destailleur
ac32161711
Fix error in total of tasks
2017-01-20 14:36:56 +01:00
Laurent Destailleur
e66aabea85
Fix error in total of tasks
2017-01-20 14:35:18 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e
Fix position of field and tooltip
2017-01-20 12:08:33 +01:00
Ion
9270b2c54c
Add supplier order/invoice to elementproperties
2017-01-20 10:57:41 +01:00
Laurent Destailleur
4047de82bd
Fix navigation on projects
2017-01-20 10:27:37 +01:00
Laurent Destailleur
3336943ff2
Fix responsive
2017-01-18 15:49:12 +01:00
Laurent Destailleur
bb95f139a8
Fix responsive
2017-01-17 20:04:41 +01:00
Laurent Destailleur
43cb9c30b2
Fix var_dump
2017-01-16 12:21:37 +01:00
Laurent Destailleur
da64d4d398
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 10:58:45 +01:00
Laurent Destailleur
ac80d4057d
Fix several running time errors
2017-01-16 09:30:28 +01:00
Laurent Destailleur
a05132d26e
Fix PHP 7.1 error
2017-01-16 09:05:09 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
0fe844aa00
FIX usage of tag {y} in numbering modules
2017-01-16 00:01:06 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
29f07d3e89
The tutorial to add cron is sometimes false. Quick hack for a solution
...
to hide it.
2017-01-13 16:39:35 +01:00
Laurent Destailleur
4d134a4a4e
Merge pull request #6085 from defrance/patch-49
...
NEW Extend option PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES to change supplier ref display mode in PDF
2017-01-12 11:19:54 +01:00
Laurent Destailleur
76a53dfb7d
FIX Accept spaces around the | criteria
2017-01-08 01:01:34 +01:00
Laurent Destailleur
785b2d46b3
FIX Accept spaces around the | criteria
2017-01-08 01:00:47 +01:00
Laurent Destailleur
2c1477ecea
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit 37d158f159
2017-01-07 21:50:14 +01:00
Laurent Destailleur
163ee094ec
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit df9121d6fa
2017-01-07 21:46:26 +01:00
Laurent Destailleur
37d158f159
FIX Accept spaces around the | criteria
2017-01-07 21:34:12 +01:00
Laurent Destailleur
df9121d6fa
FIX Accept spaces around the | criteria
2017-01-07 21:33:13 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
Laurent Destailleur
1d291ee0e8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-07 17:07:29 +01:00
Laurent Destailleur
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Laurent Destailleur
c27a1c1705
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-03 01:34:46 +01:00
Laurent Destailleur
9694a00179
Fix sort is lost on agenda/event of projects
2017-01-02 12:39:12 +01:00
Laurent Destailleur
2c4e8926f8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-31 17:24:14 +01:00
Laurent Destailleur
f46ce68d08
NEW Can sort thumbs visible on product card
2016-12-31 16:16:20 +01:00
Laurent Destailleur
f1961b0207
Work on sorting/indexing upload files
2016-12-31 03:43:22 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
7dd06a1ae6
Fix margin pagination
2016-12-27 02:01:27 +01:00
Laurent Destailleur
82052450a6
Complete work on dol_banner
2016-12-26 18:21:18 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2
Fix css and fix navigation on resource tab.
2016-12-23 13:04:46 +01:00
Laurent Destailleur
ba7ca3da6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop6
Conflicts:
htdocs/core/photos_resize.php
htdocs/install/mysql/data/llx_c_action_trigger.sql
2016-12-22 17:57:42 +01:00
Laurent Destailleur
26098082d0
NEW Uploaded files are indexed into database
2016-12-20 22:14:27 +01:00
Laurent Destailleur
ed0ffd6f5a
NEW Uploaded files are indexed into database
2016-12-20 19:42:25 +01:00
aspangaro
098dc08169
Loan : Complete work on dol_banner
2016-12-20 07:29:49 +01:00
Laurent Destailleur
1fdbcf4c0f
Fix missing page to match new reorg of agenda events (done for
...
thirdparty but not complete for contact)
2016-12-19 16:22:41 +01:00
Laurent Destailleur
0eded9a8b7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-19 02:35:16 +01:00
Laurent Destailleur
876722733a
Better fix to get localtax
2016-12-19 02:33:54 +01:00
Laurent Destailleur
f762c98a37
Fix html not balanced
2016-12-18 11:27:22 +01:00
Laurent Destailleur
8d9ec4f755
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-18 10:47:45 +01:00
Laurent Destailleur
58a0cb5838
Fix css style
2016-12-18 10:47:24 +01:00
Laurent Destailleur
78bf209119
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-18 02:21:57 +01:00
Laurent Destailleur
9fd48df839
Fix minor bug on subscription pages
2016-12-17 19:21:48 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
8f3ce46c50
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f
Better fix to add server name into email id.
2016-12-15 12:11:39 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-14 12:21:33 +01:00
Laurent Destailleur
56b3f2c011
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 10:32:31 +01:00
Laurent Destailleur
e1a5a90f0a
NEW Uploaded files are indexed into database
2016-12-13 00:15:21 +01:00
Laurent Destailleur
e26cb0f238
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-12 13:00:20 +01:00
Laurent Destailleur
871c69ad08
Merge branch 'fix_banks_trans_missing' of
...
https://github.com/tarrsalah/dolibarr into
tarrsalah-fix_banks_trans_missing
Conflicts:
htdocs/core/lib/company.lib.php
2016-12-11 13:21:21 +01:00
tarrsalah
0547c91d75
Fix #6142
...
load "banks" translation when constructing societe tab head in
`societe_prepare_head`.
2016-12-11 13:10:05 +01:00
BENKE Charlie
b645a50742
Add translation tabs
2016-12-10 23:49:09 +01:00
Laurent Destailleur
0f2963d05b
Merge pull request #6123 from atm-maxime/mko_multicurrency_debug
...
Fix multicurrency - Part 1
2016-12-10 23:16:14 +01:00
aspangaro
31fcf9aff9
Fix warehouse presentation
2016-12-10 22:13:06 +01:00
Maxime Kohlhaas
9f045eb996
Missing comments
2016-12-10 22:07:05 +01:00
Maxime Kohlhaas
1f48e0486f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
2016-12-10 21:50:31 +01:00
Laurent Destailleur
2dda1d7c74
Merge pull request #6116 from simnandez/develop
...
Fix: fails to load image to redim into photo resize
2016-12-10 20:00:52 +01:00
Laurent Destailleur
653eb4d907
Fix project into dol_banner
2016-12-10 20:00:07 +01:00
Maxime Kohlhaas
6474591e25
Allow to enter price in currency
2016-12-10 19:54:16 +01:00
Juanjo Menent
99542de935
Fix: fails to load image to redim into photo resize
2016-12-10 14:47:18 +01:00
florian HENRY
a422819277
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng
2016-12-10 11:49:52 +01:00
florian HENRY
2d2959ffba
Set hidden option back
2016-12-10 11:49:35 +01:00
Laurent Destailleur
bd1d076753
Merge pull request #6096 from aspangaro/5.0-b2
...
VAT payment card - Uniformize presentation
2016-12-10 11:44:38 +01:00
Laurent Destailleur
4bb778c54f
Merge pull request #6095 from aspangaro/5.0-b1
...
Fix presentation on Loan / Expense report / VAT
2016-12-10 11:42:08 +01:00
florian HENRY
3b25bf2ee6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng
2016-12-10 11:37:07 +01:00
florian HENRY
a0e8b509db
Finish Advance target emailing feature (back from hashes since 3.7)
2016-12-09 19:06:59 +01:00
Laurent Destailleur
10c00d37b5
Complete use of dol_banner
2016-12-09 15:59:31 +01:00
Laurent Destailleur
fb45c72cc3
Complete use of dol_banner
2016-12-09 15:03:57 +01:00
aspangaro
b1c007aa75
VAT payment card - Uniformize presentation
2016-12-09 06:59:24 +01:00
aspangaro
302109b3fe
Loan - Move tab Notes after Files tab
2016-12-08 22:32:10 +01:00
Laurent Destailleur
3396dfc7f6
NEW Index upload files into database.
2016-12-08 22:12:45 +01:00
Laurent Destailleur
6b5ce5c699
Merge pull request #6084 from milamberspace/Fix_ICE_Maroc
...
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
2016-12-07 12:00:03 +01:00
Laurent Destailleur
ea3e2e4a95
Merge pull request #6082 from bgenere/develop
...
Fixed 2 issues for custom module development regarding import and dictionnaries list.
2016-12-07 11:34:15 +01:00
Laurent Destailleur
1a842d8366
Fix translation
2016-12-05 13:45:57 +01:00
BENKE Charlie
d86503cb66
additionnal feature on supplier ref display
...
we have like this 3 mode of display supplier ref
2016-12-05 11:09:47 +01:00
BENKE Charlie
7ab7149e64
just little indenting
2016-12-05 11:03:12 +01:00
Milamber
e4006602f3
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc)
...
Fix issue in pdf.lib.php to add the Prof ID 5 and 6
Ref: http://www.ice.gov.ma/ICE/
2016-12-05 08:04:34 +00:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +01:00
bgenere
1b23f66299
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-02 18:00:34 +01:00
Laurent Destailleur
317df1cf91
Complete work on use of the new ol_banner_tab.
2016-11-30 20:24:36 +01:00
bgenere
9c62adb811
removed a vardump that was used for debug.
2016-11-30 17:46:53 +01:00
bgenere
751651c4d4
Merge remote-tracking branch 'upstream/develop' into develop
2016-11-30 08:37:57 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
bgenere
2e45a8e8b3
Merge remote-tracking branch 'upstream/develop' into develop
2016-11-29 17:15:00 +01:00
Laurent Destailleur
83972b39ce
Complete work on dol_banner. Fix errors due to missing columns.
2016-11-28 23:58:36 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
bgenere
093942bcd7
Fixed display issue for custom modules dictionnary not displayed
...
properly when blank exists in dictionnary list for core modules.
2016-11-28 15:37:24 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
b035b1e196
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:48:24 +01:00
Laurent Destailleur
e3c529d483
FIX javascript error when using on mobile/smartphone
2016-11-20 15:38:48 +01:00
Laurent Destailleur
e6894eda0e
Better responsive
2016-11-20 10:58:28 +01:00
Laurent Destailleur
7ac96da0d4
Several fix in warehouse stock change (rounding, api rest)
2016-11-18 16:34:03 +01:00
Laurent Destailleur
0b3765dd9a
Fix phpcs
2016-11-18 13:17:24 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
4768017662
Debug of module accountancy
2016-11-16 19:23:32 +01:00
florian HENRY
ff734bb5d9
Fix travis
2016-11-16 09:40:29 +01:00
Laurent Destailleur
2961039b98
Code comment
2016-11-15 13:14:26 +01:00
Laurent Destailleur
62e0d4ec3f
FIX Several problems into shipment management with lot enabled
2016-11-14 14:34:15 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +01:00
Laurent Destailleur
cc70b51ba3
Fix missing warning
2016-11-14 02:25:59 +01:00
Laurent Destailleur
a369514e46
Tooltip help better
2016-11-13 20:43:34 +01:00
Laurent Destailleur
6014345fb7
Fix typo error
2016-11-13 18:28:06 +01:00
Laurent Destailleur
4bcc7dc8a0
CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu
2016-11-12 14:36:52 +01:00
aspangaro
e13e66ce7b
Update works
2016-11-12 07:40:08 +01:00
aspangaro
137561aec9
Merge remote-tracking branch 'Upstream/develop' into 5.0-p35
2016-11-12 06:31:06 +01:00
Laurent Destailleur
b1bd9e4930
Responsive design
2016-11-11 23:17:37 +01:00
Laurent Destailleur
7ccc70e00d
Fix as suggested for #5960
2016-11-11 15:29:48 +01:00
Laurent Destailleur
071ba4fbfd
Fix as suggested for #5960
2016-11-11 15:27:29 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
a605e0b972
Fix phpcs
2016-11-11 15:06:31 +01:00
Laurent Destailleur
fd1c0f404c
Merge pull request #5864 from hregis/4.0_bug
...
Fix: add possibility to change width type to prevent some display issues
2016-11-11 14:55:28 +01:00
Laurent Destailleur
9606f67bdb
Better responsive design
2016-11-10 14:57:50 +01:00
Laurent Destailleur
cc64994f30
Better responsive design
2016-11-10 11:33:25 +01:00
Laurent Destailleur
9bff6f966b
NEW Can add event from the card listing events
2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994
NEW Better filtering of automatic/manually inserted events.
2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb
Fix missing tab
2016-11-07 04:02:16 +01:00
Laurent Destailleur
90881f2fa9
FIX Sanitize title of ajax_dialog
2016-11-07 00:15:58 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
Laurent Destailleur
4681c84e1d
Better responsive
2016-11-06 12:16:10 +01:00
aspangaro
5ed79800e0
Begin to wok on Vat expense report integration in reports
2016-11-05 07:48:42 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
e59c2bb61c
Debug accounting menu. Can now edit product account if already set.
2016-11-04 16:15:31 +01:00
Laurent Destailleur
a658b7cc3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/card.php
2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d
Fix dol_buildpath with parameter 3. Add phpunit tests
2016-10-31 10:37:58 +01:00
Laurent Destailleur
1382858f75
Fix log
2016-10-30 17:42:34 +01:00
Laurent Destailleur
3fbba59f69
Better management of status of events
2016-10-30 13:12:35 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
658e30aa2f
Close #4685
2016-10-29 18:09:57 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
22d2557a48
Clean page
2016-10-28 18:05:46 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
fb0f5e3230
Better behaviour on small screen
2016-10-27 01:47:03 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
aad4380689
Uniformise code
2016-10-24 20:52:21 +02:00
Laurent Destailleur
36c2b5afcd
Responsive
2016-10-24 18:43:17 +02:00
Laurent Destailleur
bc2342e9a4
Fix bad link
2016-10-24 17:37:39 +02:00
Laurent Destailleur
3b05d00163
Better responsive design
2016-10-24 12:06:33 +02:00
Laurent Destailleur
9560ec54cc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/lib/functions.lib.php
2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/lib/functions.lib.php
2016-10-24 02:10:17 +02:00
Laurent Destailleur
fdcc858008
Merge branch 'dev_resource_extrafields' of
...
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 02:05:34 +02:00
Laurent Destailleur
14e78ef50b
Mutualize code of 2 lists into one page.
2016-10-22 13:52:43 +02:00
Laurent Destailleur
3ca3b7ab78
Fix code comment
2016-10-21 10:36:11 +02:00
florian HENRY
5bf03de3fb
Fix setup page
2016-10-19 22:24:04 +02:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +02:00
Laurent Destailleur
19532c9965
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2016-10-18 13:00:46 +02:00
Laurent Destailleur
dada679110
Uniformise code
2016-10-18 12:16:12 +02:00
Juanjo Menent
f28c7bbc6d
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3
Fix: Bad localtaxes calc for Spain if VAT is 0
2016-10-18 10:11:42 +02:00
Laurent Destailleur
c1bf7c52f4
Add a line of filter in list of events related to thirdparty or projects
2016-10-18 00:02:18 +02:00
Laurent Destailleur
434b3ef643
Uniformize code and look and feel
2016-10-17 17:52:58 +02:00
Laurent Destailleur
46c985d8cc
FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO
2016-10-17 15:16:21 +02:00
Laurent Destailleur
fe471c43d1
Minor css enhancement
2016-10-16 18:28:09 +02:00
Laurent Destailleur
9175ff80a0
Fix download of files uploaded on donation
2016-10-16 17:25:33 +02:00
Laurent Destailleur
c4929c76f2
Merge pull request #5859 from GPCsolutions/5858
...
Fix module activation errors
2016-10-15 02:20:49 +02:00
Laurent Destailleur
1f6ddb485f
Fix missing module supplier proposal for external users
2016-10-14 18:22:07 +02:00
Laurent Destailleur
79d376ee12
Debug accountancy module
2016-10-14 13:05:01 +02:00
Laurent Destailleur
7c1b74133a
Debug accountancy module
2016-10-13 22:29:49 +02:00
Regis Houssin
6423b23fb3
Fix: use parameter instead constant
2016-10-12 15:36:51 +02:00
Regis Houssin
d848e98759
Fix: add possibility to change width type to prevent some display issues
2016-10-12 15:33:33 +02:00
Raphaël Doursenaud
46af0eed63
Fix module activation errors
...
Closes #5858
2016-10-11 10:24:10 +02:00
Laurent Destailleur
7504af42de
Fix regression in GETPOST when value is an array
2016-10-10 00:56:35 +02:00
Laurent Destailleur
747123621c
Fix better log
2016-10-10 00:53:54 +02:00
Laurent Destailleur
8cb38caca1
Fix regression in getUrl
2016-10-10 00:53:15 +02:00
Laurent Destailleur
0803084cc4
NEW The getURLContent return more information on success and error
2016-10-09 20:13:27 +02:00
Laurent Destailleur
cd9654978b
NEW Filters can accept generic search key like __DAY__, __MONTH__,
...
__YEAR__ replaced with current day, month year before making the search.
2016-10-09 19:49:09 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +02:00
Laurent Destailleur
28e4c17730
Debug module accountancy expert
2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7
Complete help
2016-10-06 19:03:40 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Laurent Destailleur
46f2f154c2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-10-04 19:47:45 +02:00
Laurent Destailleur
3599f2c840
Uniformize code for recurring invoices
2016-10-04 12:31:45 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
9fbe96dd38
Fix name of agenda tab
2016-10-02 21:31:32 +02:00
Laurent Destailleur
f92ca518f7
Uniformize look and feel
2016-10-02 16:38:58 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698
FIX #5746 chrome php
...
Try a fix. Not sure it solved all problems reported
2016-10-01 17:27:52 +02:00
Laurent Destailleur
91a9cb4178
Fix solution to avoid the .noexe
2016-10-01 14:02:24 +02:00
Laurent Destailleur
20ad359c9b
FIX Warning to grant permission must be visible only if one module add
...
some permissions
2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8
Merge branch 'new_no_default_rights' of
...
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights
Conflicts:
htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
2b8255590a
Better error message
2016-09-29 13:55:46 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
e60d2b0ae5
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2016-09-26 14:10:39 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Laurent Destailleur
4cccaae831
Fix warning
2016-09-25 16:44:55 +02:00
aspangaro
2dbeeedd14
Move tab menu for subscription in member.lib
...
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
Laurent Destailleur
dc45776d31
FIX Date visible on project overview
2016-09-23 10:32:19 +02:00
Laurent Destailleur
133657a8c7
Uniformize code
2016-09-21 01:25:34 +02:00
Laurent Destailleur
79ddc2458d
Better center of left, center and right part of titles.
2016-09-20 12:51:09 +02:00
Laurent Destailleur
af28a67803
Uniformize look using dol_banner
2016-09-19 10:43:30 +02:00
Laurent Destailleur
77e2037195
NEW Add REST API to read, create and delete agenda events
2016-09-19 02:02:45 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
cad69c9e90
Fix phpcs
2016-09-11 13:38:15 +02:00
Laurent Destailleur
e90909051e
Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab
...
NEW filter on action type on thirdparty event tab
2016-09-11 13:34:08 +02:00
Laurent Destailleur
f8dbc1aa9f
Theme cleaner
2016-09-10 16:09:01 +02:00
Laurent Destailleur
858291c3a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
2b7ef01e42
FIX SEC for HTB23302
2016-09-08 11:09:38 +02:00
Alexis Algoud
74d495c192
NEW filter actiontype on thirdparty tab
2016-09-08 10:26:38 +02:00
phf
d3a7b5453b
New type for GETPOST
2016-09-08 10:25:48 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
898bbd6031
NEW Support extrafields for expense reports
2016-09-06 13:00:32 +02:00
Laurent Destailleur
d24045d831
NEW Editing translation GUI become easier with search translation tool.
2016-09-04 14:45:43 +02:00
Laurent Destailleur
e4539be127
FIX sortfield and sortorder parameters output twice in navigation url.
2016-09-04 13:28:37 +02:00
Laurent Destailleur
cb27b01812
Work on feature to find a translation key
2016-09-03 18:47:04 +02:00
Laurent Destailleur
13746a3c03
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:37:59 +02:00
Laurent Destailleur
aab3b2837a
FIX #5589
2016-09-02 22:34:37 +02:00
Laurent Destailleur
eee53998ad
Mark function as deprecated #5577
2016-09-02 22:14:15 +02:00
Laurent Destailleur
3e84d227b3
Remove not used function calculate_byte. Use dol_print_size instead.
2016-08-31 19:57:17 +02:00
Laurent Destailleur
07e6c156a3
Fix free to reachable
2016-08-31 19:48:15 +02:00
Juanjo Menent
90c670a89e
Merge pull request #5684 from aspangaro/5.0-p9
...
Uniformize presentation on suppliers invoices
2016-08-31 10:08:57 +02:00
aspangaro
688ac691a9
Uniformize presentation on suppliers invoices
2016-08-31 07:05:23 +02:00
aspangaro
3892f295c7
Uniformize presentation of customer's invoice
2016-08-31 06:27:35 +02:00
Juanjo Menent
612db4f66d
Merge pull request #5673 from aspangaro/5.0-p5
...
Fix: Presentation on member card
2016-08-31 02:09:28 +02:00
Juanjo Menent
8155c09d49
Merge pull request #5671 from aspangaro/5.0-p3
...
Fix: Presentation on financial account
2016-08-31 02:08:33 +02:00
aspangaro
e2a92f304d
Presentation on member card
2016-08-29 22:07:21 +02:00
aspangaro
358bcee3a5
Presentation on financiel account
2016-08-29 21:49:34 +02:00
Laurent Destailleur
d6d474f10d
Clean code for category management.
2016-08-29 21:31:27 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/cron/class/cronjob.class.php
htdocs/install/pgsql/functions/functions.sql
2016-08-28 02:17:04 +02:00
Laurent Destailleur
bc8e203019
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3
Solve php regression failing travis
2016-08-28 01:58:11 +02:00
Laurent Destailleur
8f809e403d
Uniformize code
2016-08-24 19:38:34 +02:00
Laurent Destailleur
03c30c487c
Uniformise code
2016-08-22 13:46:38 +02:00
Laurent Destailleur
0839a9fa4f
Code comment
2016-08-20 00:54:49 +02:00
Marcos García de La Fuente
7e0b99d5ab
Little changes to PHPDoc comment block
2016-08-11 15:23:00 +02:00
Laurent Destailleur
3f87b0c225
NEW Show photo of contacts on thirdparty card.
2016-08-06 00:04:24 +02:00
Laurent Destailleur
034b08ce56
NEW Add option "Hide images in Top menu".
2016-08-05 23:40:00 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
cc21909909
Fix dol_include_once could not work to get external url of a module
2016-08-02 14:33:46 +02:00
Laurent Destailleur
a353093ae7
NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests
2016-08-01 20:18:31 +02:00
Laurent Destailleur
a35dd9f2d1
Fix bad separation of address
2016-08-01 19:37:17 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4
Fix for option MAIN_OPTIMIZEFORTEXTBROWSER
2016-07-31 13:07:55 +02:00
Laurent Destailleur
a6147ee73b
Miscellaneous fixes
2016-07-30 14:49:29 +02:00
Laurent Destailleur
74a9bbbf38
FIX private property can't be read when building pdf
2016-07-28 23:51:09 +02:00
Laurent Destailleur
d619a641ce
Fix regression (empty log were output)
2016-07-28 14:11:41 +02:00
Laurent Destailleur
aae2086ada
Move notes on dedicated tabs like other elements.
...
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
2016-07-28 13:53:17 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
3d2dc3c66e
NEW Each user can select its landing page.
2016-07-26 21:12:52 +02:00
Laurent Destailleur
b615b52f47
FIX html detection fails if only u tag is present
2016-07-26 16:11:38 +02:00
florian HENRY
419dd3095b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
Laurent Destailleur
f0a3a5ce02
NEW Mutualize mass action. So "Send by email" is also avavilable on
...
orders.
2016-07-25 21:50:41 +02:00
Laurent Destailleur
3265b7028d
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-25 19:53:28 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
07d0f457b4
Fix: files generated by mass action could not be loaded
2016-07-23 12:44:28 +02:00
Laurent Destailleur
a37caae098
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-20 19:01:55 +02:00
Laurent Destailleur
699f857a5e
NEW Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty
...
on page to submit time.
2016-07-20 18:02:33 +02:00
All3kcis
f4705873cb
Update functions.lib.php
...
Remove useless verification on $level. Second check "in_array" line 624 is sufficient with strict mode.
Otherwise "Emerg level" is not possible with "empty($level).. LOG_EMERG = 0...
2016-07-19 15:27:03 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e
Several minor fixes in expense reports
2016-07-16 15:21:38 +02:00
Laurent Destailleur
9ba1ca5acb
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
Laurent Destailleur
9512bf1ac7
Add phpunit tests for option USE_STRICT_CSV_RULES
2016-07-15 12:30:24 +02:00
Laurent Destailleur
ca5c912432
Merge pull request #5370 from IonAgorria/fix-fetchline
...
NEW: Add getElementProperties entry for proposal line
2016-07-15 10:02:20 +02:00
Laurent Destailleur
8fcd2fd76c
Merge pull request #5436 from atm-alexis/FIX_3.8_bug_4682
...
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
2016-07-14 23:02:38 +02:00
Laurent Destailleur
9bd937a3bc
Merge remote-tracking branch 'origin/3.9' into 4.0
2016-07-14 00:35:59 +02:00
Laurent Destailleur
0ad0755f4d
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-14 00:35:09 +02:00
Laurent Destailleur
10e7fa51fc
Fix missing parameters to provide all information required for
...
substitution hooks
2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75
Fix missing badge
2016-07-13 22:21:18 +02:00
Laurent Destailleur
9c06e07f07
Code comment
2016-07-12 13:03:56 +02:00
Laurent Destailleur
1efedbdade
Fix badge on project tab
2016-07-11 10:37:43 +02:00
Laurent Destailleur
bfb48ecce9
Where is the info tab of project ?
2016-07-09 15:30:42 +02:00
Laurent Destailleur
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
d8d938e82c
Fix performance problems Enter new time spent duration becoma < 1s
...
instead of 30s with 5000 tasks.
2016-07-08 17:06:12 +02:00
Laurent Destailleur
999341c1a2
Better performance
2016-07-08 12:02:09 +02:00
florian HENRY
1bb28648c4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
build/pad/DoliWamp.pml
build/pad/Dolibarr.pml
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
2016-07-07 09:05:13 +02:00
Laurent Destailleur
0af555126c
Fix PHPCS
2016-07-06 11:23:32 +02:00
florian HENRY
afb924043f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/core/modules/mailings/advthirdparties.modules.php
2016-07-04 20:43:14 +02:00
Laurent Destailleur
76d24ac8ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3
Fix NNE has been replaced with ICS
2016-07-02 11:26:55 +02:00
florian HENRY
32e954c8d8
Merge branch 'develop' of local repository into dev_fix5353
2016-07-01 15:08:15 +02:00
Laurent Destailleur
5713d293e3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2016-07-01 03:17:20 +02:00
Laurent Destailleur
3645bd8f69
Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170
...
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
2016-07-01 03:06:31 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
florian HENRY
37ee64ae9b
fix 4672
2016-06-30 17:10:06 +02:00
Alexis Algoud
afeb212520
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
2016-06-30 16:16:27 +02:00
florian HENRY
d431e73ec8
Fix #5353
2016-06-30 15:49:57 +02:00
Alexis Algoud
22bc44620b
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
2016-06-30 14:27:58 +02:00
Laurent Destailleur
933ec6c118
FIX detection of HTML content when only p tag is present.
2016-06-29 13:14:53 +02:00
gauthier
d9035e5308
FIX : receiving link never works
2016-06-28 11:41:23 +02:00
Laurent Destailleur
2767df2e01
FIX Solve problem of sending joinded files of another email when several
...
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
2e4c6597d8
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:05:00 +02:00
Laurent Destailleur
91e13d23fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer
23620e3133
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1
Fix doxygen errors
2016-06-23 20:19:35 +02:00
Frédéric FRANCE
3690d11ca2
Update pdf.lib.php
2016-06-23 10:48:52 +02:00
Laurent Destailleur
4a408e76e7
Fix download of mass generated files.
2016-06-22 21:06:08 +02:00
Laurent Destailleur
8356dd1080
Fix minor
2016-06-20 10:22:08 +02:00
Laurent Destailleur
74f19944b9
Fix rtl language ar_SA
2016-06-20 00:13:30 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
eac5cbb0dd
FIX Fix the reposition on the clear target button.
2016-06-19 11:59:55 +02:00
Laurent Destailleur
4382f2a437
Clean language files
2016-06-18 11:06:11 +02:00
Ion Agorria
5a68001ee6
Add getElementProperties entry for proposal line
2016-06-18 03:28:18 +02:00
Laurent Destailleur
988ed3947c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-17 16:28:28 +02:00
Laurent Destailleur
243a30e5de
Code comment
2016-06-17 15:51:09 +02:00
Alexis Algoud
25fe110a34
FIX a task without project inclusion call a non included object Link
2016-06-16 14:08:14 +02:00
Laurent Destailleur
232f525f29
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
65cbf1623b
Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER
2016-06-12 20:24:05 +02:00
Laurent Destailleur
74e59a1bc4
Debug prototype feature "testmenuhider"
2016-06-10 18:41:10 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
dcc1589d7c
Merge pull request #5312 from aspangaro/4.0-p32
...
Loan - Debug & update
2016-06-07 00:28:20 +02:00
Laurent Destailleur
645412517d
css enhancement
2016-06-06 22:07:35 +02:00
aspangaro
a6a96c710d
Restore note page
2016-06-06 20:36:04 +02:00
Laurent Destailleur
9b6e5196ea
Debug module resource. Filter on agenda.
2016-06-06 13:05:36 +02:00
Laurent Destailleur
681249de8a
Debug module resource
2016-06-06 12:29:15 +02:00
Laurent Destailleur
51ce4804dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae
Code comment
2016-06-06 10:58:23 +02:00
aspangaro
fda07997d2
Fix: Loan - Remove page note, already present in card
2016-06-05 15:25:21 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
0ab4827091
FIX #5087
2016-06-05 02:06:32 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
7866fb9dae
Fix #5153
2016-06-04 19:11:32 +02:00
phf
a62f5bd5b4
Fix #2777
2016-06-04 17:17:22 +02:00
jean
49d0c8d5ff
FIX #4173 Ergonomie of product/service card
...
Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying
nophoto.png
2016-06-04 16:34:26 +02:00
Maxime Kohlhaas
3718121cee
Add number of permission in user permission tab
2016-06-04 13:25:56 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
bf5fbd3a80
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 21:14:28 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
ee420b79b1
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 17:52:06 +02:00
Laurent Destailleur
7519c4a602
FIX Log of tax
...
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Laurent Destailleur
1bc6c4ffa3
Clean code
2016-05-30 20:50:49 +02:00
Laurent Destailleur
46a0f3dab0
Fix minor bugs
2016-05-30 01:30:28 +02:00
Laurent Destailleur
889ff16906
FIX #5239
2016-05-29 11:56:19 +02:00
Laurent Destailleur
5fd64c81a6
Missing translation
2016-05-21 12:21:17 +02:00
Laurent Destailleur
a66901d7d5
Enhance css
2016-05-21 12:09:54 +02:00
Laurent Destailleur
7087b650d0
More precise parameter parameter targetwithdetails
2016-05-19 17:37:06 +02:00
Laurent Destailleur
9c3b9a8494
NEW: Link on user in leave context reach to leave tab.
2016-05-19 13:25:16 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
55e904bc01
Debug for expert accounting module
2016-05-12 20:45:05 +02:00
Laurent Destailleur
25dfa0c5b9
Work on website
2016-05-07 16:38:32 +02:00
Laurent Destailleur
5a75f346ff
Debug advanced selector
2016-05-06 00:02:22 +02:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
0c6aaaaa3c
FIX #5168
2016-05-05 23:05:17 +02:00
Laurent Destailleur
d50e9cde34
Merge pull request #5090 from atm-maxime/fix_pdffoot_details
...
PDF foot details
2016-05-05 21:09:46 +02:00
Laurent Destailleur
cbbafb6432
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-04 13:50:17 +02:00
Laurent Destailleur
878ba07fcd
NEW The note on time spent can be entered when using the view per day.
2016-05-04 12:24:15 +02:00
Florian HENRY
3d57e83094
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Laurent Destailleur
df4afdd663
NEW Can disable a module by renaming dir of module into module.disabled
...
(this save time for maintenance when working with FTP).
2016-05-02 09:49:58 +02:00
abb
23c0a0a64e
conflict solved Merge branch 'develop' into abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-05-02 01:28:46 +01:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
5d1dbdb82c
Merge pull request #5089 from atm-maxime/fix_slect_ziptown
...
Fix country and state were not properly updated after ziptown selection
2016-04-29 19:26:40 +02:00
Laurent Destailleur
19162fc8d5
Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
...
PeartreeG-patch-1
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/resource/element_resource.php
2016-04-29 18:31:11 +02:00
Laurent Destailleur
8fe799f424
Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
...
into aternatik-dol_resource
Conflicts:
dev/initdata/img/printcompany.png
htdocs/compta/bank/card.php
2016-04-29 17:51:11 +02:00
Juanjo Menent
5ca989c836
Merge pull request #5126 from FHenry/dev_fixpgsql
...
FIX Postgres migration from 3.9 to 4.0
2016-04-29 12:18:49 +02:00
Laurent Destailleur
2ea5bf3d5e
FIX: Pre selected value was not used on supplier list ouput
2016-04-28 20:04:48 +02:00
Florian HENRY
e698c410f5
FIX Postgres migration from 3.9 to 4.0
2016-04-28 13:56:17 +02:00
Maxime Kohlhaas
0358db0065
Fix use of details in pdf foot
2016-04-23 17:10:56 +02:00
Laurent Destailleur
00a658143d
NEW List of user in agenda view per user show photo thumb
2016-04-23 16:51:22 +02:00
Maxime Kohlhaas
179022b129
Fix country and state were not properly updated after ziptown selection
2016-04-23 16:49:43 +02:00
Laurent Destailleur
b639849a47
Page for proposals must be called card.php (one of last architecture
...
change before the freeze)
2016-04-23 15:37:22 +02:00
Laurent Destailleur
5bfc65676c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
63d04f4f2d
Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client
...
Fix order creation bug because of ->client
2016-04-22 19:20:48 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
2cc24db6a2
Fix typo
2016-04-22 13:45:54 +02:00
Laurent Destailleur
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +02:00
Laurent Destailleur
366db31a9e
Make css more simple
2016-04-22 13:38:44 +02:00
Laurent Destailleur
7515b2ba7b
NEW Add a parameter on graph function to show a generic graph when no
...
data are available.
2016-04-22 12:11:57 +02:00
Maxime Kohlhaas
e881701968
Fix pdf generation with thirdparty
2016-04-22 09:46:47 +02:00
Laurent Destailleur
dd443fe7f5
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/localtax/quadri_detail.php
2016-04-21 02:42:43 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
d40e659b30
Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
...
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
aspangaro
b59c94e056
NEW: Accountancy - Add Result page
...
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
54dd1763fe
Little refactor
2016-04-17 15:05:54 +02:00
Juanjo Menent
9f4ccfab95
FIX #3815 With higher quality
2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22
FIX #3815 With higher quality
2016-04-15 15:42:58 +02:00
Juanjo Menent
4446e6a36c
FIX #3815 Call to undefined function local_by_date(). branch 3.8
2016-04-15 12:47:21 +02:00
Juanjo Menent
2d3b2c08b5
FIX #3815 Call to undefined function local_by_date(). branch 3.7
2016-04-15 10:56:03 +02:00
Marcos García de La Fuente
a41a80b8fe
Merge branch 'develop' into oop-refactor-bankaccount-tostring
2016-04-09 23:17:09 +02:00
Laurent Destailleur
63dd6d98ec
Remove warnings
2016-04-09 19:53:16 +02:00
Laurent Destailleur
af4a975be2
Fix PHPCS
2016-04-09 19:50:13 +02:00
Laurent Destailleur
acf546d982
Move a not used function into a better place.
2016-04-09 19:42:34 +02:00
Scrutinizer Auto-Fixer
051ccf30a1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 17:32:05 +00:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
475c11ca8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-09 15:08:29 +02:00
Laurent Destailleur
724610ba5b
Quality fixes reported by scrutinizer
2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
b9ffc18c27
Uniformize log of supplier order. Now use the generic log feature.
2016-04-08 17:28:48 +02:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
059466030a
FIX Missing a new line into log of sent emails
2016-04-07 12:42:18 +02:00
Laurent Destailleur
2c829e7cb6
NEW Add picto on module list to show warning and if module is an
...
external module.
2016-04-07 11:50:45 +02:00
Florian HENRY
344a87f970
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/class/html.formaccounting.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
Marcos García
fded7d3e9a
Corrected PHP documentation of calcul_price_total function
2016-04-03 22:17:25 +02:00
Juanjo Menent
2388887e99
Merge pull request #4938 from aspangaro/4.0-p15
...
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 17:38:02 +02:00
aspangaro
f8bc456807
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 15:32:46 +02:00
Juanjo Menent
cd6c6f64c5
Merge remote-tracking branch 'upstream/develop' into dolibarr-3510
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-03 12:41:14 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
aspangaro
33e8833287
Fix travis
2016-04-03 10:47:21 +02:00
Laurent Destailleur
10f639507f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2
FIX image extension must be in lower case
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:46:01 +02:00
Laurent Destailleur
c12541f4f2
FIX image extension must be in lower case
2016-04-02 15:00:58 +02:00
Laurent Destailleur
c0b2d7405a
FIX Generated thumbs must always use the png format so using thumbs can
...
work.
2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489
FIX Creation of thumb image for size "small" was not done.
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f
FIX Creation of thumb image for size "small" was not done.
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 14:20:21 +02:00
Laurent Destailleur
66f9f0d046
FIX Creation of thumb image for size "small" was not done.
2016-04-02 14:15:38 +02:00
Laurent Destailleur
281b06a2d3
NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and
...
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
2016-04-01 18:44:23 +02:00
Florian HENRY
ae51321040
Debug Advance target emailing
2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
Laurent Destailleur
2e5cc98e59
Fix into badges visibility
2016-03-29 20:06:01 +02:00
Laurent Destailleur
30aea901b8
Merge pull request #4855 from marcosgdf/account-oop
...
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-25 17:41:39 +01:00
Laurent Destailleur
c8fd12cdaa
Update code comment
2016-03-25 17:14:20 +01:00
Laurent Destailleur
61bc8fc9ef
NEW Can edit value date of a vat payment after recording it.
...
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Laurent Destailleur
4ec41bc33b
NEW Can edit value date of a vat payment after recording it.
2016-03-25 14:49:48 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Juanjo Menent
c323948669
Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix
...
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-21 20:40:07 +01:00
Juanjo Menent
187a04854f
Merge pull request #4862 from marcosgdf/form-selectarray2
...
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
Laurent Destailleur
d4f5076a84
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8
FIX PHPCS
2016-03-20 17:37:27 +01:00
Laurent Destailleur
6b821f15d1
FIX Bad vat definition when using POS module
2016-03-20 17:36:13 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Marcos García de La Fuente
889c72611d
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-03-19 23:00:33 +01:00
Laurent Destailleur
8689240b7f
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a
Fix first change to fix serious pb with vat definition when using the
...
POS.
2016-03-19 21:35:03 +01:00
Marcos García de La Fuente
7fbf16a202
Fixed an error including FormBank class
2016-03-19 20:51:43 +01:00
Marcos García de La Fuente
8ef122ad99
Fixed missing require bug
2016-03-19 20:12:41 +01:00
Marcos García de La Fuente
39d17c0132
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-19 20:05:13 +01:00
Marcos García de La Fuente
1be9c53b6c
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-19 19:39:18 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
97b630ac65
NEW Can use ^ and $ (to say start with or end with like regex syntax)
...
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
2016-03-18 12:42:13 +01:00
Laurent Destailleur
5edeeae384
FIX Bad error and style message when changing its own login
2016-03-18 11:30:15 +01:00
abb
b6e39960b4
new:handle user notification in notification module
...
Conflicts:
htdocs/core/lib/usergroups.lib.php
2016-03-13 20:08:27 +01:00
Laurent Destailleur
a5571b1040
NEW Show a badge with number of withdraw requests done on the withdraw
...
tab of invoice.
2016-03-13 01:20:54 +01:00
Laurent Destailleur
7dac7c4f04
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-11 11:00:53 +01:00
Laurent Destailleur
a9058df753
Fix bad field in select
2016-03-11 10:47:17 +01:00
Laurent Destailleur
7a5353efb2
Make things clearer about option MAIN_ENABLE_LOG_TO_HTML
2016-03-10 18:36:09 +01:00
Laurent Destailleur
155fd71f6d
Merge pull request #4734 from fappels/develop
...
Fix: add require to showDimensionInBestUnit
2016-03-10 13:22:58 +01:00
Laurent Destailleur
d0441fa05f
NEW: Show into badge on tab head the number of dedicated contacts for
...
objects.
2016-03-10 11:16:12 +01:00
Laurent Destailleur
8ab343e95f
Can choose number of decimals into function showDimensionInBestUnit
2016-03-09 23:17:46 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Francis Appels
0890f20a72
Update functions.lib.php
...
Add product.lib for function measuring_units_string
2016-03-04 19:29:08 +01:00
Laurent Destailleur
87093c79f9
Merge pull request #4708 from marcosgdf/account-constants
...
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
e92318bc13
Better fix to manage several level of beta and rc
2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919
Merge pull request #4710 from hregis/3.9_bug
...
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-04 15:18:59 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
b1c1de422f
Enhance look of cron job list
2016-03-03 10:05:40 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Regis Houssin
057188e1de
Fix: comment debug lines
2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-02 11:23:57 +01:00
Marcos García de La Fuente
ff83dd9afe
Replaced account type comparisons with TYPE constants
2016-03-02 11:08:57 +01:00
Frédéric FRANCE
a58dda76ed
Update product.lib.php
2016-03-01 17:28:08 +01:00
Laurent Destailleur
be9a144433
FIX Add a test to show bugged module with a bad declaration of
...
dictionaries to avoid to see clean module to be breaked.
2016-02-28 12:43:00 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
aspangaro
1bf188db86
Fix: Double line
2016-02-27 14:34:32 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
23f45c7b7e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
Laurent Destailleur
4250fe155a
Fix showing ref of shipment on orders (lines too long)
2016-02-26 15:42:07 +01:00
Laurent Destailleur
c1ea597cb7
Redesign page with customer price to make it easier to understand.
2016-02-26 13:44:03 +01:00
Laurent Destailleur
e115ac90ec
Code comment
2016-02-26 12:08:04 +01:00
Laurent Destailleur
f330a1c8e5
Fix phpcs
2016-02-26 10:55:47 +01:00
Laurent Destailleur
b072b5a181
Fix remove some warnings
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1
Fix remove some warnings
2016-02-26 10:38:42 +01:00
Laurent Destailleur
4b4de22a54
NEW Add hook pdf_build_address
...
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
2016-02-25 20:54:37 +01:00
Laurent Destailleur
54034ea852
NEW Add $object in parameter of pdf_build_address so we could include
...
hook into the function.
2016-02-25 18:30:31 +01:00
Laurent Destailleur
cdcad62967
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:19:20 +01:00
Laurent Destailleur
7fc58ddabc
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:18:00 +01:00
Laurent Destailleur
a95240e33d
FIX Some troubles into weight and volume calculation when unit differs.
...
NEW Introduce a function showDimensionInBestUnit
2016-02-25 13:46:38 +01:00
Laurent Destailleur
a5c3658f53
Fix bad formatting of order / shipment ref on PDF
2016-02-25 02:45:27 +01:00
Laurent Destailleur
f1ba81ec66
Fix bad formatting of order / shipment ref on PDF
2016-02-25 02:44:34 +01:00
Laurent Destailleur
1ba2407da4
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-25 01:42:03 +01:00
Laurent Destailleur
33d5fa38ef
Fix pdfBuildThirdpartyName must return main name. Alias should be an
...
option.
2016-02-24 13:30:16 +01:00
Ion Agorria
673f0c70a6
NEW: TimeZone can be supplied to mktime
2016-02-22 22:00:59 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
355f091246
FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE
2016-02-22 13:28:08 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
aspangaro
d77a8bddcf
Fixed: Members - Problem of tab & missing language file
2016-02-19 07:39:14 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
761ad0114c
Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
...
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
Laurent Destailleur
3b5ce32cb0
Code comment
2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580
Fix code comment
2016-02-19 01:45:52 +01:00
Laurent Destailleur
633de3bcb4
Fix list of object referers should not be set to invoice by default (may
...
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
Laurent Destailleur
5268038e00
Minor css enhancement
2016-02-16 22:58:24 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-15 01:19:57 +01:00
Laurent Destailleur
71a12824c9
Merge branch 'new_numbering_module_supplier_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:31:33 +01:00
Laurent Destailleur
3925ae0742
Fix: we loose ability to refresh contact list when changing a company on
...
contact tab
2016-02-14 23:54:07 +01:00
aspangaro
47f60e1f8d
Add function img_weather
2016-02-13 07:53:50 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Raphaël Doursenaud
d038ca1875
FIX #4597 PHP 7 Uniform Variable Syntax
...
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
2016-02-11 20:01:51 +01:00
Laurent Destailleur
e67be201ed
NEW Can select number of lines on page list for projects and tasks
2016-02-11 16:49:13 +01:00
Laurent Destailleur
0d7f67ade5
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-10 23:59:15 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
6dbaba6973
Fix: previous and next arrow
2016-02-10 17:45:26 +01:00
Laurent Destailleur
7ef0415aca
Small per enhancement
2016-02-09 15:57:24 +01:00
Laurent Destailleur
5c1c413c02
Fix warning
2016-02-09 15:44:34 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
7445a0f71c
Clean code for generating sheet of barcode. Can choose output filename.
2016-02-08 16:42:34 +01:00
Laurent Destailleur
404663472a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14
More robust error management on barcode module.
2016-02-08 15:49:38 +01:00
Laurent Destailleur
fcf1e20d5b
Merge pull request #4578 from frederic34/sticker
...
Dictionnary for label sticker and card format
2016-02-08 14:49:31 +01:00
phf
d66bc6f1b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
frederic34
9c74af63af
Dictionnary for label sticker and card format
2016-02-06 12:06:05 +01:00
Laurent Destailleur
062deae24c
Merge
2016-02-05 12:18:50 +01:00
phf
a8e480e392
FIX #3509 payment ref for suppliers
2016-02-04 23:15:06 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82
Fix warning when javascript disabled
2016-02-03 03:10:58 +01:00
Laurent Destailleur
e22664b8cf
FIX #4528
2016-02-03 01:01:14 +01:00
PeartreeG
4c0f29d234
Update fichinter.lib.php
2016-02-02 14:05:58 +01:00
Florian HENRY
3c94f5d4d4
Add log into next values
2016-02-02 11:38:32 +01:00
PeartreeG
c1ff21c30a
add fichinter link to resources
2016-02-01 16:09:58 +01:00
Laurent Destailleur
928336c835
NEW Clean and enhance code for cron engine
2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea
Prepare code to match cron rule: 0 if ok, !=0 if error
2016-01-31 14:20:02 +01:00
PeartreeG
d1018760df
Update resource.lib.php
2016-01-31 12:24:19 +01:00
PeartreeG
4c025d4323
Adding additional tabs
2016-01-31 12:23:05 +01:00
mic9p
8faeac611a
Do not select siren but tva_intra from societe
...
VAT report by customer shows an empty field.
2016-01-30 15:35:28 +01:00
mic9p
827fd39658
Do not select siren but tva_intra from societe
...
VAT report by customer shows an empty field.
2016-01-30 10:35:57 +01:00
phf
4baff7898d
FIX insert FactureLigne
...
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
2016-01-26 22:18:31 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
469a44a4cf
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:23:00 +01:00
Laurent Destailleur
da93e35dbb
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:19:34 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
fedf1f3288
Fix view of product image when using old path
...
Fix size of image uploaded on user.
2016-01-22 14:02:48 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
d857b3475b
Fix doxygen
2016-01-22 03:07:46 +01:00
Laurent Destailleur
4e87afddf1
Fix: why a floating float here ?
2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82
Fix: why a floating float here ?
2016-01-21 22:43:20 +01:00
phf
68857499d7
NEW display multicurrency price on azur pdf model
2016-01-21 22:26:51 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
Laurent Destailleur
dd6e60630d
Fix size of cells make page too large even for large screen
2016-01-21 15:01:53 +01:00
Laurent Destailleur
19bcdb6910
Fix size of cells make page too large even for large screen
2016-01-21 14:56:26 +01:00
jfefe
7c4a9d140b
Replace reserved keyword "Resource" by "DolResource"
...
# Conflicts:
# htdocs/resource/list.php
2016-01-21 11:26:21 +01:00
Sergio Sanchis Climent
4d75039688
Edited correctly for check values
2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent
0467dac43d
Fix userlocaltax
...
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
2016-01-21 11:20:27 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
Laurent Destailleur
0f456c46ab
Clean project pages to work like other modules
2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
524614ded9
Start to work on a per type view of agenda
2016-01-14 16:52:46 +01:00
Laurent Destailleur
a6416b8797
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad
Fix: no need of translation tab if multilang was disabled.
2016-01-14 15:00:31 +01:00
Laurent Destailleur
0f5e208127
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-13 20:43:49 +01:00
Laurent Destailleur
71b264dd86
FIX Bug: Delivery order and date are not displayed #4372
...
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
2016-01-13 20:41:32 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
c47e18b7e2
Merge pull request #4197 from atm-ph/new_mail_input_file_multiple
...
NEW hidden conf to use input file multiple from mail form
2016-01-09 17:57:50 +01:00
Juanjo Menent
c7ae943e57
Merge pull request #4311 from FHenry/develop
...
NEW : if nb total of lines provided in print barre_liste, display beside title
2016-01-09 17:52:05 +01:00
Laurent Destailleur
a8758fa5b7
Bug war week-end: Fix a duplicate page on holiday, fix missing badge on
...
some documents tabs.
2016-01-09 01:54:46 +01:00
Sergio Sanchis Climent
dfdf58051e
Edited correctly for check values
2016-01-07 09:37:04 +01:00
Laurent Destailleur
2945d2d171
Fix bad condition to show tabs
2016-01-07 00:05:28 +01:00
bobby
7414e4c07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-05 10:30:15 +01:00
Sergio Sanchis Climent
ffd7f4ea30
Fix userlocaltax
...
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
2016-01-05 09:47:14 +01:00
Laurent Destailleur
1ae4bef04b
Fix conflict with the div #dialog used for popup cut and paste of
...
address.
2016-01-02 00:27:14 +01:00
bobby
46532ccb55
FIX/NEW : Accountancy
2015-12-28 11:08:14 +01:00
bobby
eec22169e3
FIX feature
2015-12-28 10:21:38 +01:00
bobby
10ff19eb46
NEW : if nb total of lines provided in print barre_liste, display in
...
title
2015-12-28 10:20:23 +01:00
Laurent Destailleur
a4d5e022cf
Fix pagination on limit failed when limit was forced on url
2015-12-24 12:52:11 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
Laurent Destailleur
536413523a
Fix to show ref of linked object on documents. Fix is not complete but
...
stable.
2015-12-21 12:52:10 +01:00
Laurent Destailleur
d7e9c92144
Fix bad link on category
...
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
cla
cb96618460
Merge branch 'develop' into develop_sunimport
2015-12-18 10:49:57 +01:00
cla
ef487c48a4
NEW
...
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
2015-12-16 16:18:29 +01:00
aspangaro
c1e77daeb1
New: Accountancy add a function to remove all zero at the right of the account.
...
Thanks to Florian
2015-12-15 20:48:06 +01:00
aspangaro
687370071b
A function to remove zero at the end of the account
2015-12-14 21:38:30 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
3680202c1c
Fix do not share color for title of table and title of pages
2015-12-13 14:39:12 +01:00
phf
2f5f6c9ead
NEW hidden conf to use input file multiple from mail form
2015-12-10 13:48:37 +01:00
Florian HENRY
96a95d6ae1
Debug accountancy on 3.9
2015-12-09 12:55:08 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
4a2bda3491
Look enhancement
2015-12-04 23:25:34 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +01:00
Laurent Destailleur
eb795a7a9d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-04 18:39:39 +01:00
Laurent Destailleur
8c03e46a83
Removed a TODO
2015-12-04 18:33:57 +01:00
Laurent Destailleur
6542da404e
Merge pull request #4129 from aspangaro/develop-bank
...
New HRM Add bank tab in user to pay salary or expense report
2015-12-04 18:23:47 +01:00
Laurent Destailleur
bcadc33e31
Debug visibility on task/projects
2015-12-04 15:37:28 +01:00
aspangaro
6598ac6745
Add rights to see tab (hrm->employee->read)
2015-12-04 12:48:36 +01:00
aspangaro
c30728326e
Merge remote-tracking branch 'Upstream/develop' into develop-bank
2015-12-04 12:41:51 +01:00
Laurent Destailleur
e6ebc9c293
More complete tooltip help
2015-12-04 12:24:36 +01:00
Laurent Destailleur
4dd1cb3e77
Theme MD looks ready for 3.9 now.
2015-12-04 12:12:12 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
63879c1ca6
Merge pull request #4122 from mrsof/patch-7
...
FIX: Cannot set property '_renderItem of undefined
2015-12-03 11:52:30 +01:00
aspangaro
882b66c586
HRM - Add bank tab in user to pay salary or expense report
2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
Sof
292d3ba959
FIX: Cannot set property '_renderItem of undefined
...
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:28:36 +01:00
Laurent Destailleur
7b6d8dd23e
Fix for smartphone
2015-11-29 01:13:23 +01:00
Laurent Destailleur
5d5cfd498a
Add holiday date functions into PHPUnit
2015-11-28 19:54:16 +01:00
Laurent Destailleur
fcdb3af708
Merge pull request #4106 from aspangaro/develop-skype
...
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
Laurent Destailleur
5b22eee938
FIX #4099
2015-11-28 16:11:15 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
aspangaro
9a2259c681
Correct button 'Export' and 'Write bookkeeping' on finance journal
2015-11-26 06:19:24 +01:00
Raphaël Doursenaud
973e42d10f
FIX #4097 Public holiday calculation
...
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
2015-11-25 19:34:11 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
Laurent Destailleur
c7447b0899
Add thirdparty of project into project summary of project home page.
...
Total use a different color
2015-11-21 20:25:28 +01:00
Laurent Destailleur
6f7a3f2c66
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-21 20:00:50 +01:00
Laurent Destailleur
e3c6e4ebe5
NEW Add planned workload and declared progress on project summary list
...
on project home page (data aggregated from tasks of project)
2015-11-21 20:00:38 +01:00
philippe grand
55bab28b9c
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 17:15:56 +01:00
Laurent Destailleur
c15c0f6fbb
Minor css fix
2015-11-21 15:31:27 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
philippe grand
928c44b04f
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 04:52:19 +01:00
Laurent Destailleur
60724df496
Merge pull request #4038 from atm-maxime/develop
...
NEW add info page on product card
2015-11-21 01:51:32 +01:00
Laurent Destailleur
552ecbcd95
Merge pull request #3964 from aspangaro/develop-hrm3
...
HRM : Work in progress
2015-11-21 00:14:41 +01:00
Drosis Nikos
ee4eb13fff
Update functions2.lib.php
2015-11-20 19:05:00 +02:00
Maxime Kohlhaas
9c1545bc1b
NEW add info page on product card
2015-11-19 14:45:05 +01:00
philippe grand
4f280f63d0
[Qual] Uniformize code
2015-11-19 13:59:58 +01:00
aspangaro
b7b25c9682
Remove some code
2015-11-17 21:04:11 +01:00
aspangaro
a5ca6cb732
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-17 20:34:37 +01:00
Nikos Drosis
5082b1cc66
Fix for utf-8 characters in the mask mercure
2015-11-17 20:22:27 +02:00
BENKE Charlie
ce367bfa31
bad limittoshow usage
...
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
2015-11-17 14:42:34 +01:00
Laurent Destailleur
6dc6bab556
Support of 'small', 'mini' and '' image size everywhere.
2015-11-17 10:38:00 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
b75923871c
FIX: Too many information were hidden. A lot of users still need bank
...
account on PDF.
2015-11-14 14:56:44 +01:00
Laurent Destailleur
5e67eefff3
Removed phpcs warning
2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
682842f15f
Fix into title of login page, we must report the tru dolibarr version
...
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +01:00
aspangaro
0f75d76296
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b
NEW Framework feature. To have a page being loaded at same scrollbar
...
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
aspangaro
7693b407e8
HRM: Begin to work on employee card
2015-11-12 06:59:40 +01:00
Alexis Algoud
99513ac9f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-09 18:31:21 +01:00
Alexis Algoud
68cbd4699b
NEW multi event type for filter and get form in order to allow bookmark
2015-11-09 17:18:23 +01:00
Marcos García de La Fuente
7ebe032d6f
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
...
Close #3865
2015-11-08 16:01:12 +01:00
Marcos García de La Fuente
4a52d3c1b1
Removed unwanted change
2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
75b4cb4727
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-07 14:37:47 +01:00
Laurent Destailleur
99f5211070
NEW Can use the * as a joker characters into search boxes of lists
2015-11-07 11:48:35 +01:00
Laurent Destailleur
d0e6db7f89
Use the new banner for first tab of products.
2015-11-06 18:57:35 +01:00
Laurent Destailleur
0f358eea49
Fix path definition of thumbs with the new function
2015-11-06 01:56:56 +01:00
Laurent Destailleur
2dc644da30
Debug Direct print module using the OAuth setup.
2015-11-06 01:33:49 +01:00
philippe grand
04238da75d
Typo
2015-11-05 14:16:13 +01:00
Laurent Destailleur
f319976e5d
FIX #3878 Storing and deleting files on emailing was done at wrong place
...
Conflicts:
htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00
Laurent Destailleur
a612289136
FIX Storing and deleting files on emailing was done at wrong place
2015-11-05 03:02:31 +01:00
Laurent Destailleur
11b7d8a44c
Merge pull request #3873 from frederic34/escpos
...
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
Laurent Destailleur
e26940ddf7
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
f3421bcf6d
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a
FIX #3661 Margin is not selected correctly when adding a product
2015-11-05 01:08:30 +01:00
Laurent Destailleur
09f3cd6f1d
Fix class cant be abstract
2015-11-04 16:43:24 +01:00
frederic34
d362d889f6
wip
2015-11-03 20:50:01 +01:00
Laurent Destailleur
b8ffa56497
Fix #3857
2015-11-02 19:49:00 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
Laurent Destailleur
c06c2d0464
FIX #3841 creation of a task completed has not status set to finished by
...
default
2015-11-02 14:21:45 +01:00
Laurent Destailleur
a14fee7296
Merge pull request #3852 from hregis/develop_origin
...
FIX add Mac OS detection and show it into OS information of user popup
2015-11-02 11:26:20 +01:00
Laurent Destailleur
a161e6d47a
Continue debug of PRODUIT_MULTIPRICES option.
...
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
2015-11-02 10:09:09 +01:00
Laurent Destailleur
6fe43cbbeb
Removed dead code
2015-11-02 09:08:08 +01:00
Laurent Destailleur
3409686405
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-02 08:57:01 +01:00
Regis Houssin
0fd7ba478a
Fix: add Mac OS
2015-11-01 17:27:41 +01:00
Laurent Destailleur
6482a4ee04
Minor css fix
2015-10-30 20:04:03 +01:00
Juanjo Menent
c14349f1ea
Merge pull request #3829 from hregis/3.8_bug
...
Fix: add missing hooks
2015-10-29 16:05:35 +01:00
Regis Houssin
6373c82559
Fix: broken features !!!
2015-10-29 13:14:38 +01:00
Regis Houssin
e5b1e214bc
Fix: add missing hooks
2015-10-29 11:50:16 +01:00
fmarcet
62dc6814a3
FIX #3726 Not showing images on product card
2015-10-29 10:14:54 +01:00
Marcos García de La Fuente
eff1f73950
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
# htdocs/product/price.php
2015-10-27 10:41:50 +01:00
Laurent Destailleur
6493438e87
NEW The clicktodial module is now able to provide link "tel:" on phone
...
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
48ed8d4408
FIX The thumb of user into top menu was using the image in full size.
...
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f
NEW Show photo of user into user list. A new function
...
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
2015-10-25 19:31:42 +01:00
Laurent Destailleur
3015a0388a
NEW List of projects of a thirdparty are visible on a project tab
2015-10-24 16:09:26 +02:00
Laurent Destailleur
f6d30d8b9e
Fix: W3C no form into table
2015-10-23 14:40:45 +02:00
Laurent Destailleur
8df59134a9
Merge pull request #3705 from aspangaro/develop-hrm
...
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +02:00
Laurent Destailleur
9f21ea58a3
A lot hooks used into PDF generation were not correctly implemented. We
...
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
2015-10-22 17:51:05 +02:00
Laurent Destailleur
2615e02e1e
Update doc
2015-10-22 13:18:51 +02:00
Laurent Destailleur
9cce56895c
Merge branch 'patch-77' of https://github.com/defrance/dolibarr into
...
defrance-patch-77
Conflicts:
htdocs/core/lib/admin.lib.php
2015-10-22 13:13:02 +02:00
BENKE Charlie
ec9955986f
Update admin.lib.php
2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747
Update admin.lib.php
2015-10-21 05:06:19 +02:00
Laurent Destailleur
b5e633ef42
Size too small
2015-10-20 00:52:53 +02:00
Laurent Destailleur
e70bb28be7
If firstname not define, use lastname
2015-10-20 00:47:35 +02:00
Laurent Destailleur
23d7d60d73
Better compatibility with old versions
2015-10-20 00:22:28 +02:00
Maxime Kohlhaas
158281b14c
Fix : minor typo
2015-10-19 17:13:02 +02:00
Marcos García de La Fuente
e7e152c122
NEW Level multiprice generator based on per cent variations over base price
2015-10-19 15:13:19 +02:00
Laurent Destailleur
bbbd5f5202
Fix removed var_dump
2015-10-19 14:55:01 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
aspangaro
aac88519de
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
...
Conflicts:
htdocs/user/card.php
2015-10-17 07:19:46 +02:00
Laurent Destailleur
df0c6aa5cf
Use the new card banner for members
2015-10-16 16:14:33 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
2015-10-16 09:52:38 +02:00
Laurent Destailleur
8a32041f16
Clean CSS when option MAIN_MAXTABS_IN_CARD is set
2015-10-15 13:31:44 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
00c8b27baf
Add code comment
2015-10-14 22:04:54 +02:00
Laurent Destailleur
6520ed7a08
Use css not bold title.
...
Add missing badge (count of draft records) on draft list.
2015-10-13 14:09:14 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
Laurent Destailleur
918d9b7c18
Fix filter was lost if nothing found
2015-10-13 12:05:24 +02:00
aspangaro
0b54cc4509
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-10-11 21:05:15 +02:00
Laurent Destailleur
618e5f0419
FIX no need to remove file into mail form #3573
2015-10-11 20:47:31 +02:00
Laurent Destailleur
87fad70f4a
Revert "FIX no need to remove file into mail form"
2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08
Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file
...
FIX no need to remove file into mail form
2015-10-11 20:42:42 +02:00
Laurent Destailleur
9a6ac4f457
CSS enhancement
2015-10-11 16:32:46 +02:00
Laurent Destailleur
7fae9450a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-11 15:21:45 +02:00
Laurent Destailleur
bd48ad265d
The new banner tab is also on user card now
2015-10-11 15:21:21 +02:00
Laurent Destailleur
0ba6bdb7c2
CSS enhancement
2015-10-11 13:26:22 +02:00
Marcos García de La Fuente
4e9a378f0d
Merge branch '3.6' into bug-1776
2015-10-11 12:37:41 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
Laurent Destailleur
fb50daaa40
Fix bad parameter
2015-10-10 16:09:01 +02:00
Laurent Destailleur
0222867a94
The new banner for tab is moved into a shared functions
2015-10-10 12:01:09 +02:00
aspangaro
cd7c5645c7
Add library
2015-10-10 06:38:42 +02:00
Laurent Destailleur
f4f7629037
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511
Start to work on a common banner for tabs (goal is to have a nicer and
...
generic part for all element)
2015-10-10 01:51:12 +02:00
Laurent Destailleur
82428fea68
NEW: Only arrow of current sorted field is visible into table views.
...
This save a lot of spaces. You can click on the column title to sort.
This make clickable area larger and click to sort is easier.
2015-10-09 13:01:50 +02:00
Laurent Destailleur
2fc11a289e
When there is no contact, no need to show filters
2015-10-09 00:30:02 +02:00
Laurent Destailleur
0d799402d0
Work on image for "no photo" with better resolution
2015-10-08 23:50:17 +02:00
philippe grand
0e343ae3b2
syntax error
2015-10-08 09:34:02 +02:00
Laurent Destailleur
6ea05aa311
FIX Bad translation key for project "Overview"
2015-10-06 16:03:47 +02:00
Laurent Destailleur
d92604f646
FIX Link of project must be cickable if user has permission to read all
...
projects
FIX Missing information into the alt of project picto
2015-10-06 00:46:26 +02:00
Laurent Destailleur
17416dba89
Merge pull request #3651 from frederic34/patch-20
...
Add badge for number of files in bank's tab
2015-10-04 20:03:41 +02:00
Frédéric FRANCE
780a5a1996
Update files.lib.php
2015-10-04 19:59:26 +02:00
frederic34
7f86797f73
Add contact photo
2015-10-04 17:25:46 +02:00
Juanjo Menent
92f4c0d015
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
2015-10-03 16:01:24 +02:00
Juanjo Menent
5d10fc2c77
Merge pull request #3644 from frederic34/patch-14
...
can't access documents for bank
2015-10-03 15:57:58 +02:00
Juanjo Menent
67d28d6991
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Frédéric FRANCE
7da49a3592
Add badge for number of files in bank's tab
2015-10-03 12:09:42 +02:00
Laurent Destailleur
10b481f47f
Fix colspan
2015-10-03 11:15:12 +02:00
Frédéric FRANCE
d451051d97
can't access documents for bank
2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf
Work on theme
2015-10-02 16:26:08 +02:00
Laurent Destailleur
34adc60d26
Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company
...
FIX error in SQL due to a previous fix
2015-10-01 10:35:07 +02:00
Laurent Destailleur
d4b5256f18
Merge pull request #3611 from atm-alexis/develop
...
FIX there is no way to hide or change qty by hook
2015-10-01 10:27:26 +02:00
Laurent Destailleur
747c49862c
Try to solve a flush pb
2015-09-30 19:15:45 +02:00
Laurent Destailleur
1108656d19
NEW Can set color of the highlight hover line
2015-09-29 15:58:24 +02:00
Alexis ALGOUD
453ed8a05e
FIX error in SQL due to a previous fix
2015-09-28 15:36:27 +02:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
1e2d06bcd1
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-27 16:02:44 +02:00
Laurent Destailleur
ff5f823bef
FIX not responsive part for project page
2015-09-27 16:01:57 +02:00
Alexis Algoud
688d6e37e2
FIX there is no way to hide or change qty to useful information by module
2015-09-26 14:42:26 +02:00
Laurent Destailleur
d119e04963
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-26 14:17:02 +02:00
Laurent Destailleur
c707c899c1
Fix remove warning
2015-09-26 13:22:05 +02:00
Laurent Destailleur
a3647bea4e
Fix bad information in report
2015-09-26 11:53:36 +02:00
Juanjo Menent
4fa1be0e35
Issue #3509 : Init works
2015-09-26 10:37:36 +02:00
Juanjo Menent
ef161e356e
Merge pull request #3590 from GPCsolutions/json
...
[Qual] Replaced deprecated dol_json_*()
2015-09-26 08:42:13 +02:00
Juanjo Menent
dd19029279
Merge pull request #3589 from GPCsolutions/moduletabs
...
[Qual] Warning on deprecated number of values
2015-09-26 08:41:33 +02:00
Juanjo Menent
4f187d3413
Merge pull request #3588 from GPCsolutions/microtime
...
[Qual] Replaced deprecated dol_microtime_float()
2015-09-26 08:40:52 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Juanjo Menent
93c0adf725
Merge pull request #3583 from GPCsolutions/clone
...
[Qual] Replaced deprecated dol_clone by native clone
2015-09-26 08:33:48 +02:00
Juanjo Menent
99a945882d
Merge pull request #3576 from aspangaro/develop-67
...
New : Salaries - Add info card / add field datec / rename field user_creat to user_author
2015-09-26 08:29:13 +02:00
Raphaël Doursenaud
85c34af019
[Qual] Replaced deprecated dol_json_*()
2015-09-24 18:57:05 +02:00
Raphaël Doursenaud
bbaa76fab1
[Qual] Warning on deprecated number of values
...
Module tabs declarations now uses 6 values including permissions.
2015-09-24 18:47:43 +02:00
Raphaël Doursenaud
65340667b6
[Qual] Replaced deprecated dol_microtime_float()
2015-09-24 18:42:35 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
philippe
9e185eec75
FIX: order ref must not be translated
2015-09-24 15:29:17 +02:00
aspangaro
9b97e31a09
Merge remote-tracking branch 'Upstream/develop' into develop-67
2015-09-23 21:09:28 +02:00
Laurent Destailleur
95daf14725
Merge branch 'patch-73' of https://github.com/defrance/dolibarr into
...
defrance-patch-73
Conflicts:
htdocs/core/lib/functions.lib.php
2015-09-23 19:21:59 +02:00
tysauron
f3a28682ea
For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE
2015-09-23 18:26:50 +02:00
Alexis Algoud
2d35124c71
FIX no need to remove file into mail form, the temp dir will be deleted after any sending
2015-09-23 11:11:19 +02:00
aspangaro
918c323f8f
Salaries : Add info card / add field datec / rename field user_creat to user_author
2015-09-23 06:37:14 +02:00
tysauron
f8f50b3071
For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE
2015-09-23 01:24:30 +02:00
tysauron
f1ab0d36c5
Chmod new file not old file
2015-09-23 00:32:30 +02:00
Laurent Destailleur
33f1dfd6f0
Merge pull request #3568 from tysauron/patch-4
...
Chmod new file not old file
2015-09-23 00:31:52 +02:00
tysauron
2d237cadc9
Chmod new file not old file
2015-09-22 22:37:31 +02:00
Laurent Destailleur
72d7671a1e
Enhance CSS
2015-09-22 16:21:46 +02:00
Laurent Destailleur
58a734cb17
Firstname only on login
2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-18 21:50:10 +02:00
Laurent Destailleur
5f507cbbd8
Fix missing closing div making jmobile crazy
2015-09-18 20:23:06 +02:00
Laurent Destailleur
f72f652d98
FIX Pb into pagination scroll widget
...
FIX Style of previous-next card when using dolidroid
2015-09-18 15:51:27 +02:00
Laurent Destailleur
872b59f568
NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to
...
enter pdf footer text with wysiwyg editor.
2015-09-18 12:34:36 +02:00
Laurent Destailleur
a4ab5f5552
Restore manual install of ckeditor. It seems upgrade with phpcomposer
...
make some plugins not working.
2015-09-18 12:10:47 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Marcos García de La Fuente
3818bff86a
Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address
2015-09-16 12:49:05 +02:00
Laurent Destailleur
813667e564
Debug swith of ckeditor theme
2015-09-15 17:45:40 +02:00
Laurent Destailleur
1b836dc31e
Merge pull request #3408 from aspangaro/develop-60
...
New: CkEditor add possibility to choose skin
2015-09-15 17:09:11 +02:00
BENKE Charlie
95cfce925f
fix error on tabcollectors and enhance
...
fix error on tabcollectors feature
add number of tabs present in tab collectors
2015-09-15 03:33:27 +02:00
Laurent Destailleur
a5c6582bc1
Fix duplicate translation/encoding on setEventMessage
...
Conflicts:
htdocs/ftp/index.php
2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1
Fix duplicate translation/encoding on setEventMessage
2015-09-12 12:52:07 +02:00
Laurent Destailleur
1396ed8f03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-09-10 12:12:55 +02:00
aspangaro
3a90bfa6d3
Merge remote-tracking branch 'Upstream/develop' into develop-60
2015-09-10 06:59:23 +02:00
Laurent Destailleur
41803cd868
Merge pull request #3470 from GPCsolutions/develop-3440
...
Fix #3440 Only search for core modules in main path
2015-09-09 20:53:25 +02:00
Laurent Destailleur
3c91b8c890
Force to select "use personalized value" to select a personalized screen
...
option.
2015-09-09 12:39:06 +02:00
Juanjo Menent
5d401f275c
Merge pull request #3486 from GPCsolutions/debug
...
Qual: remove debug output
2015-09-08 19:54:42 +02:00
BENKE Charlie
e2a738bf54
New fonction complete_elementList_with_modules
...
if contactelement is defined on module definition, add module on definition type of contact
2015-09-08 13:11:26 +02:00
Laurent Destailleur
24f7100562
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/memory.lib.php
2015-09-08 10:33:33 +02:00
Laurent Destailleur
82ad81fc03
Fix picto
2015-09-07 20:56:28 +02:00
Laurent Destailleur
9667b6a7c6
Solve conflict of var name
2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc
Fix memcached effect was lost because init was done each time.
2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c
Fix memcached effect was lost because init was done each time.
2015-09-07 20:17:05 +02:00
Raphaël Doursenaud
71b98ffc0e
Qual: remove debug output
2015-09-07 17:15:41 +02:00
Raphaël Doursenaud
0a9f4a41f3
Qual: Removed dead code
2015-09-05 12:37:43 +02:00
Raphaël Doursenaud
97f91d0ef9
Fix #3440 Only search core modules in main path
...
Removed duplicated code and used common dolGetModulesDirs() function
2015-09-05 12:37:43 +02:00
Laurent Destailleur
c03d508bd3
Merge pull request #3467 from guerrierk/develop
...
NEW Adding Document tab into Bank Account
2015-09-05 10:26:51 +02:00
Laurent Destailleur
2a8ebcefcc
Merge pull request #3412 from gschratzer/develop
...
NEW update actions_sendmails.inc.php files.inc.php
2015-09-04 23:38:01 +02:00
GUERRIER Kevin
692fdbaec4
Adding Document tab into Bank Account
2015-09-04 21:29:16 +02:00
Raphaël Doursenaud
1ffb28a460
Fixed mobile detect classname without autoloader
2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
0eb0f52b6d
Install mobiledetect from composer
2015-09-04 19:06:01 +02:00
Laurent Destailleur
dcaef54f9b
Fix can't disable a module that were removed.
2015-09-04 16:47:43 +02:00
Laurent Destailleur
d19ec89bf1
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
0955432de3
Merge branch '3.7' into bug-iban-whitespaces-37
...
# Conflicts:
# ChangeLog
2015-09-03 12:02:23 +02:00
Laurent Destailleur
ce2e5e7862
Little debug of accounting module
2015-09-03 11:54:03 +02:00
Laurent Destailleur
7a78c9d704
Fix doxygen
2015-09-01 14:31:32 +02:00
Marcos García de La Fuente
9ec349f410
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
...
Close #3432
2015-09-01 10:56:55 +02:00
BENKE Charlie
5ee00cf97b
change made
2015-08-31 05:09:21 +02:00
Laurent Destailleur
1e3bc9f822
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
Marcos García
3482031b8a
Removed second odd test
2015-08-29 21:44:05 +02:00
Marcos García
8fd7f0f383
Removed odd test
2015-08-29 21:41:15 +02:00
Laurent Destailleur
c8f12dc5f2
Fix PUT method for already formated strings
2015-08-29 15:12:31 +02:00
philippe grand
6952084be3
it's a mess
2015-08-27 17:23:23 +02:00
philippe grand
db7defb7c3
Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
...
This reverts commit 2527ae263b
2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
2015-08-27 14:28:12 +02:00
Niklas Spanring
53a02e5863
Fix: travis-ci error files.lib.php
...
error line="215" message="There must be no blank lines after the function comment"
error line="217" message="Arguments with default values must be at the end of the argument list"
error line="248" message="The use of function sizeof() is forbidden; use count() instead"
error line="303" message="The use of function sizeof() is forbidden; use count() instead"
error line="447" message="The use of function sizeof() is forbidden; use count() instead"
error line="456" message="The use of function sizeof() is forbidden; use count() instead"
error line="465" message="The use of function sizeof() is forbidden; use count() instead"
error line="474" message="The use of function sizeof() is forbidden; use count() instead"
error line="483" message="The use of function sizeof() is forbidden; use count() instead"
error line="494" message="The use of function sizeof() is forbidden; use count() instead"
error line="510" message="There must be no blank lines after the function comment"
2015-08-26 15:12:17 +02:00
Laurent Destailleur
3fc63eba0d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-26 11:25:05 +02:00
Laurent Destailleur
3db021addf
Fix Use correct boolean type.
...
Complete doxygen
2015-08-26 11:24:31 +02:00
gschratzer
16268e9f0a
New: function calculate_byte
2015-08-25 17:05:08 +02:00
aspangaro
a6701aeb69
New: CkEditor add possibility to choose skin
2015-08-23 15:39:55 +02:00
Laurent Destailleur
1b409538a8
Fix #3400
...
Conflicts:
htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac
Fix #3400
2015-08-20 15:50:00 +02:00
Laurent Destailleur
e24fd6fa37
Merge remote-tracking branch 'origin/develop' into 3.8
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2015-08-20 14:36:32 +02:00
Laurent Destailleur
9a6e13d253
Fix test if empty was inverted
2015-08-19 19:45:24 +02:00
philippe grand
3743c7460d
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because
...
now linked objects return by fetchLinkedObject are associative array
with ID as key.
2015-08-19 16:36:44 +02:00
philippe grand
61f6da0210
the form should be outside table to avoid errors
2015-08-15 16:07:59 +02:00
Laurent Destailleur
52240eec9a
Fix removed warnings
2015-08-15 02:44:05 +02:00
BENKE Charlie
daa68efdd3
Update functions.lib.php
...
better context change
2015-08-14 23:23:44 +02:00
BENKE Charlie
a3db26adfd
Update functions.lib.php
...
change context init method
2015-08-14 19:13:13 +02:00
Laurent Destailleur
5ed3d80103
Merge pull request #3385 from marcosgdf/bug-3321
...
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
2015-08-14 18:10:28 +02:00
Laurent Destailleur
2abb90713e
Fix list of resource not visible
2015-08-14 17:35:05 +02:00
Laurent Destailleur
84d4cbdbcc
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc
Remove dead code
2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284
Fix better translation
2015-08-14 13:04:35 +02:00
Marcos García de La Fuente
b3a7b44046
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
...
Close #3321
2015-08-14 12:29:32 +02:00
Laurent Destailleur
811169b2ae
Fix: do not show desc if empty
2015-08-13 01:26:25 +02:00
Laurent Destailleur
25e729cf4d
Revert "Fix #3322 Use title for alt if no alt is provided"
...
This reverts commit 2cf9d9f583
2015-08-12 23:18:07 +02:00
Juanjo Menent
993037ec9e
Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab
...
NEW : print event type on third party card tab agenda list (only if A…
2015-08-12 18:25:20 +02:00
BENKE Charlie
6801504755
Update functions.lib.php
...
some bugs sorry
2015-08-11 23:51:02 +02:00
BENKE Charlie
049805e926
Update functions.lib.php
...
Div enough on sub-menu case (project/task)
2015-08-10 19:47:12 +02:00
Juanjo Menent
761c50a885
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-08-06 18:22:29 +02:00
BENKE Charlie
187c40aca9
Update functions.lib.php
2015-08-06 18:20:09 +02:00
BENKE Charlie
f5d4cc5f89
Update functions.lib.php
2015-08-06 16:23:34 +02:00
BENKE Charlie
4709a51c84
Add number of collected tabs and hook/trigger
...
Add number of collected tabs
Add trigger based on tabs name
add hook at end of tabs and at the footer of page
2015-08-05 15:19:00 +02:00
Raphaël Doursenaud
2cf9d9f583
Fix #3322 Use title for alt if no alt is provided
...
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
2015-08-03 10:30:10 +02:00
Laurent Destailleur
ff8969073c
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/main.inc.php
2015-07-28 18:57:13 +02:00
Laurent Destailleur
747e4b5e40
Fix timezone problem with external calendar import.
2015-07-28 18:12:45 +02:00
Laurent Destailleur
72e7558356
Fix bad closing td
...
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
2015-07-28 12:49:29 +02:00
Laurent Destailleur
a16d6b037c
Fix: bad link to task
2015-07-28 12:06:57 +02:00
Florian HENRY
517e9094da
FIX : Avoid warning strict mode when hosting server do not have
...
php5_curl installed
2015-07-27 22:34:30 +02:00
Laurent Destailleur
d128cf69d9
Doxygen doc
2015-07-27 17:09:16 +02:00
Laurent Destailleur
814cec880a
Fix filter can be empty
2015-07-21 13:38:24 +02:00
Gauthier
f18c983ba5
NEW : print event type on third party card tab agenda list (only if AGENDA_USE_EVENT_TYPE = 1)
...
Conflicts:
htdocs/core/lib/company.lib.php
2015-07-21 11:06:00 +02:00
Laurent Destailleur
38d30b5590
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2015-07-21 00:17:11 +02:00
Laurent Destailleur
84be353e13
Comments
2015-07-21 00:13:13 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
eec1f4dcdf
Merge pull request #3267 from Dolibarr/3.8
...
fix user role and uk_user_api_key if api module not enabled
2015-07-18 23:51:51 +02:00
aspangaro
d9dd9ff688
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-16 12:25:37 +02:00
Laurent Destailleur
e992a959cd
Fix dbt_select
2015-07-16 10:59:00 +02:00
Laurent Destailleur
670842429c
Merge pull request #3202 from hregis/3.8_minor
...
Fix missing mode
2015-07-16 10:24:37 +02:00
aspangaro
efbaeaab5c
Fix: Show vat_by_thirdparty when module accounting is on
2015-07-15 23:24:28 +02:00
aspangaro
892462e0d6
Fix: Show VAT when module accounting is on
2015-07-15 22:45:45 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
4d6ce2a1de
Fix: Can't view thirdparties that are not customer nor prospect nor
...
supplier.
2015-07-15 12:42:50 +02:00
Regis Houssin
c41c02adc7
Fix missing mode
2015-07-14 15:52:51 +02:00
Laurent Destailleur
85d9d3587e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-13 16:25:43 +02:00
Laurent Destailleur
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Laurent Destailleur
0c9e984bb1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-13 10:29:45 +02:00
Laurent Destailleur
8690b5e70e
FIX #3173 Overlapping of shipment ref
2015-07-12 16:22:06 +02:00
Raphaël Doursenaud
f4cc1f647c
Fix #3183 Make sure FormOther class is included.
2015-07-10 15:20:41 +02:00
Laurent Destailleur
8d77667764
Bad stat report
2015-07-10 10:42:42 +02:00
Laurent Destailleur
688562a816
Fix regression: We can't yet set method __construct of DolibarrModules
...
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
2015-07-10 09:40:18 +02:00
Marcos García de La Fuente
cba902c5ae
Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting the image
...
Close #3055
2015-07-07 09:40:23 +02:00
Laurent Destailleur
8eb4a208ce
Debug statistics of project module
2015-07-05 22:04:30 +02:00
Laurent Destailleur
324d855b9c
Still working on project module to uniformize way of working with other
...
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
bddee5d01f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 04:11:30 +02:00
Laurent Destailleur
19158979ac
Merge pull request #3122 from ywarnier/tva2
...
Updates and additions to VAT reports
2015-07-04 04:05:04 +02:00
Laurent Destailleur
9c80735310
An easier to use dictionary page to edit email template.
...
Uniformize look.
2015-07-04 03:28:52 +02:00
Yannick Warnier
3a8c93522f
Convert " " to \t to match custom coding conventions
2015-06-30 15:53:58 -05:00
Yannick Warnier
c3bb76340f
Improve extended quaterly VAT report
2015-06-30 15:41:00 -05:00
Laurent Destailleur
276f057acf
Clean trigger codes
...
Better error message when we insert duplicate barcode.
2015-06-30 16:10:03 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06
NEW Add opportunity amount on project card.
2015-06-29 16:57:32 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
9c99cae911
FIX XSS security using the onerror and missing escapement on type of
...
member page.
2015-06-28 23:32:38 +02:00
Laurent Destailleur
ce6039f7f6
NEW Replace category edition page on members with new select2 component.
2015-06-27 23:01:05 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
ceb9955efc
Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43
...
Conflicts:
htdocs/contact/list.php
2015-06-27 02:27:34 +02:00
Laurent Destailleur
bae8ed2356
uniformize code
2015-06-27 02:19:46 +02:00
Laurent Destailleur
0fe0c989ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-26 17:36:54 +02:00
Laurent Destailleur
8f691138e8
NEW Can edit Background color for Top menu and Background color for
...
table title line (works only with theme menu eldy).
2015-06-26 16:21:09 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
bdba8f1f38
Fix courrent outstanding amount not visible
2015-06-23 23:33:25 +02:00
Laurent Destailleur
040a643ee9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9
Removed useless tab
2015-06-23 18:11:21 +02:00
Laurent Destailleur
5a8e763099
Uniformize code for hooks
...
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
a27212644e
NEW Can add project search on left menu search area
2015-06-22 11:55:21 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
a3a5b0d9b0
Upgrade jquery and jquery-ui to last stable version
2015-06-21 00:06:37 +02:00
Laurent Destailleur
c2568020a5
Fix IBAN class is uppercase
2015-06-20 17:23:41 +02:00
Laurent Destailleur
32626c5ae6
Fix js refresh with autocomplete
2015-06-20 17:23:28 +02:00
Laurent Destailleur
bfc8ccd761
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-19 11:19:23 +02:00
Laurent Destailleur
20da120a49
Merge tab to upload photo and other files to same tab. This reduce
...
duplicate code and avoid users to be lost.
2015-06-19 11:19:13 +02:00
All-3kcis
c96c528d3e
Correction complete_head
...
Ajout de la fonction complete_head_from_modules() pour supprimer les onglets si besoin.
2015-06-18 15:16:28 +02:00
Laurent Destailleur
7507a71121
Lenght of fields
2015-06-18 14:47:33 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6
Merge pull request #2412 from marcosgdf/commercial-name
...
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
Laurent Destailleur
6263e90ddb
More info on contact popup
2015-06-14 17:38:28 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Laurent Destailleur
14a8a2269b
FIX End log must use same level then start log.
2015-06-14 16:59:35 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Juanjo Menent
5edfef2525
Merge pull request #3006 from hregis/develop_productprice
...
Fix: disable hook calling
2015-06-12 21:38:14 +02:00
Juanjo Menent
9dad0add61
Merge pull request #3014 from GPCsolutions/dolibarr-2987
...
FIX #2987 : removed dead function moneyMeter()
2015-06-12 21:07:15 +02:00
Juanjo Menent
609b1291c7
Merge pull request #3016 from GPCsolutions/dolibarr-2571
...
Added tag/categories management to contact card
2015-06-12 21:04:29 +02:00
Laurent Destailleur
1c280a9219
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/theme/eldy/style.css.php
2015-06-12 16:29:50 +02:00
Marcos García de La Fuente
87a00d6924
FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI
2015-06-12 15:02:05 +02:00
Laurent Destailleur
1a2bde14fb
FIX Better management error into the color conversion functions
2015-06-12 14:37:27 +02:00
Laurent Destailleur
ed0e6753e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-12 13:09:32 +02:00
Laurent Destailleur
3678a12767
NEW Can assign a task to yourself to have it appear on timesheet
2015-06-11 18:27:59 +02:00
Raphaël Doursenaud
6465e58032
Added tag/categories management to contact card
...
Contact part of #2571
2015-06-11 14:50:13 +02:00
Raphaël Doursenaud
36486d6329
FIX #2987 : removed dead function moneyMeter()
2015-06-11 10:57:08 +02:00
Regis Houssin
3fd7c26cf1
Fix: disable hook calling
2015-06-11 07:52:58 +02:00
Regis Houssin
c21156dd13
Fix: strict mode hunter
2015-06-10 18:58:42 +02:00
aspangaro
592d124f26
Merge remote-tracking branch 'Upstream/develop' into develop-28
2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976
NEW: Add a tab document in donation card
2015-06-08 21:28:32 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
35dd069ec9
Fix #2994
2015-06-08 18:17:13 +02:00
Raphaël Doursenaud
143a7d7328
Use rfc6761 example.com domain instead of domain.com in examples
...
Fix #2988
2015-06-08 17:13:23 +02:00
Laurent Destailleur
dd08d5d660
Fix bad parameter for PUT method
2015-06-07 03:39:43 +02:00
Laurent Destailleur
536f565d4e
Fix Return value is always utf8 encoded and without entities.
2015-06-07 02:47:28 +02:00
Laurent Destailleur
c4ccf6f744
Fix: Missing the delete command
2015-06-07 00:06:11 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
7e3a457f85
Merge pull request #2942 from aspangaro/develop-donation
...
Fix: Donation error on admin tab & Fix: Input disabled by default
2015-06-05 15:57:35 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
5e2d9efa07
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:02:50 +02:00
Laurent Destailleur
4c7ccf6145
NEW Can filter on contact status in prospect list. Removed deprecated
...
menu entry.
2015-06-05 10:49:02 +02:00
Laurent Destailleur
14b1fb845f
Remove useless tab of categories
2015-06-05 09:57:41 +02:00
Laurent Destailleur
bbd8a712cf
Merge pull request #2932 from GPCsolutions/dolibarr-2571
...
Added tags/categories management to customers
2015-06-05 09:44:06 +02:00
Laurent Destailleur
5edef2f02f
NEW A module can add its entries into cron module.
2015-06-05 03:32:09 +02:00
Laurent Destailleur
1f92f542a6
NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become
...
officialy visible into setup.
2015-06-04 13:32:21 +02:00
Laurent Destailleur
8010cb7f33
Fix the extracss parameter was overwritten other css into
...
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
2015-06-04 10:42:12 +02:00
Laurent Destailleur
dd8a0b849a
NEW If module salaries is on, you can set a hourly value for tome
...
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
2015-06-03 21:01:50 +02:00
Laurent Destailleur
d109c78c6b
Fix label of project was not visible
2015-06-03 16:59:48 +02:00
aspangaro
d28a56c8ac
Correct travis
2015-06-03 05:49:43 +02:00
aspangaro
ef88a04f93
Fix: Donation error on admin tab
2015-06-02 20:41:02 +02:00
Raphaël Doursenaud
ea798c2315
Qual: deprecate dol_json_encode() and dol_json_decode()
...
PHP > 5.3 supports json_encode() and json_decode() natively
2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
1b681510a5
NEW Use new select2 component for juridical status, country and state
...
selection.
2015-05-31 12:25:33 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
7a0ec2d831
Prototype with datatables works now also ith jmobile.
...
Add field fifo and lifo into product table.
2015-05-30 23:56:42 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
03c06b3cf8
Merge pull request #2916 from aspangaro/develop-patch23
...
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
Raphaël Doursenaud
bbd0b89087
Added tags/categories management to customers
...
Customers part of #2571
2015-05-29 18:50:43 +02:00
Laurent Destailleur
11552e90b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-29 17:15:27 +02:00
Laurent Destailleur
65c7ab7a93
Fix: Introduce error by default when function is used as a true delete
...
function.
2015-05-29 17:11:42 +02:00
Laurent Destailleur
d925ecb4f1
Revert "Made test pessimistic by default"
2015-05-29 17:09:35 +02:00
Laurent Destailleur
eb62c7e462
Merge pull request #1446 from GPCsolutions/removefiles
...
Made test pessimistic by default
2015-05-29 16:56:28 +02:00
aspangaro
0bd07b795f
NEW: Add tab document on salaries payment
2015-05-28 07:33:50 +02:00
Laurent Destailleur
76380c2288
Merge pull request #2898 from defrance69/patch-62
...
Tabs collector better identification
2015-05-25 19:27:39 +02:00
BENKE Charlie
a30d4d4be6
Tabs collector better identification
...
Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect
We need to substract the @ if the tabs is from a module... eg : factory@factory
2015-05-25 18:14:49 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Steve Braun
d1c7c9489e
fixes #2847
2015-05-25 14:56:37 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
390c7d8e65
Fix link to prospect with filter on commercial status
...
Enhance natural_search method to allow to search on several ids.
2015-05-22 15:19:27 +02:00
Alexis Algoud
bc672c2c23
FIX event for restricted user was restricted if company null
2015-05-21 11:49:10 +02:00
aspangaro
de5a15282c
Adherent review
2015-05-20 06:25:43 +02:00
Laurent Destailleur
62e1c55c97
NEW Introduce function dolGetFirstLineOfText
2015-05-19 00:44:05 +02:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45
Prepare to generalize usage of get_exdir
2015-05-18 21:47:44 +02:00
Laurent Destailleur
e230d72cea
Increase default date range to current month instead of current day
2015-05-18 19:41:23 +02:00
Laurent Destailleur
684686e0f6
Fix restore compatibility of new navigation style with jmobile
2015-05-18 08:59:58 +02:00
Laurent Destailleur
d25a2af70c
Fix PHPCS
2015-05-17 23:47:15 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Laurent Destailleur
c33cbefad2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 11:16:29 +02:00
Laurent Destailleur
4931401188
Fix new pagination style was not working correctly.
2015-05-15 04:33:01 +02:00
Laurent Destailleur
7b2230e437
Merge pull request #2774 from aspangaro/develop-pagination
...
NEW Use larger button for navigation
2015-05-15 03:57:29 +02:00
Laurent Destailleur
5937cd7f70
NEW Forms are using the tab look, even in creation mode.
2015-05-13 17:53:25 +02:00
Laurent Destailleur
b327b5fb9d
Save regressions
2015-05-13 09:32:54 +02:00
Laurent Destailleur
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
e149d49fb8
[Qual] Use jQuery property instead of attribute to test and set disabled
2015-05-12 14:53:01 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
Laurent Destailleur
b601a87a2a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-06 23:13:52 +02:00
Laurent Destailleur
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
fmarcet
e191fc41a3
FIX: Bug on order and supplier invoice numeration mask when use supplier
...
code
2015-05-06 21:39:06 +02:00
jfefe
24bf614061
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
aspangaro
d06f1db7d0
Merge remote-tracking branch 'Upstream/develop' into develop-pagination
2015-05-05 21:42:34 +02:00
aspangaro
f092be58c8
New: Add visual pagination for use on tablet
2015-05-05 21:41:08 +02:00
Raphaël Doursenaud
b91d1fa0ca
dol_delete_files(): removed unused variables
2015-05-05 21:15:53 +02:00
Raphaël Doursenaud
7b542731a1
Made test pessimistic by default
...
The test result was wrong if, for example, the path was wrong.
The unlink() function being never called, it returned the default true value even if it didn't
remove a file.
2015-05-05 21:15:53 +02:00
Raphaël Doursenaud
2ff0cebbf7
Added missing translation of categories' "Translation" tab
...
Fix #2769
2015-05-05 11:24:04 +02:00
fmarcet
077a9c6510
FIX: Bug on order and supplier invoice numeration mask when use supplier
...
code
2015-05-04 09:22:55 +02:00
jfefe
53f480708f
Merge branch 'develop' into api_restler
2015-05-03 23:43:13 +02:00
Laurent Destailleur
8a7728f193
Merge pull request #2752 from fappels/develop-tcpdfbarcode
...
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
2015-05-03 21:19:01 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
f0b10c14d7
NEW Add a new component to select categories/tags from the main edit
...
page of product. The dedicated tab is also removed.
2015-05-03 15:51:55 +02:00
jfefe
46ce77c571
Refactor function to use it into API
...
New function checkUserAccessToObject() is a piece of restrictedArea() function.
2015-05-03 14:41:51 +02:00
Francis Appels
ffe7671549
Fix label L7163 X spacing
2015-05-03 10:08:32 +02:00
aspangaro
b0eee2976c
New: ER add badge on tab document
2015-05-01 08:46:37 +02:00
Raphaël Doursenaud
2c44aa6742
Add sensible default mode to directory creation
...
Fix #2632
2015-04-30 16:22:01 +02:00
Laurent Destailleur
f9a428d550
Fixed #2714
2015-04-27 20:25:02 +02:00
Laurent Destailleur
92f2c48475
Fixed #2714
2015-04-27 11:46:08 +02:00
Laurent Destailleur
4235d74aac
Fix tests for ES
2015-04-26 16:45:24 +02:00
Laurent Destailleur
7c706ebaf6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-25 23:15:55 +02:00
Laurent Destailleur
60a56da370
Some change into css. Tabs background are now white so main content is
...
black on white (better contrast).
Fix editfieldval for date.
2015-04-25 22:20:10 +02:00
Laurent Destailleur
5a509940f3
Merge pull request #2706 from GPCsolutions/mobiledetect
...
Mobiledetect
2015-04-24 21:22:56 +02:00
Laurent Destailleur
e0d2c43086
fix phpcs
2015-04-24 01:15:29 +02:00
Raphaël Doursenaud
7281ea21e6
Qual: moved mobiledetect external library
...
External libraries resides in the include directory
2015-04-23 20:30:33 +02:00
Laurent Destailleur
4f3fe82e93
NEW Add filter on task ref and task label into list of tasks
2015-04-23 15:22:50 +02:00
Laurent Destailleur
208ac31bf8
Fix test for es
2015-04-22 17:39:09 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Laurent Destailleur
e476b57795
Merge pull request #2678 from defrance69/patch-60
...
add tab management on salarie payement
2015-04-21 11:15:20 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
BENKE Charlie
5a68cba013
Create salaries.lib.php
...
add lib salaries for menu management
2015-04-19 13:25:43 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
270bca740c
Merge branch 'develop' into units
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2015-04-19 00:59:04 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Maxime Kohlhaas
ee8b5be43b
Typo
2015-04-19 00:46:30 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Juanjo Menent
c5d8fa4602
Fix: solves #2644
2015-04-18 19:14:30 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Maxime Kohlhaas
7aba52c810
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-04-18 10:29:43 +02:00
Laurent Destailleur
deb62f1ffd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/ajax.lib.php
htdocs/expedition/list.php
2015-04-18 04:18:59 +02:00
Maxime Kohlhaas
e6c5b234fc
Remove debug trace
2015-04-18 03:54:33 +02:00
Laurent Destailleur
a034cda6ac
Better test
2015-04-17 22:48:39 +02:00
Laurent Destailleur
b8736b0a6f
Merge pull request #2457 from accett/patch-5
...
Update functionsnumtoword.lib.php
2015-04-17 22:42:19 +02:00
Florian HENRY
32e067c806
Remove debug
2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74
Fix doliforge bug 1707
2015-04-15 18:53:39 +02:00
Laurent Destailleur
bf254baa02
Fix doliforge bug 1707
2015-04-15 18:50:41 +02:00
Laurent Destailleur
8511f1f7ef
Fix the data-role parameter
2015-04-15 18:14:26 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
6889162d7a
Fix: management of vat type 2, 4 and 6 is now ok.
...
Works for canada and ivory cost.
2015-04-11 22:51:53 +02:00
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
Laurent Destailleur
3ee2790737
Always sho project info when opening task card
2015-04-09 16:26:21 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Laurent Destailleur
1bbecc0912
Restore link to stock for products.
2015-04-08 19:26:36 +02:00
Frédéric FRANCE
0dc7bc0ddb
Add badge
2015-04-07 12:54:10 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
Laurent Destailleur
ad50810c7a
Fix deprecated code
2015-04-07 02:48:19 +02:00
Laurent Destailleur
493392d89f
Remove warnings
2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452
Fix warning
2015-04-06 19:31:25 +02:00
Laurent Destailleur
3d161deb17
Fix more robust function
2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0
Status and amount of object should always be visible.
2015-04-06 16:13:23 +02:00
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Laurent Destailleur
2ec5595277
NEW Can install an external module from admin pages, if web server has
...
permission for and if setup is ok for.
2015-04-04 00:19:03 +02:00
Laurent Destailleur
106a393054
NEW Add function dolCopyDir to copy directory with recursive content.
2015-04-03 23:42:56 +02:00
Laurent Destailleur
afecab3f39
Better error management for dol_uncompress
2015-04-03 18:42:07 +02:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
d8bec2fb59
Merge pull request #2507 from frederic34/doc4contact
...
Add document tab for contact
2015-04-02 11:41:35 +02:00
Laurent Destailleur
051f3474c4
Merge pull request #2512 from frederic34/patch-9
...
Add badge
2015-04-02 11:25:06 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
c71efc8f2e
Avoid pb with scrutinizer
2015-03-31 16:59:40 +02:00
Frédéric FRANCE
2a34ec9db1
Add badge
2015-03-31 16:26:32 +02:00
frederic34
fe6227e93f
Typo
2015-03-31 08:45:36 +02:00
frederic34
bab04258e0
Add document tab for contact
2015-03-30 18:15:29 +02:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +02:00
Frédéric FRANCE
bcd7516e25
Fix for donation.lib.php
2015-03-29 18:22:45 +02:00
Laurent Destailleur
73b2e0bd01
Merge pull request #2471 from marcosgdf/refactor
...
refactor
2015-03-29 16:17:36 +02:00
aspangaro
a92f68a5ed
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-29 09:25:06 +02:00
aspangaro
ce6df7c022
Debug
2015-03-29 09:20:32 +02:00
frederic34
be1595a187
Add tab for notes
2015-03-28 17:42:33 +01:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
679391d337
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-25 20:59:48 +01:00
Laurent Destailleur
cc2d86bd58
Status of project was not visible on thirdparty card
2015-03-25 14:31:04 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
Laurent Destailleur
efe9c21b81
Merge pull request #2382 from aspangaro/develop-loan
...
NEW: Module loans
2015-03-23 23:28:57 +01:00
aspangaro
be0ab4c9b4
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-23 06:58:25 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
5c36bb94f2
Work on theme material design
2015-03-22 22:29:52 +01:00
Laurent Destailleur
1a1959b52c
Fix: Solve conflict with imgup and imgdown class use for sort fields and
...
to drag and drop lines.
2015-03-22 21:18:25 +01:00
aspangaro
ad0f1aae6b
Move loan in htdocs
2015-03-22 20:19:22 +01:00
Laurent Destailleur
49824a0e56
Method colorStringToArray can accept the #
...
Method monthArray can return short label of month
2015-03-22 18:17:25 +01:00
aspangaro
414d4c6432
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-22 18:08:12 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
aspangaro
9264482e25
Update works
2015-03-22 08:20:19 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
f44d91e153
NEW: The notification module accept keyword __SUPERVISOR__ to send
...
notification to supervisor of user.
2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa
NEW: Enhancement of module 'Notification by Email'. Show nb of
...
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
b0b88be81f
Sync transifex
2015-03-18 15:27:27 +01:00
Laurent Destailleur
840b047468
Work on new timesheet input pages.
2015-03-18 11:20:08 +01:00
Laurent Destailleur
5d4d8151c1
Work on new timesheet input pages.
2015-03-18 11:04:50 +01:00
Laurent Destailleur
a73ff524e5
Merge pull request #2459 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2015-03-17 00:38:40 +01:00
Scrutinizer Auto-Fixer
b693ed3f51
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
Laurent Destailleur
141fa56d67
Fixed bad parameter
2015-03-17 00:11:04 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
AcceTT Soluciones Computacionales
60d334f646
Update functionsnumtoword.lib.php
...
Now the function convert since -1000000000000 to 1000000000000.
Correct some bugs.
Change $lang-> default to $langs
2015-03-15 17:47:51 -06:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
2e68b51a10
Merge remote-tracking branch 'upstream/develop' into develop
2015-03-15 17:52:07 +01:00
Laurent Destailleur
10bbf463e7
Several bug fixes from scrutinizer
2015-03-14 14:55:41 +01:00
Laurent Destailleur
bc3f9bf800
Fix: the visible version was not enough to know version of dolibarr. We
...
also need the MAIN_FEATURES_LEVEL.
2015-03-13 18:11:31 +01:00
Laurent Destailleur
895b2c6e9c
Fix bad merge
2015-03-13 14:37:27 +01:00
aspangaro
3897e65425
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-11 05:28:59 +01:00
Laurent Destailleur
b564b754fc
Doxygen
2015-03-10 14:09:29 +01:00
Laurent Destailleur
12be50d4ba
Doxygen
2015-03-10 13:50:05 +01:00
Laurent Destailleur
35dfaf4dd1
Natural search on numeric works also with several space after operator
2015-03-10 10:14:24 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Laurent Destailleur
dd3f569ede
NEW: Enhance the natural_search function so we can use it to search
...
numeric fields with criteria with operator <>= inside (< 100, >= 1000)
2015-03-06 20:34:00 +01:00
Scrutinizer Auto-Fixer
27e99793a3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-06 02:10:01 +00:00
Laurent Destailleur
97f36825df
Work on new timesheet page
2015-03-05 21:47:50 +01:00
aspangaro
11704e0807
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-05 20:24:53 +01:00
Laurent Destailleur
d7ab3f112c
NEW: Show difference between timespent by everybody and time spent by
...
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
2015-03-05 13:48:57 +01:00
Laurent Destailleur
e431e24889
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-05 11:14:01 +01:00
Laurent Destailleur
c36f92396b
Add navigation into the new timesheet week page.
...
Fix bad merge
2015-03-05 11:13:44 +01:00
Laurent Destailleur
f0f0e7bfbb
Merge pull request #2415 from aspangaro/develop-patch16
...
NEW: Add bank account owner in invoice/proposal/orders footer
2015-03-04 23:07:46 +01:00
Laurent Destailleur
40adbe5a72
Merge pull request #2420 from aspangaro/develop-patch17
...
NEW: [T1848] Merge bank card & account card
2015-03-04 21:09:28 +01:00
Laurent Destailleur
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
41c55d1913
Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value
2015-03-04 11:55:17 +01:00
Marcos García de La Fuente
0170d409d3
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2015-03-04 10:16:25 +01:00
Laurent Destailleur
52425648bf
NEW: When using transfer or correct stock from warehouse, after
...
recording we go back to the warehouse page.
2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-04 01:14:27 +01:00
Laurent Destailleur
107a16ed75
Work on timesheet module
2015-03-04 00:53:35 +01:00
Laurent Destailleur
fddbca50b1
Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of
...
tracking id into email.
2015-03-03 18:33:53 +01:00
Laurent Destailleur
35733c4c08
More comments
2015-03-03 17:47:17 +01:00
aspangaro
fafebf5b2a
NEW: [T1758] Merge bank card & account card
2015-03-02 22:44:11 +01:00
aspangaro
c119ce382e
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-02 21:05:38 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
2f24622a7c
NEW: Introduce TCPDI as replacement of FPDI.
2015-03-02 01:38:40 +01:00
Marcos García de La Fuente
7876238823
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
...
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
2015-03-02 01:36:27 +01:00
Marcos García de La Fuente
e6c8cac381
Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit
2015-03-02 01:16:35 +01:00
Laurent Destailleur
0774669331
Update comment
2015-03-02 00:37:47 +01:00
Laurent Destailleur
ce8cbee5d2
Merge pull request #2399 from marcosgdf/misc
...
misc
2015-03-02 00:31:27 +01:00
Laurent Destailleur
50d8137618
Merge pull request #2384 from marcosgdf/better-practice
...
Better practice in getBrowserInfo
2015-03-02 00:28:40 +01:00
aspangaro
e24a317f0f
NEW: Add bank account owner in invoice/proposal/orders footer
2015-03-01 21:31:03 +01:00
Laurent Destailleur
a0f8b39250
Prepare code for a perday week timesheet input of time spent.
2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e
Fix: we must use status to find label of status
2015-03-01 16:24:02 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Marcos García de La Fuente
c925b09946
CodeSniffer fix
2015-02-28 19:26:41 +01:00
Laurent Destailleur
51fff77355
Fix: time 0 must be different than time unknown.
2015-02-28 19:02:03 +01:00
Marcos García de La Fuente
60e2524fc2
Merge remote-tracking branch 'upstream/develop' into better-practice
...
Conflicts:
htdocs/core/lib/functions.lib.php
test/phpunit/FunctionsLibTest.php
2015-02-28 14:39:14 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
a87c867c28
Translation
2015-02-26 16:02:03 +01:00
Marcos García de La Fuente
f117b65a17
Removed silent operator for PHP 4 in function dol_html_entity_decode
2015-02-25 23:01:07 +01:00
Marcos García de La Fuente
f2fededd2c
Drop usage of deprecated dol_htmlentities function
2015-02-25 22:48:45 +01:00
Marcos García de La Fuente
fb959abc63
Misc PHPdoc fixes
2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179
Undefined variable + Unreachable statement
2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075
Marked getStaticMember as deprecated
2015-02-25 18:03:31 +01:00
Marcos García de La Fuente
40a5c15616
Improved getBrowserInfo documentation
2015-02-25 16:45:14 +01:00
Marcos García de La Fuente
f598963d6b
Fixed regression
2015-02-25 16:41:51 +01:00
aspangaro
4803a1fb89
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-25 06:59:27 +01:00
Laurent Destailleur
72da9b52af
Merge pull request #2380 from marcosgdf/bug-1825
...
Better fix for bug 1825
2015-02-24 17:07:17 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
Marcos García de La Fuente
7e07638fba
Little refactor
2015-02-23 10:51:43 +01:00
Marcos García de La Fuente
71b98ee82b
Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.
2015-02-23 10:42:10 +01:00
Marcos García de La Fuente
702c19dab3
Refactored function getBrowserInfo
2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb
Better practice in getBrowserInfo
2015-02-22 12:35:51 +01:00
Laurent Destailleur
6d1324b463
Work on expense report module
2015-02-21 16:15:54 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Laurent Destailleur
938936b8f2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/core/lib/functions.lib.php
2015-02-20 22:51:47 +01:00
Laurent Destailleur
e1e31de229
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-02-20 20:15:04 +01:00
Marcos García de La Fuente
3a917a0d1f
Merge branch '3.6' into bug-1825
2015-02-20 10:19:08 +01:00
Marcos García de La Fuente
fd18aa8717
Better fix for Bug #1825
2015-02-20 10:17:02 +01:00
Laurent Destailleur
639aaebacb
Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1825
Conflicts:
ChangeLog
2015-02-19 09:47:22 +01:00
Laurent Destailleur
ec56667f5e
Fix: [ bug #1849 ] Broken flag image when a contact does not have a
...
country set
2015-02-19 09:44:22 +01:00
Laurent Destailleur
94751ba57b
Merge pull request #2361 from aspangaro/3.7-patch3
...
[T1728] Deactivate RIB suggest in proposals/invoices/orders
2015-02-19 09:41:39 +01:00
Laurent Destailleur
d1a4b6c2c5
phpcs
2015-02-19 00:04:35 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
frederic34
4bbbff8d69
Add BIC/SWIFT Validation
2015-02-17 22:04:16 +01:00
frederic34
07197f3ca0
Add libs
2015-02-17 11:41:50 +01:00
frederic34
9d0ffb7e85
Add php-iban and check IBAN
2015-02-17 10:23:31 +01:00
Laurent Destailleur
1e78d0e8d4
New: Introduce hidden option
...
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
2015-02-16 20:46:54 +01:00
Laurent Destailleur
213c818204
Debug serial/lot management
2015-02-16 20:14:16 +01:00
Marcos García de La Fuente
3efb737cbf
Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"
2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016
Fix: [ bug #1846 ] Browser IE11 not detected
2015-02-16 12:26:20 +01:00
Marcos García de La Fuente
0a81fe667f
Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
2015-02-16 10:44:10 +01:00
aspangaro
05dc308e91
[T1728] Deactivate RIB suggest in proposals/invoices/orders
2015-02-16 06:47:37 +01:00
Laurent Destailleur
2e0b2fb012
Work on expensereport module
2015-02-15 22:49:23 +01:00
Laurent Destailleur
448655ea45
First work on a new module for expense report matching dolibarr
...
standard to replace current one.
2015-02-14 18:39:45 +01:00
Laurent Destailleur
d5ec19ef83
Enhance help when running cron script from command line
2015-02-11 13:21:12 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
e485dd413d
PHPDoc and misc fixes for several folders
2015-02-10 13:41:59 +01:00
Marcos García de La Fuente
530186c59d
PHPDoc and misc fixes for several folders
2015-02-10 13:32:00 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
0d150b1d32
Removed unused code, misc corrections and corrected PHPDoc problems.
2015-02-10 10:25:59 +01:00
Marcos García de La Fuente
58a61e1294
Changed int typecast to float
2015-02-10 00:23:32 +01:00
Marcos García de La Fuente
949f9e40a0
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
2015-02-10 00:20:47 +01:00
phf
65a3c75b04
[CORE] ajout des conditions dans la librairie pour le module (#new_ask_price).
2015-02-09 11:57:30 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Laurent Destailleur
e8b2b22c32
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1827
Conflicts:
ChangeLog
2015-02-07 23:56:38 +01:00
Laurent Destailleur
3bdf8864a9
New: Add option MAXTABS_IN_CARD to limit number of visible tabs.
2015-02-07 04:24:31 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
ba5d355eb3
Fix bad property
2015-02-07 02:14:45 +01:00
Laurent Destailleur
553181a5d9
Fixed: Location for file storage from tab attached files was not at same
...
place than from tab images.
2015-02-06 21:26:41 +01:00
Marcos García de La Fuente
b8b9df7b95
Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
2015-02-06 12:36:09 +01:00
Laurent Destailleur
01541e4152
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe
Fix pb into date management.
...
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Laurent Destailleur
21c78cc392
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-02 21:45:31 +01:00
Raphaël Doursenaud
fb865e8184
FIXED Removed deprecated forcing SSLv3 for CURL
...
Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol.
This prevented most API calls from working.
2015-02-02 17:13:11 +01:00
phf
38551dd468
[CORE] retrait de liens ou champs inutile (#new_ask_price).
2015-02-02 16:17:07 +01:00
Laurent Destailleur
7fbf76ee2a
Fix phpcs
2015-02-02 15:43:22 +01:00
Laurent Destailleur
7809013b96
Message is more clear.
2015-02-02 13:33:16 +01:00
Laurent Destailleur
3f042fb558
New: Introduce option PROJECT_HIDE_TASKS for people using project only
...
as transversal analytic key and not to manage tasks.
2015-02-02 13:27:55 +01:00
Laurent Destailleur
ece70dbd2c
Merge pull request #2293 from frederic34/patch-4
...
Error message is ErrorCounterMustHaveMoreThan3Digits
2015-01-31 19:44:09 +01:00
Laurent Destailleur
c19ff003ea
Merge pull request #2292 from FHenry/develop_contract_line_extrafileds
...
NEW: contract lines extrafileds
2015-01-31 19:43:37 +01:00
Laurent Destailleur
6976aec04b
Merge pull request #2289 from accett/patch-2
...
Currency symbol in Mexico
2015-01-31 19:40:57 +01:00
Laurent Destailleur
963b9e8583
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 19:37:25 +01:00
Laurent Destailleur
9188be57ce
Select2 component creates problem of sizing with jmobile.
2015-01-31 19:25:26 +01:00
Laurent Destailleur
2788a352cf
Missing lang loading
2015-01-31 19:00:00 +01:00
Laurent Destailleur
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
Laurent Destailleur
1e72d49858
Merge pull request #2286 from accett/patch-1
...
New: Introduce num to text function and use sign before amout for mexico currency
2015-01-31 15:55:16 +01:00
Laurent Destailleur
ce8ad39a8e
Remove test code and restore prod code.
2015-01-31 13:00:51 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
291340a39f
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 16:34:18 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
phf
2f8ceea587
[CORE] renomage de variables pour le module + modification de traductions (#new_ask_price).
2015-01-29 12:12:22 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
phf
a98ce01807
[CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price).
2015-01-28 17:27:26 +01:00
phf
903f739449
[CORE] avancement du mercredi matin (#new_ask_price).
2015-01-28 10:33:15 +01:00
Frédéric FRANCE
a560b582f5
Update functions2.lib.php
2015-01-28 00:02:57 +01:00
phf
aaacca9b13
[CORE] première partie des grosses modifications (#new_ask_price).
2015-01-27 16:53:27 +01:00
Florian HENRY
a510a1ef5c
First step add contract lines extrafields
2015-01-27 12:53:02 +01:00
AcceTT Soluciones Computacionales
608b099934
Currency symbol in Mexico
...
I tried to change the order of the currency symbol in Mexico is before.
2015-01-26 21:38:43 -06:00
accett
62ae75b3bf
Update for Mexico Users
...
Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.
2015-01-26 14:38:02 -06:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
0647c49067
Merge pull request #2274 from aschio/develop
...
New: Added Extrafields for Supplier invoice lines and Supplier order lines
2015-01-25 19:21:03 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
a4990a58b1
The badge was missing for shipment
2015-01-23 18:39:40 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
Laurent Destailleur
0f7238937a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/fiche.php
2015-01-22 18:55:26 +01:00
cla
6dfd5b1fac
Added extrafields features for Supplier Invoice Line and Supplier Order Line
2015-01-22 14:15:34 +01:00
Laurent Destailleur
31be2563c2
Fixed: Allow external module a chance to fix regression.
2015-01-22 12:29:55 +01:00
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0
add left joins on llx_c_actiocomm
2015-01-20 17:26:32 +01:00
Laurent Destailleur
f96fdc7d0a
Regression solved
2015-01-18 21:04:39 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
1664b89cef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 19:26:19 +01:00
Laurent Destailleur
9876b30387
Need more info to find bugs
2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527
Merge branch 'develop_bank_extrafields' of
...
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields
Conflicts:
htdocs/admin/bank.php
2015-01-17 14:42:04 +01:00
Laurent Destailleur
6a081fe883
Merge pull request #2229 from frederic34/getnextvalue
...
Translation error messages numbering modules
2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
ba49cce47a
Fix: The filter into event views on user must be done on assigned
...
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a
Fixed: Avoid space into address string
2015-01-14 19:17:58 +01:00
Laurent Destailleur
a2c9d5bd4a
Fixed balance of td introduced by MAX_TAB option.
2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4
Fixed: Avoid spaces into address string
2015-01-14 18:54:56 +01:00
Laurent Destailleur
a886136e67
More comment and add a unit test to check that {t} tag is correctly
...
supported.
2015-01-13 22:13:15 +01:00
Laurent Destailleur
13132ef2ed
Better organisation of entries into security setup area
2015-01-12 13:20:27 +01:00
frederic34
173d3aaa90
Translation error messages numbering modules
2015-01-11 11:31:53 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
fentman
9049931ff0
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-09 22:55:17 +01:00
fentman
742ec954cd
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-08 11:21:25 +11:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
aspangaro
b4b5b35afa
Skype :: Better presentation
2015-01-04 20:17:49 +01:00
Laurent Destailleur
be34fcfa8a
Removed duplicate link making same thing
2014-12-30 21:33:56 +01:00
Laurent Destailleur
baa247ea86
Fixed: doxygen
2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02
Enhance look for contacts forms of thirdparties.
2014-12-30 21:04:02 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Maxime Kohlhaas
e7ebb78ffd
in PDF, no line jump after doc linked ref. Fix bug 1605.
2014-12-26 11:09:46 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
Marcos García de La Fuente
7b6a4d1bfd
Fix: [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-25 22:50:15 +01:00
Juanjo Menent
65eef3587a
Merge pull request #2166 from defrance69/patch-36
...
Update functions.lib.php
2014-12-24 15:38:48 +01:00
Marcos García de La Fuente
294753dc47
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some
...
masks
Conflicts:
htdocs/core/lib/functions2.lib.php
2014-12-24 14:32:25 +01:00
Marcos García de La Fuente
b68276637b
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some
...
masks
Conflicts:
htdocs/core/lib/functions2.lib.php
2014-12-24 14:31:17 +01:00
Marcos García de La Fuente
46fe2c67e0
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
2014-12-22 22:32:05 +01:00
BENKE Charles
b45bd06475
Update functions.lib.php
...
Add feature to limit the number of tabs in a card (based on google menu practice)
function actived with MAXTABS_IN_CARD dictionnary
watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008
or here.
All the code is in one function, need to explode/refactoring it on diferent css
2014-12-22 12:26:04 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
1dc2bbb0f1
Fixed: Var no declared
2014-12-22 03:01:31 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
74d5e11831
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-20 15:42:30 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
cea500ef80
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
2014-12-20 13:06:08 +01:00
Laurent Destailleur
c9f3267649
Fixed: bad conditions
2014-12-20 11:34:37 +01:00
Laurent Destailleur
854ed90a62
Fixed: bad place for the ajaxcombo.
2014-12-20 11:15:10 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
d9aba405dd
Fix: utf must be default value.
2014-12-18 10:09:47 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
67cf3cb99b
Fixed: BIC/SWIFT and IBAN must be at same level
2014-12-11 10:13:44 +01:00
Frédéric FRANCE
66f634f217
Update functions.lib.php
2014-12-09 20:47:54 +01:00
Frédéric FRANCE
590618eb38
Update functions.lib.php
2014-12-09 20:17:13 +01:00
Laurent Destailleur
a8052d8ea4
Fixed: Several fix in color management (function at wrong place, mark
...
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:12:27 +01:00
Laurent Destailleur
0ea7d51b22
Fixed: Several fix in color management (function at wrong place, mark
...
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:05:22 +01:00
Laurent Destailleur
c3734b1a88
Merge pull request #2103 from grandoc/develop
...
add default payment mode select
2014-12-08 00:03:05 +01:00
Laurent Destailleur
3186a8c23f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 12:07:53 +01:00
Laurent Destailleur
c731321024
New: Function yn can show a visual checkbox
2014-12-07 01:57:23 +01:00
Juanjo Menent
fe23a851e7
Fix: datepicker first day of week can be monday by setting into
...
display setup
2014-12-06 11:03:48 +01:00
Juanjo Menent
430b2ff8db
Fix: datepicker first day of week can be monday by setting into
...
display setup
2014-12-06 11:00:49 +01:00
Laurent Destailleur
a5bdf952ee
Fix: PHPCS
2014-12-05 17:44:47 +01:00
Laurent Destailleur
ceba894d57
Start to work on new generation combo box.
2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
Laurent Destailleur
76bd7dd512
Fixed: A lot of fixed on project views (info on project area). Also add
...
a limit to avoid problem with very large database.
2014-12-04 11:03:48 +01:00
Laurent Destailleur
f884f16564
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/boxes.php
htdocs/comm/action/card.php
htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Philippe GRAND
cef835cd2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2014-12-01 11:27:46 +01:00
Laurent Destailleur
f3584fa211
Fixed: Button at wrong place
...
Fixed: Must use style css span badge for number of files
2014-12-01 00:53:15 +01:00
Laurent Destailleur
01209ff844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Laurent Destailleur
d3b32ce22f
Fixed: Bad function/picto for information messages (not a star)
2014-11-28 19:49:42 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Laurent Destailleur
38062177d3
Doxygen
2014-11-28 00:37:46 +01:00
Philippe GRAND
217cacbc29
To avoid over wrighting lines
2014-11-27 17:26:06 +01:00
Frédéric FRANCE
2ee55a39fd
Update ecm.lib.php
2014-11-26 18:35:16 +01:00
Francis Appels
18406fc550
Fix: Show sender Country on PDF docs
...
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
e3a8041b0d
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
aspangaro
c256243bf7
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-16 08:41:39 +01:00
Laurent Destailleur
539a201d3e
Fix: doxygen
2014-11-15 18:30:37 +01:00
Laurent Destailleur
741adc79b2
Fix: Bugs reported by scrutinizer
2014-11-15 17:05:43 +01:00
Laurent Destailleur
ad661256c0
Fix: Bugs reported by scrutinizer
2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
6bac744709
Fix: Missing event management into select when combo not selected
2014-11-13 16:46:40 +01:00
Florian HENRY
c0a3606a59
Fix problem on task creation with chrome for french browser.
2014-11-12 22:53:23 +01:00
Laurent Destailleur
d164b2d0e1
Fix: Showing capital
2014-11-12 10:37:39 +01:00
Florian HENRY
e9f754395d
Start bank extrafields
2014-11-10 13:09:58 +01:00
aspangaro
9c3fa5a9eb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-09 07:26:14 +01:00
Laurent Destailleur
0b70d26275
Keep commented code to keep a chance for old php version to work.
2014-11-07 22:06:51 +01:00
aspangaro
840dfd780d
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-07 21:28:39 +01:00
Laurent Destailleur
60ca5aa026
Debug of module withdraw.
2014-11-05 17:32:42 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
31c38cedbc
Fix: checkstyle
2014-11-05 16:26:11 +01:00
aspangaro
cbfa90abca
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 20:57:05 +01:00
Laurent Destailleur
5c2862dae3
Merge pull request #1976 from frederic34/patch-2
...
Add a little delay in ajax_autocompleter
2014-11-04 17:41:23 +01:00
Laurent Destailleur
420de76b4b
Merge pull request #1993 from aspangaro/3.6-patch
...
GPLv3
2014-11-04 17:40:38 +01:00
aspangaro
25433120e6
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 06:16:03 +01:00
aspangaro
f3d7da8feb
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-03 20:25:36 +01:00
Laurent Destailleur
a4a01de8a1
Fix: Missing label
2014-11-03 18:00:11 +01:00
aspangaro
29c6797835
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-03 06:15:45 +01:00
Laurent Destailleur
ddf737daed
Removed deprecated page and option.
2014-11-03 01:07:07 +01:00
aspangaro
a1980a1917
Correct travis error - Not me !
2014-11-02 22:04:01 +01:00
Laurent Destailleur
627f5694f0
Fix: Infinite loop
2014-11-02 21:19:00 +01:00
Laurent Destailleur
84653f70be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-11-02 21:16:56 +01:00
Laurent Destailleur
5a18904bb4
Fix: Infinite loop
2014-11-02 21:16:31 +01:00
Laurent Destailleur
b74bdb8f7d
Fix: Bad error message
2014-11-02 11:39:30 +01:00
Laurent Destailleur
167ec6917a
Can add prefix into generated filename. This will save time for script
...
to build kit of files for book keeper.
2014-11-01 20:15:51 +01:00
aspangaro
57f49ec5d4
GPLv3
2014-10-30 20:41:08 +01:00
Frédéric FRANCE
08e958152c
Update ajax.lib.php
2014-10-30 18:45:47 +01:00
Laurent Destailleur
4226c27ccf
Merge pull request #1965 from frederic34/patch-4
...
On/Off for Object (do not restrict to product)
2014-10-30 18:21:50 +01:00
Laurent Destailleur
a0c9af2385
New: Can filter on date into tab "Referring object" of a project.
2014-10-29 20:21:24 +01:00
Laurent Destailleur
132ddf65d6
Fix: several bugs into document generation (default must be used in
...
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
2014-10-27 19:37:30 +01:00
Laurent Destailleur
6f77dc83c4
Qual: Uniformize code and fix a ton of bugs.
2014-10-27 03:24:45 +01:00
Laurent Destailleur
9619c0cdea
Fix: [ bug #1581 ] SQL injection possbile
2014-10-27 00:58:56 +01:00
Laurent Destailleur
0fc1c85b34
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 00:42:52 +02:00
Frédéric FRANCE
b2a9b48a78
Update ajax.lib.php
...
Add a delay before making request, may avoid multiple request to server when typing search request
2014-10-24 10:40:48 +02:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b
Fix: Better layout detection
2014-10-19 12:24:36 +02:00
Frédéric FRANCE
a1bedcc263
Update ajax.lib.php
2014-10-18 22:46:13 +02:00
Frédéric FRANCE
eefb211be7
Update ajax.lib.php
2014-10-18 18:48:13 +02:00
Frédéric FRANCE
8bb0ce0f7f
Update ajax.lib.php
2014-10-18 17:17:41 +02:00
Frédéric FRANCE
dd5ea670e2
Update ajax.lib.php
2014-10-18 17:11:02 +02:00
Frédéric FRANCE
2107a61bbe
Update ajax.lib.php
...
For use in a list of object
2014-10-18 16:32:32 +02:00
Laurent Destailleur
13590a876b
Fix: A little clean of dol_hash usage.
2014-10-18 16:08:15 +02:00
Frédéric FRANCE
96aee6eed4
Update ajax.lib.php
2014-10-18 15:48:59 +02:00
Laurent Destailleur
97f98d7e16
Merge pull request #1955 from frederic34/patch-2
...
Ajax On/Off for product tosell and tobuy
2014-10-18 14:18:14 +02:00
Laurent Destailleur
fb76fc94b5
Merge pull request #1963 from defrance69/patch-24
...
Update functions2.lib.php
2014-10-18 14:11:25 +02:00
Laurent Destailleur
58b15fa736
Fix: Solve some regressions
2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b
Fix: Restore comaptibility with all languages.
...
Fix: Corrupting data function.
2014-10-18 00:41:21 +02:00
BENKE Charles
8095bbf809
Update functions2.lib.php
2014-10-17 17:10:12 +02:00
Laurent Destailleur
e2afa48caa
Fix: avoid warning
2014-10-17 16:23:32 +02:00
Laurent Destailleur
4b34455f0a
Fix permissions
2014-10-17 15:01:56 +02:00
BENKE Charles
589a3fdf95
Update functions2.lib.php
2014-10-17 10:26:34 +02:00
BENKE Charles
5bd665f10d
Update functions2.lib.php
...
disable entity filter fields for module who not use multicompany fields
2014-10-17 09:53:17 +02:00
Laurent Destailleur
e2524fbf77
Fxi: Filter on list view was not correct.
2014-10-16 21:34:35 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Laurent Destailleur
a94f7dc3ad
Revert "Add function dolEscapeXML"
...
This reverts commit 756b1d31ad
2014-10-16 01:21:33 +02:00
Laurent Destailleur
b90011aeb1
Add function dolEscapeXML
2014-10-16 01:21:10 +02:00
Laurent Destailleur
756b1d31ad
Add function dolEscapeXML
2014-10-16 01:01:30 +02:00
Laurent Destailleur
2cf21f856c
Fix: table name differs.
2014-10-14 01:47:31 +02:00
Frédéric FRANCE
f5f50045d6
Update ajax.lib.php
2014-10-12 16:09:42 +02:00
Frédéric FRANCE
f25c4f18e6
Update ajax.lib.php
2014-10-12 15:55:18 +02:00
Laurent Destailleur
5c07df812d
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-10-12 15:24:33 +02:00
Laurent Destailleur
cbbe909bc5
Fix: Pb in management of "or" ("|") for permission check.
2014-10-12 15:22:07 +02:00
Frédéric FRANCE
e6e953b4d8
Update ajax.lib.php
2014-10-12 14:20:49 +02:00
Laurent Destailleur
65f47f7d10
New: Add number of active notification into tab title (like we do for
...
notes and documents)
2014-10-12 12:22:45 +02:00
Laurent Destailleur
f08759a17e
Fix: area to generate doc must use half size not onethird.
...
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
2014-10-12 11:59:52 +02:00
Laurent Destailleur
c5d8012eb1
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/lib/date.lib.php
2014-10-12 02:13:38 +02:00
Laurent Destailleur
2b479aa0b4
Qual: Uniformize translated label of progress on all pages.
...
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
2014-10-12 01:04:34 +02:00
Laurent Destailleur
6c3c1d3a0a
Merge pull request #1930 from GPCsolutions/reportprogress
...
Allow reporting progress along with timespent
2014-10-12 00:10:28 +02:00
Laurent Destailleur
e9881997ed
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-11 23:50:27 +02:00
Laurent Destailleur
52e1bd2ad1
Merge
2014-10-11 23:46:49 +02:00
Laurent Destailleur
77ed7bf5df
Merge branch 'develop-HiddenMailPasswordForgotten' of
...
github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten
Conflicts:
htdocs/core/lib/functions.lib.php
2014-10-11 23:44:50 +02:00
jfefe
eb06c8a33e
Allow to make PUT request with getURLContent() function
2014-10-11 04:25:32 +02:00
Andrelec1
269b960d9a
Add support tld with dots
2014-10-10 15:18:24 +02:00
Andrelec1
f4f1f45d5a
copyright and annotation
2014-10-10 15:01:10 +02:00
Andrelec1
7978b4503d
Add function hideMail and use
2014-10-10 14:57:07 +02:00
Laurent Destailleur
06cc08026b
Some fix on per user view.
2014-10-09 17:05:57 +02:00
Laurent Destailleur
de5005ca54
Fix: Avoid duplicate error message
...
Fix: pgsql syntax error
2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee
More comment to explain and remove a todo.
2014-10-08 15:24:35 +02:00
Regis Houssin
cc553514af
Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have
...
the same name as the module
2014-10-08 14:51:16 +02:00
Laurent Destailleur
60f643cf1a
Change comented log to help debug
2014-10-05 20:26:35 +02:00
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +02:00
Laurent Destailleur
742d0e37ee
Fix: Bad month return by function
2014-10-05 12:54:51 +02:00
Laurent Destailleur
5c5f725a34
Fix scrutinizer
2014-10-05 01:22:17 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
c1db82a791
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-04 08:10:12 +02:00
Laurent Destailleur
166853dd56
Fix: miscellaneous bugs
2014-10-03 12:15:21 +02:00
Raphaël Doursenaud
769d824e7b
Allow reporting progress along with timespent
2014-10-01 14:12:47 +02:00
aspangaro
f70e8b766f
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-09-29 20:40:53 +02:00
Laurent Destailleur
ec2a8b5551
Merge pull request #1800 from Devensys/Develop-HighlitingIBAN
...
Highliting IBAN (sepa)
2014-09-29 16:43:22 +02:00
Laurent Destailleur
e35135d5b1
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
...
develop
Conflicts:
htdocs/compta/ventilation/card.php
htdocs/compta/ventilation/fournisseur/card.php
htdocs/compta/ventilation/fournisseur/list.php
htdocs/compta/ventilation/list.php
htdocs/core/menus/init_menu_auguria.sql
2014-09-29 16:31:35 +02:00
Laurent Destailleur
06494b085a
Perf enhancement
2014-09-28 16:38:45 +02:00
Laurent Destailleur
cd4c81d15d
Uniformize code.
2014-09-28 16:31:37 +02:00
Laurent Destailleur
2b95bd2fcc
Fix: Link to linked object was not working for invoice and order.
...
Fix: end date
2014-09-28 16:12:38 +02:00
aspangaro
250b57ca0a
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-28 14:00:26 +02:00
Laurent Destailleur
4244979f4f
Fix: doxygen
...
Fix: td balance
2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
a58025c601
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-23 21:24:29 +02:00
Laurent Destailleur
7224f64224
Work on multi user for events.
...
Fix: Modules must be reloaded after migration.
2014-09-23 16:15:15 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
e1fec958ef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/group/fiche.php
2014-09-22 23:43:22 +02:00
Alexis Algoud
de0d53a2bb
ADD extrafields on usergroup
2014-09-22 16:31:58 +02:00
