Laurent Destailleur
39fdd1b37d
Use correct link to changelog
2017-11-30 11:16:28 +01:00
Maxime Kohlhaas
879a0812d7
Fix filters on contact list must always appear
2017-11-29 20:04:15 +01:00
Laurent Destailleur
acd2d0121d
Merge pull request #7886 from ptibogxiv/patch-8
...
Fix for multicompany
2017-11-29 15:31:21 +01:00
Laurent Destailleur
9fa6bfd1a5
Fix edit external user or not
2017-11-29 15:30:41 +01:00
ptibogxiv
c194538609
Update fraise.modules.php
2017-11-29 10:45:16 +01:00
ptibogxiv
883c9dbf99
Fix for multicompany
...
last fix for multicompany compliance
2017-11-29 09:28:03 +01:00
Laurent Destailleur
3b98a06ebb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/mailings/fraise.modules.php
2017-11-28 12:18:01 +01:00
Laurent Destailleur
07bdd3213a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-28 12:16:13 +01:00
Laurent Destailleur
430c72bf0f
Merge pull request #7879 from ptibogxiv/patch-7
...
fix for multicompany in mailing
2017-11-28 12:16:00 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
Laurent Destailleur
f8d6897888
Fix bug
2017-11-28 12:08:04 +01:00
Laurent Destailleur
b14cb7a97f
Debug accountancy
2017-11-28 11:49:11 +01:00
Laurent Destailleur
a15a57317b
Debug accountancy module
2017-11-28 11:12:13 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
ptibogxiv
10b0eafba7
Update fraise.modules.php
2017-11-27 18:12:52 +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
ptibogxiv
ea9071512d
Update fraise.modules.php
2017-11-27 17:08:15 +01:00
ptibogxiv
0a5a50263d
fix for multicompany
2017-11-27 16:07:40 +01:00
Laurent Destailleur
57d4f28cba
Enhance usability of accounting module
2017-11-27 15:51:28 +01:00
ptibogxiv
a9e4fcfdca
Update fraise.modules.php
2017-11-27 15:49:28 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
ptibogxiv
780e8ce470
fix for multicompany
2017-11-27 15:13:14 +01:00
Laurent Destailleur
b55d085f2d
Merge pull request #7872 from atm-alexis/fix_include_for_ajax_select_product_supplier_order
...
fix include for ajax select product supplier order
2017-11-27 14:55:11 +01:00
Laurent Destailleur
807bfbb696
Merge pull request #7867 from frederic34/bank
...
info bank
2017-11-27 14:50:00 +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
f9e99e93c3
Fux utf8 trouble on direct printing message
2017-11-27 14:34:29 +01:00
Laurent Destailleur
69725fe62f
Fix setup of direct print with google docs driver
2017-11-27 13:55:27 +01:00
Laurent Destailleur
43c60ec224
Fix error management at wrong place
2017-11-27 13:45:59 +01:00
alexis Algoud
61a3131fc4
fix include for ajax select product supplier order
2017-11-27 10:59:46 +01:00
Laurent Destailleur
b142ac1c06
CSS
2017-11-26 22:12:11 +01:00
Laurent Destailleur
e4d0213916
Removed duplicate code
2017-11-26 22:06:14 +01: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
5935ad868a
Fix the from robot must be visible only on test page
2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd
Clean code
2017-11-25 19:16:15 +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
e6b16815aa
Fix responsive
2017-11-25 17:25:27 +01:00
Laurent Destailleur
e1484caa59
Fix responsive
2017-11-25 17:21:53 +01:00
Laurent Destailleur
1ea9137863
Fix sort order
2017-11-25 16:21:44 +01:00
Laurent Destailleur
5ba4a57b61
Fix sort on last actions
2017-11-25 16:05:45 +01:00
Frédéric FRANCE
6a91b16995
info bank
2017-11-25 12:13:03 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
412c4e335d
Fix method of herited object has same signature than parent
2017-11-25 11:10:52 +01:00
Laurent Destailleur
88841ccbae
FIX #7590
2017-11-25 01:58:11 +01:00
Laurent Destailleur
b8251bac97
Fix rename files with accents
2017-11-25 00:48:19 +01:00
Laurent Destailleur
4cff4c6935
Simplify and standardize code for agenda pages
2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70
NEW Remove background on agenda view when event is a not busy event.
2017-11-24 20:02:46 +01:00
Laurent Destailleur
7ea96d53a2
Minor fixes
2017-11-24 18:12:01 +01:00
Laurent Destailleur
63d2d38c5f
Fix export stock with lot
2017-11-24 17:47:40 +01:00
Laurent Destailleur
8659d97e97
Fix export of lot must use properties of lot from product_lot
2017-11-24 17:44:19 +01:00
Laurent Destailleur
4f4f929efb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
2017-11-24 17:02:14 +01:00
Laurent Destailleur
2493c2468d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/core/lib/files.lib.php
2017-11-24 16:51:59 +01:00
Laurent Destailleur
0370368d04
Restore lost field during merge
2017-11-24 16:46:50 +01:00
Laurent Destailleur
d7f5f14f46
Merge branch 'develop' into new_export_stock_valo
2017-11-24 16:40:36 +01:00
Laurent Destailleur
aa2397ff1d
Merge pull request #7859 from vvnt/patch-9
...
modPropale.class.php permissions in English
2017-11-24 16:34:02 +01:00
Laurent Destailleur
8bd2707678
Merge pull request #7858 from vvnt/patch-8
...
modFacture.class.php permissions in English
2017-11-24 16:33:42 +01:00
Laurent Destailleur
a18824050c
Merge pull request #7857 from vvnt/patch-7
...
modSociete.class.php permissions in English
2017-11-24 16:33:22 +01:00
Laurent Destailleur
21764ed0cf
Merge pull request #7856 from frederic34/patch-1
...
Update html.form.class.php
2017-11-24 16:33:00 +01:00
Laurent Destailleur
438a68968f
Fix regression
2017-11-24 16:28:24 +01:00
Laurent Destailleur
831099fef8
Debug modulebuilder
2017-11-24 16:24:42 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
abe13d108b
Clean code used for autocompletion
2017-11-24 09:23:18 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Maxime Kohlhaas
cad2fedf70
New add pmp and cost price in product stock export
2017-11-23 18:41:48 +01:00
Laurent Destailleur
5cf21fef05
Use autocompletion on list of taxes
2017-11-23 15:46:52 +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
295b4483d4
Enhance the repair.php tool
2017-11-23 13:23:16 +01:00
Frédéric FRANCE
0ee30171db
Update html.form.class.php
2017-11-23 08:36:10 +01:00
Laurent Destailleur
5b77fe393e
Fix: contact not preselected
2017-11-23 00:59:43 +01:00
vvnt
09f4abd38e
modPropale.class.php permissions in English
2017-11-22 23:22:43 +01:00
vvnt
10ba9a2fee
modFacture.class.php permissions in English
2017-11-22 23:16:15 +01:00
vvnt
1b646f755d
modSociete.class.php permissions in English
2017-11-22 23:11:36 +01:00
Laurent Destailleur
5a2fe13958
Fix travis
2017-11-22 21:36:01 +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
adce4b5b7b
Debug multi contact on event.
...
Prepare also code to manage properties of attendees of event
2017-11-22 14:42:47 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact
...
New multi contacts on actioncomm
2017-11-22 12:05:04 +01:00
Laurent Destailleur
aa91b9075a
Fix cancel button
2017-11-22 11:54:02 +01:00
Laurent Destailleur
d2b3fc5813
Merge pull request #7849 from IonAgorria/resources-card
...
NEW: Merge resource/add.php to resource/card.php
2017-11-22 11:33:56 +01:00
Laurent Destailleur
30d0c4f210
Merge pull request #7845 from vvnt/patch-6
...
modSociete.class.php (spelling correction)
2017-11-22 11:33:03 +01:00
Laurent Destailleur
918a51b9da
Merge pull request #7844 from vvnt/patch-5
...
modPropale.class.php (spelling correction)
2017-11-22 11:28:25 +01:00
Laurent Destailleur
f6cc441c2e
Merge pull request #7843 from vvnt/patch-4
...
Update modFacture.class.php (Spelling correction)
2017-11-22 11:28:05 +01:00
Laurent Destailleur
62da0160e1
Merge pull request #7780 from fappels/develop_update_tablednd
...
FIX #3551 and #6823 table drag and drop not working.
2017-11-22 11:22:14 +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
Ion
7c6622f5b3
Merge resource/add.php to resource/card.php
2017-11-21 20:12:55 +01:00
vvnt
c74eef03dd
modSociete.class.php (spelling correction)
...
Minor spelling correction.
2017-11-21 15:17:02 +01:00
vvnt
005be3f69b
modPropale.class.php (spelling correction)
...
Minor spelling correction
2017-11-21 15:13:13 +01:00
vvnt
98998a7060
Update modFacture.class.php
2017-11-21 15:07:53 +01:00
Laurent Destailleur
2b95679b84
Add info to help spam fight
2017-11-21 14:09:15 +01:00
Laurent Destailleur
a630e665d9
Work on modulebuilder
2017-11-21 11:50:57 +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
818f43e7ad
Work on generic filemanager
2017-11-19 22:04:24 +01:00
Laurent Destailleur
6953420ce8
Support for ar_EG as laternative of ar_AS
2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc
Work on public sharing files
2017-11-19 20:44:57 +01:00
Laurent Destailleur
4ad0d5df43
Fix scrutinizer issues
2017-11-19 16:55:28 +01:00
Laurent Destailleur
248a359ac9
Fix phpcs
2017-11-19 16:30:05 +01:00
Laurent Destailleur
304819a726
Work on module builder
2017-11-19 16:26:39 +01:00
Laurent Destailleur
4938a0ba2a
Add param forcenowrap on tooltip function
2017-11-19 12:41:37 +01:00
Laurent Destailleur
47afe470eb
Merge small js into lib_header.js.php
...
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
Laurent Destailleur
9b1470dab5
Work on generic filemanager component
2017-11-18 22:13:19 +01:00
Laurent Destailleur
bcaccb1829
Add layout into link of sub resources to solve undesired cache effect
2017-11-18 12:35:25 +01:00
atm-ph
15a8f2037b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-11-18 11:54:21 +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
7349b5d793
Fix php 7.2
2017-11-17 17:23:56 +01:00
Laurent Destailleur
2705030006
Code comment
2017-11-17 15:34:15 +01:00
Laurent Destailleur
2cb190fc5c
Fix return code
2017-11-17 15:27:59 +01:00
Laurent Destailleur
776f999b71
Merge branch 'develop' into develop_update_tablednd
2017-11-17 15:10:09 +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
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
501f5b8292
Merge duplicate translation key
2017-11-14 18:26:39 +01:00
Laurent Destailleur
451d3ed8ed
NEW Add API to activate/unactivate a contract
2017-11-14 17:51:04 +01:00
Laurent Destailleur
a50589c3c9
NEW Better behaviour when using a text browser
2017-11-14 15:10:46 +01:00
florian HENRY
e195cf0b95
fix : return vat code for supplier price
2017-11-14 09:53:06 +01:00
Laurent Destailleur
11cb9c0d81
Code simpler
2017-11-14 01:57:50 +01:00
Laurent Destailleur
31e152274c
NEW Add 2 new automatic classification in workflow module
2017-11-14 01:00:57 +01:00
Laurent Destailleur
a2c80a704f
Code comment
2017-11-13 19:06:58 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +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
d59ad412a4
Clean code
2017-11-13 11:01:09 +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
53a523ba9d
Module builder
2017-11-12 20:45:06 +01:00
Laurent Destailleur
d421b90376
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-11-12 20:18:56 +01:00
Laurent Destailleur
356525730d
FIX #7786
2017-11-12 20:12:56 +01:00
Laurent Destailleur
bf121f9b3c
Work on saving supplier_ref into database lines
2017-11-12 19:29:03 +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
3b4cbf54d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-11 18:23:08 +01:00
Laurent Destailleur
0cd8aa8a49
Merge pull request #7798 from hregis/develop_extrafields
...
Fix: missing status 3 (only on form)
2017-11-11 17:59:33 +01:00
Laurent Destailleur
b5d63de708
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-11 17:49:51 +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
75e5d80eb6
Better help on mass invoicing from orders
2017-11-11 17:09:15 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
bf0017ffaf
Fix column
2017-11-11 00:30:16 +01:00
Laurent Destailleur
b8cbb84e7c
Clean code
2017-11-11 00:28:00 +01:00
Laurent Destailleur
debc0480dd
CSS
2017-11-10 20:20:59 +01:00
Laurent Destailleur
a029b16795
css
2017-11-10 18:27:03 +01:00
Laurent Destailleur
cb03b2f307
NEW Can sort joined files on thirdparty and user card.
2017-11-10 18:14:29 +01:00
Regis Houssin
3ffe1b6725
Fix: missing status 3 (only on form)
2017-11-10 16:51:37 +01:00
Laurent Destailleur
beacf4225f
Work on filemanager
2017-11-10 15:44:43 +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
atm-ph
2636c2470b
Fix width of payment term is to large
2017-11-10 10:52:58 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Laurent Destailleur
9d3cf8f217
Fix can use tooltip with popup even for column titles
2017-11-09 18:50:15 +01:00
Laurent Destailleur
f6a0603fb0
Clean code/constant
2017-11-09 18:16:15 +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
fappels
b38265bc15
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_update_tablednd
...
fix Conflicts in ChangeLog
2017-11-07 16:34:21 +01:00
fappels
14bc066454
Update for new tablednd compatibility
2017-11-07 16:25:57 +01:00
Laurent Destailleur
f8a44431b5
Fix visibility of extrafields
2017-11-07 13:41:59 +01:00
Laurent Destailleur
14a43ba4d2
FIX sort on a date that is result of a MIN with mysql
2017-11-07 13:33:24 +01:00
Laurent Destailleur
bc79aced6c
Fix extrafields with column perms not filled are not visible
2017-11-07 12:33:13 +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
d90e3e88c2
NEW Add method executeCLI and a phpunit
2017-11-06 20:24:12 +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
45fc5701ae
NEW Add a profile to import product translations
2017-11-06 12:59:58 +01:00
Laurent Destailleur
864af9cc3b
Fix error not returned if output directory not writable
2017-11-06 11:47:03 +01:00
Laurent Destailleur
8429de031f
Code comment
2017-11-06 11:32:02 +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
a066bbcd89
Debug filemanager
2017-11-05 02:50:02 +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
51c705a84b
NEW Reduce size of HTML page by removing duplicate tooltips
2017-11-05 01:00:15 +01:00
Laurent Destailleur
d8ef24ff0b
Clean code of the filemanager
2017-11-05 00:37:21 +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
cd70e1506b
Work on common core code
2017-11-03 17:20:08 +01:00
Laurent Destailleur
c479efa480
Fix encoding with select2
2017-11-03 16:29:23 +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
55386a3ae2
Work on website module
2017-11-03 13:52:03 +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
26b01792b2
Code comment
2017-11-02 17:58:46 +01:00
Laurent Destailleur
f5e1ca3178
Fix break on project
2017-11-02 15:33:04 +01:00
Laurent Destailleur
fd86c470a8
FIX #7651 #7748 #7542
2017-11-02 13:47:29 +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
a98452ae36
Move translation
2017-11-01 10:52:42 +01:00
Laurent Destailleur
f26d970d58
Remove option MAIN_HTML5_PLACEHOLDER (on by default now)
2017-11-01 10:17:24 +01:00
Laurent Destailleur
4220d02dd4
Debug module blocked log
2017-10-31 23:57:37 +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
32303d30fa
Fix search on special char in module list
2017-10-31 10:46:23 +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
bbe1c9c494
NEW Can download PDF document from the payment page
2017-10-30 00:45:47 +01:00
Laurent Destailleur
76b0e7ee5a
NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD
2017-10-29 21:24:54 +01:00
Laurent Destailleur
02cae88a8c
Fix date output
2017-10-29 17:50:50 +01:00
Laurent Destailleur
33aa0f3160
Code comment
2017-10-29 17:49:24 +01:00
Laurent Destailleur
78645c718f
Fix position of quick search
2017-10-29 16:15:54 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +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
92c33b76dc
Fix position of search element in quick search
2017-10-28 20:35:21 +02:00
Laurent Destailleur
46f95e14fa
Fix select2 search
2017-10-28 17:34:46 +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
00db7e16ec
Clean code
2017-10-28 16:00:07 +02:00
Laurent Destailleur
9e382a7f1b
Can disabled output of notify messages
2017-10-28 13:36:23 +02:00
Laurent Destailleur
1a49a2bb94
Clean css/code
2017-10-28 11:00:02 +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
a40bebec40
Fix translation of module descriptions
2017-10-27 13:06:14 +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
e4645cf2c5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/blockedlog/class/blockedlog.class.php
htdocs/contrat/card.php
htdocs/societe/card.php
2017-10-27 02:12:35 +02:00
Laurent Destailleur
9283aaf6aa
Fix scrutinizer
2017-10-27 00:07:58 +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
d1e7577eed
Fix sql field can't be named 'offset' (reserved word).
2017-10-26 18:30:01 +02:00
Laurent Destailleur
67e5d72bd0
Fix doxygen
2017-10-26 14:56:07 +02:00
Laurent Destailleur
89baa0b307
Work on website
2017-10-26 14:49:30 +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
florian HENRY
f4a95f89ac
Ok, now suppliers payment are correctly logged
2017-10-26 12:26:25 +02:00
florian HENRY
a7655b69e8
agin fix blockedlog on supplier incvoive payument
2017-10-26 12:13:47 +02:00
Laurent Destailleur
6d6c4bf088
Fix export web site
2017-10-26 10:43:47 +02:00
Laurent Destailleur
e865f41b86
NEW Extrafields "link to object" now use a combo selection and getNomUrl
2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1
Work on modulebuilder and website module
2017-10-26 01:02:13 +02:00
Laurent Destailleur
ff9a6ca01b
Work on module builder
2017-10-25 22:23:54 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
bb996019c2
NEW Support visibility on extrafields
2017-10-25 11:42:14 +02:00
Laurent Destailleur
f381361c8b
Work on modulebuilder
2017-10-24 19:57:36 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
0b120dd1a9
Prepare code to remove hooks on extrafield update
2017-10-24 18:45:34 +02:00
Laurent Destailleur
d2f723045c
Work on website and modulebuilder
2017-10-24 17:30:05 +02:00
Laurent Destailleur
9dc4933ba0
Debug
2017-10-24 15:32:01 +02:00
Laurent Destailleur
7b661685cc
Debug modBlockedLog module
2017-10-24 15:22:46 +02:00
Laurent Destailleur
6b65a9ac56
Fix position of resource menu
2017-10-24 09:58:32 +02:00
Laurent Destailleur
53d2f29cdd
Fix regression
2017-10-23 10:27:50 +02:00
Laurent Destailleur
7825cc9f6d
Fix to avoid infinite loop
2017-10-22 21:21:24 +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
812687e10c
FIX Restore feature to enable a module during CLI upgrade
2017-10-22 16:08:52 +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
d3f2e19691
Merge pull request #7680 from Nicos-git/OdtGeneration
...
NEW Add product unit fields for ODT substitution
2017-10-22 04:14:17 +02:00
Laurent Destailleur
ba2dd953b4
Update commondocgenerator.class.php
2017-10-22 04:13:49 +02:00
Laurent Destailleur
764e215ca1
Update commondocgenerator.class.php
2017-10-22 04:12:46 +02:00
Laurent Destailleur
b9c0ea3691
Update commondocgenerator.class.php
2017-10-22 04:07:54 +02:00
Laurent Destailleur
5984222794
FIX #7679
2017-10-22 03:47:36 +02:00
Laurent Destailleur
fb843430bf
FIX #7671
2017-10-22 03:22:31 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Laurent Destailleur
cad44ee68a
FIX substitution in ODT of thirdparties documents
2017-10-22 01:25:59 +02:00
Nicolas Leichtle
fc2a834e41
New Add product unit fields for ODT substitution
2017-10-21 23:54:49 +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
0e397b3e81
Work on website module
2017-10-20 18:44:03 +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
5c189449e1
Move default value for user expense report on tab expense report
2017-10-20 17:02:26 +02:00
Laurent Destailleur
6165bcdbd0
NEW Can export list of stock movements
2017-10-20 14:52:01 +02:00
Laurent Destailleur
daa7847ab3
NEW All search boxes are available on smartphone
2017-10-20 01:18:21 +02:00
Laurent Destailleur
34d933af29
Default value for graph widget show all graphs
2017-10-20 00:27:52 +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
f67350db72
Merge pull request #7647 from BackrndSource/patch-2
...
FIX: Some errors from html.form.class.php not translated on fourn/commande/card.php
2017-10-19 19:19:21 +02:00
Laurent Destailleur
83440f5bbc
FIX #7626
2017-10-19 13:07:33 +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
Laurent Destailleur
cfeab01996
Prefill hour/min to 23:59 when creating a task
2017-10-18 18:50:30 +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
Laurent Destailleur
d40dda83cf
Add API "close" for proposals
...
Standardize code
2017-10-18 11:10:08 +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
8b140ab069
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157
NEW Can create intervention from a proposal
2017-10-17 10:44:18 +02:00
BackrndSource
df388df3ff
Update html.form.class.php
...
$lang->load('errors') is needed to load the traductions for:
$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
2017-10-16 22:56:16 +02:00
Laurent Destailleur
768c623a89
Merge pull request #7644 from atm-florian/dev_extrafield_default_value
...
FIX : Extrafield default value admin/defaultvalues.php enabled
2017-10-16 21:42:50 +02:00
florian HENRY
51ce8bf2a5
js
2017-10-16 21:08:09 +02:00
florian HENRY
17db813a4e
Logical variable name suffix/prefix
2017-10-16 21:05:12 +02:00
Laurent Destailleur
b7c1b6b9d0
Merge pull request #7638 from hregis/develop_member
...
New usage of attributes
2017-10-16 21:03:30 +02:00
florian HENRY
695740142a
FIX : Extrafield default value admin/defaultvalues.php enabled
2017-10-16 20:54:53 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +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
Laurent Destailleur
f7fe011e98
Add CRLF before 'boundary' word. Use \r\n on wordwrap.
2017-10-16 14:31:28 +02:00
Regis Houssin
46d9ef01c6
Fix: use new usage
2017-10-16 11:18:52 +02: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
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
BENKE Charlene
c44207f7d3
template file not only odt/ods
2017-10-14 12:39:39 +02:00
Laurent Destailleur
e17c92b11c
Code comment
2017-10-13 22:40:33 +02:00
Laurent Destailleur
ab280feaa5
Move datepicker vars into lib_heas.js.php
2017-10-13 22:37:46 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
5092c41d94
Look and feel v6
2017-10-13 20:04:11 +02:00
Laurent Destailleur
8b64f979ef
Fix multiple upload was broken
2017-10-13 15:49:39 +02:00
Laurent Destailleur
5f22afa450
Merge pull request #7621 from atm-ph/fix_distinct_credit_note
...
Fix distinct credit note select list
2017-10-13 13:32:04 +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
d12019d1b5
Fix from scrutinizer
2017-10-13 13:10:36 +02:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
0ac33d46c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-13 10:35:38 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-10-13 09:52:56 +02:00
atm-ph
647c4036cf
Fix simplification of code
2017-10-13 09:21:37 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
Laurent Destailleur
194fb2dbc8
Merge pull request #7615 from hregis/develop_extrafields
...
NEW add translation column for extrafields list
2017-10-13 00:47:45 +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
atm-ph
8d3df7ea57
Fix can not distinct which credit note are in select list
2017-10-12 09:59:25 +02:00
Laurent Destailleur
ca0af5cddf
NEW Bulk action validate on customer invoices
2017-10-12 02:25:17 +02:00
Laurent Destailleur
5fd6a27c62
Fix position of top menu
2017-10-12 02:16:54 +02:00
Laurent Destailleur
0d0030cff4
Fix use of sender profiles
2017-10-11 19:57:53 +02:00
Laurent Destailleur
56be9e2b60
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:19 +02:00
Regis Houssin
c9066afa36
NEW add translation column for extrafields list
2017-10-11 14:22:59 +02:00
Laurent Destailleur
1e7f726168
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-11 12:21:52 +02:00
Laurent Destailleur
99afa3a3e0
Use a shorter key for column title
2017-10-11 12:19:44 +02:00
Laurent Destailleur
efac9ddb12
Merge pull request #7613 from hregis/develop_extrafields
...
Fix: label not translated if special lang file used
2017-10-11 11:58:44 +02:00
Laurent Destailleur
f23a82b9a7
Merge pull request #7614 from dolibarr95/patch-25
...
Fix : translation error
2017-10-11 11:57:51 +02:00
Laurent Destailleur
118b3cdf79
Update admin_extrafields_view.tpl.php
2017-10-11 11:56: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
eb995bb7ad
Merge pull request #7603 from hregis/develop_bug5
...
Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)
2017-10-11 11:48:46 +02:00
Laurent Destailleur
5aa3352e58
Restore TODO for future feature
2017-10-11 11:48:38 +02:00
Laurent Destailleur
e644f7df58
Merge pull request #7597 from hregis/develop_member
...
NEW add company alias name when create company from member
2017-10-11 11:31:55 +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
1b3f746ce0
Fix translation error
...
InvoiceProForma translation is available in bills.lang
2017-10-11 11:16:01 +02:00
Regis Houssin
7e79c3a795
Fix: label not translated if special lang file used
2017-10-11 10:10:27 +02:00
Laurent Destailleur
f93ecc1584
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/projet/activity/perweek.php
htdocs/projet/element.php
2017-10-10 11:24:17 +02:00
dolibarr95
572a64bdbf
display mobile picto
...
runs with #6617
2017-10-10 10:19:04 +02:00
Regis Houssin
4530f94fa6
Fix: restore parameters, needed for save in place
2017-10-10 10:07:52 +02:00
Regis Houssin
9ff0855812
Fix: datepicker.js.php is needed for the translation !!
2017-10-10 10:04:16 +02:00
Regis Houssin
88e700ae12
Fix: add month names short
2017-10-10 09:30:07 +02:00
Regis Houssin
f51c0db705
NEW add translation and possibility to change month and year
2017-10-10 09:16:14 +02:00
Regis Houssin
00db16e0de
Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)
2017-10-10 08:49:00 +02:00
Laurent Destailleur
9427655dd0
Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default
2017-10-09 18:18:34 +02:00
Regis Houssin
625e440653
Fix: wrong test
2017-10-09 16:50:20 +02:00
Regis Houssin
e2206d9bf2
Fix: uniformize substitution tags
2017-10-09 16:33:22 +02:00
Laurent Destailleur
aa07db2f38
NEW A module can change order of element in the quick search combo
2017-10-09 16:17:55 +02:00
Regis Houssin
86c301f197
Fix: uniformize parameters
2017-10-09 15:49:10 +02:00
Regis Houssin
16b766182c
NEW view company name if different of fullname in dol_banner
2017-10-09 15:35:08 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Laurent Destailleur
8f24a86352
NEW If max nb of generation is reached, date for next gen is striked
2017-10-09 14:16:22 +02:00
Regis Houssin
f2d9288db5
NEW add company alias name when create company from member
2017-10-09 12:38:44 +02:00
Regis Houssin
4a30448ff4
Fix: use fullname instead id is more explicit
2017-10-09 11:34:28 +02: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
Maxime Kohlhaas
8513ddb9b4
Fix : missing new target type in advance target selection
2017-10-08 10:08:49 +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
de71de61af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 18:52:38 +02:00
Laurent Destailleur
df38f60617
Export website into zip
2017-10-06 18:29:18 +02:00
Laurent Destailleur
8d47969d29
Merge pull request #7578 from OPEN-DSI/fix_0002
...
NEW add a new notification for the signed closed event of a proposal.
2017-10-06 17:36:23 +02:00
Laurent Destailleur
c7a0f467cc
Fix var unknown
2017-10-06 17:03:32 +02:00
KHELIFA
88ab3a9cab
Add a new notification for the event that has successfully closed a proposal.
2017-10-06 16:15:40 +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
8ce723b4c9
FIX #7514
2017-10-06 13:56:54 +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
2d549a6191
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 13:09:42 +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
2148622d40
Clean code
2017-10-06 12:55:48 +02:00
Laurent Destailleur
ad12aff31d
Merge pull request #7573 from inoveaconseil/patch-12
...
Add constant to manage update_price function
2017-10-06 12:48:55 +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
7871498724
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 11:03:03 +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
Inovea Conseil
2f3f04c2b1
Add constant to manage update_price function
...
Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).
2017-10-06 10:42:25 +02:00
Laurent Destailleur
e644d9d53f
Fix syntax code
2017-10-06 01:49:07 +02:00
Laurent Destailleur
801a5180d6
Fix scrutinizer bug reports
2017-10-06 01:16:19 +02:00
Regis Houssin
6adae89c47
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-10-05 17:18:41 +02:00
Laurent Destailleur
ad63dc8b78
Merge pull request #7562 from hregis/develop_bug
...
Fix: minimal num, maj and special character with value 0 not work
2017-10-05 10:29:28 +02:00
Laurent Destailleur
2a2cd30e19
Fix code
2017-10-05 10:00:43 +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
6540bc0061
Fix doxygen
2017-10-04 19:48:11 +02:00
Regis Houssin
1cee16a802
Fix: minimal num, maj and special character with value 0 not work
2017-10-04 18:32:52 +02:00
Laurent Destailleur
ded55f41fb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2017-10-04 16:08:22 +02:00
Laurent Destailleur
13cb806436
FIX #7531 #7537
2017-10-04 15:18:15 +02:00
Laurent Destailleur
d28188d19d
FIX Generation of invoice from bulk action "Bill Orders"
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3
FIX Generation of invoice from bulk action "Bill Orders"
2017-10-04 14:27:10 +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
Regis Houssin
537fc63da5
Fix: add by error
2017-10-04 13:18:48 +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
a259057dd3
Fix: Found non escaped string
2017-10-04 12:42:41 +02:00
Regis Houssin
a124f47dcd
Fix: PHPCS
2017-10-04 12:07:17 +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
Regis Houssin
723bc4d436
NEW add ldap_rename for avoid password if ldap key changed
2017-10-04 11:22:41 +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
59bf61f9b3
NEW add possibility to disabled the LDAP trigger
2017-10-04 09:22:18 +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
eeb36464b7
Merge pull request #7524 from hregis/develop_mc
...
Fix: command not found with escapeshellarg !
2017-10-03 18:06:49 +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
1f11dcb4bd
Fix no loose of configuration of action auto after upgrade Close #7527
2017-10-03 17:21:18 +02:00
Regis Houssin
a88938ace4
Fix: use GETPOST
2017-10-03 17:11:42 +02:00
Regis Houssin
9c2d053f74
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-10-03 17:01:39 +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
Maxime Kohlhaas
a88bcb5299
Add detailed menus in HRM module
2017-10-03 13:49:30 +02:00
Laurent Destailleur
0b808fa2aa
FIX Bad preview on scroping when special file names
2017-10-03 10:55:45 +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
1fc292fa56
FIX Bad preview on scroping when special file names
2017-10-03 10:11:03 +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
Regis Houssin
c1b6f59c1b
Fix: restore possible ldap keys
2017-10-02 08:43:53 +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
6dbc02022f
Merge pull request #7529 from Nicos-git/develop
...
NEW: Add project related fields to ODT
2017-10-02 00:36:46 +02:00
Laurent Destailleur
48c3d0e3f2
Update commondocgenerator.class.php
2017-10-02 00:36:15 +02:00
Laurent Destailleur
f15ce54c05
Update commondocgenerator.class.php
2017-10-02 00:34:55 +02:00
Laurent Destailleur
a81d458829
Merge pull request #7509 from dolibarr95/patch-21
...
NEW Add the attribute accept to the input form for file upload
2017-10-02 00:12:03 +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
Laurent Destailleur
e23a88732e
Fix default value on extrafields
2017-09-30 20:05:34 +02:00
Laurent Destailleur
a43dcbd0c5
Fix no "now" link on search of a date extrafield in list
2017-09-30 18:57:21 +02:00
Laurent Destailleur
976cbd5f83
Fix javascript error and input field for password extrafield in list
2017-09-30 18:52:33 +02:00
Nicolas Leichtle
95cc007b39
NEW: Add project related fields to ODT
2017-09-30 15:40:17 +02:00
Laurent Destailleur
0feae17ef5
Fix file not always defined
2017-09-30 11:51:34 +02:00
Regis Houssin
46cc23c568
Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used
2017-09-30 10:41:35 +02:00
Laurent Destailleur
0e15aef44f
CSS
2017-09-30 00:30:58 +02:00
Laurent Destailleur
02f069713e
Standardize code
2017-09-29 17:43:32 +02:00
Laurent Destailleur
d2d77d4625
Module builder
2017-09-29 15:19:49 +02:00
Regis Houssin
9490e13c21
Fix: command not found with escapeshellarg !
2017-09-29 14:52:05 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +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
Laurent Destailleur
537a551bb5
Fix vat visiblity on pdf
2017-09-27 21:58:42 +02:00
Laurent Destailleur
e878f3cfd5
No more need of contacts on each tab by default
2017-09-27 20:15:56 +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
dolibarr95
00862913d8
Add the attribute accept to input tag
...
I know this is not a security check but it is more convenient for the user when in a form only images or pdf are accepted for example.
see :
*https://www.w3.org/wiki/HTML/Elements/input/file
*https://www.w3schools.com/TagS/att_input_accept.asp
Hope every body needs it.
tks
2017-09-27 11:12:38 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
4dd737fe44
Merge pull request #7503 from fappels/develop
...
Dispatch clean code and remove deprecated code
2017-09-26 20:06:44 +02:00
Laurent Destailleur
6b9e754221
Merge pull request #7496 from papoteur-mga/rapports_paiements
...
Rapports paiements
2017-09-26 20:02:09 +02:00
fappels
ca6ad909e7
remove deprecated file
2017-09-26 16:23:00 +02:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
Laurent Destailleur
0dfbc8d72f
doxygen
2017-09-26 16:03:08 +02:00
Laurent Destailleur
d1bee67b40
FIX #3991
2017-09-26 13:09:19 +02:00
florian HENRY
6fcfe89565
NEW : lettrage in accountancy
2017-09-26 13:02:29 +02:00
Laurent Destailleur
e140878458
NEW Can import local tax rates in prices
2017-09-26 13:00:09 +02:00
Papoteur
cc9954e95e
Clean debug messages
2017-09-26 12:51:14 +02:00
Papoteur
50d639f1fa
Add total and subtotal in payments reports
2017-09-26 12:10:51 +02:00
Laurent Destailleur
49982b36ac
FIX #7490
2017-09-26 11:55:19 +02:00
Papoteur
cbe1683fe7
Invoice number on one line instead of two (issue#7487)
2017-09-26 11:30:28 +02:00
Papoteur
d2c55ea07b
Factorize code between payments reports client/provider
2017-09-26 11:27:53 +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
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
919d29fdf7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-09-25 19:45:40 +02:00
Laurent Destailleur
fe55feb82f
FIX #7461
2017-09-25 19:45:01 +02:00
Laurent Destailleur
dc362fcd30
NEW Can show currency in list of bank accounts
2017-09-25 18:11:03 +02:00
Laurent Destailleur
fcdbc66bb1
Merge pull request #7122 from atm-florian/develop_fixtransfert
...
NEW : Can transfer from bank account to bank account with different currencies
2017-09-25 17:36:52 +02:00
Laurent Destailleur
aeeda250c7
Merge pull request #7443 from salnaSrc/myFixes
...
Add hidden option WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS
2017-09-25 17:28:28 +02:00
Inovea Conseil
35ae0e435d
Fix quote in input
...
Delete a quote in input field
2017-09-25 16:14:14 +02:00
Laurent Destailleur
7b9facc76a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-25 11:43:12 +02:00
Laurent Destailleur
a9fabf117e
Code comment
2017-09-25 11:42:59 +02:00
Laurent Destailleur
53d931dd11
Merge pull request #7481 from dolibarr95/patch-17
...
Fix 7470
2017-09-25 11:34:00 +02:00
Inovea Conseil
d3d6fca350
Missing space in request
...
Fix bug in request
2017-09-25 10:49:56 +02:00
dolibarr95
6ee15f1c45
Fix 7470
...
php warning when MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.
2017-09-25 09:01:47 +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
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
2285e9bc0b
Merge branch 'develop' into develop_trad
2017-09-24 21:47:17 +02:00
Laurent Destailleur
971e59395c
Fix phpcs
2017-09-24 21:46:14 +02:00
Laurent Destailleur
2e511badf9
Code comment
2017-09-24 21:02:20 +02:00
Laurent Destailleur
3482b12933
Comment deprecated js code
2017-09-24 20:55:48 +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
Regis Houssin
0cdca6f3eb
Fix: phpcs error
2017-09-24 11:10:33 +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
414f633e75
Fix css
2017-09-23 12:59:49 +02:00
Laurent Destailleur
35d00fd2ec
Fix wrap on lites_total
2017-09-23 09:28:31 +02:00
Laurent Destailleur
839f3ca41d
NEW Can use an url like $conf->global>-MYPARAM for menu urls
2017-09-23 03:22:48 +02:00
Laurent Destailleur
a94f2b07e1
Fix css
2017-09-23 02:46:33 +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
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
8578a1b825
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 17:04:26 +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
Regis Houssin
01f9d59e75
Fix: use another method
2017-09-21 12:16:01 +02:00
Laurent Destailleur
beac7a7439
Work on direct download links
2017-09-20 21:29:27 +02:00
Regis Houssin
1314e00bc6
Fix: check if array and check empty value if required
2017-09-20 14:46:51 +02: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
Pilon David
78b45bd972
Update interface_20_modWorkflow_WorkflowManager.class.php
2017-09-20 09:41:32 +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
ffe2ee8232
Standardize code
2017-09-19 19:00: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
atm-quentin
815d0aff90
FIX for free line select unit was wrong
2017-09-19 15:10:18 +02:00
Laurent Destailleur
77d1a15016
Activate warning for french "Loi Finance 2016"
2017-09-19 12:03:48 +02:00
Laurent Destailleur
0b67ac36f1
Show image on tool page
2017-09-19 02:01:05 +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
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02: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
3f7b705674
Use correct term accounting for codes
2017-09-18 00:48:09 +02:00
Laurent Destailleur
eaee8ee586
Fix box activity again
2017-09-17 21:30:27 +02:00
Laurent Destailleur
f76b675e09
Fix box activity again
2017-09-17 21:30:15 +02:00
Laurent Destailleur
99149b5cfe
Fix box activity again
2017-09-17 21:30:11 +02:00
Laurent Destailleur
90ab6a1f30
Fix box activity again
2017-09-17 21:29:25 +02:00
Laurent Destailleur
f4b8489bd6
Fix box activity again
2017-09-17 21:24:30 +02:00
Laurent Destailleur
0ed5b329a7
Fix box activity again
2017-09-17 21:21:12 +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
94368accc1
Fix activity box
2017-09-17 20:37:18 +02:00
Laurent Destailleur
fb15b2aab0
Fix activity box
2017-09-17 20:36:45 +02:00
Laurent Destailleur
ee774f1bf9
FIX Calculation in the activity box
2017-09-17 20:20:48 +02:00
Laurent Destailleur
9dbd88f0ba
FIX Calculation in the activity box
2017-09-17 20:17:51 +02:00
Laurent Destailleur
a3c555049d
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:23 +02:00
Laurent Destailleur
fa18e788b5
Fix must use photo of user
2017-09-17 17:29:00 +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
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Regis Houssin
d9b3a4e456
Fix: phpcs
2017-09-16 21:58:05 +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
b4eab24490
Add project into list of customer orders
2017-09-16 20:32:28 +02:00
Laurent Destailleur
9e29ea8011
FIX Must use pdf format page as default for merging PDF.
2017-09-16 18:32:43 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Regis Houssin
4ab1f68102
Fix: check connectivity for avoid ldap errors
2017-09-16 17:12:51 +02:00
Laurent Destailleur
318e285ba2
NEW Add protection to avoid to send to much emails using builk actions
2017-09-16 16:00:58 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
c7e841b340
FIX Must use pdf format page as default for merging PDF.
2017-09-16 15:36:04 +02:00
Laurent Destailleur
97e8974fdf
FIX Better protection to no send email when we change limit
2017-09-16 13:29:07 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +02:00
Laurent Destailleur
52f89ef2c0
FIX Better protection to no send email when we change limit
2017-09-16 13:26:43 +02:00
Laurent Destailleur
0cf67944fa
Clean code
2017-09-16 13:14:46 +02:00
Laurent Destailleur
279988bd60
Remove warning
2017-09-16 12:45:54 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2017-09-16 12:11:18 +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
058b690e25
FIX menu enty when url is external link
2017-09-16 09:22:52 +02:00
Laurent Destailleur
8986640a10
FIX Responsive
2017-09-16 09:16:05 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Laurent Destailleur
baa32f6ed8
FIX Responsive
2017-09-16 09:13:57 +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
5e4b500b5d
Fix signature was changed during insert
2017-09-16 02:22:55 +02:00
Laurent Destailleur
a4086b52ef
NEW Can send email from contract card
2017-09-16 01:34:15 +02:00
Laurent Destailleur
bb6b3db0ac
FIX Position of signature on strato template
...
Conflicts:
htdocs/core/modules/contract/doc/pdf_strato.modules.php
2017-09-16 00:50:54 +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
f4de75afc3
FIX Position of signature on strato template
2017-09-16 00:49:00 +02:00
Laurent Destailleur
087e22ab94
Fix bad status picto
2017-09-16 00:14:39 +02:00
Laurent Destailleur
3c9532841f
Fix regression db => this->db
2017-09-15 19:37:23 +02:00
Regis Houssin
767240698f
Fix: wrong var name
2017-09-15 18:31:22 +02:00
Regis Houssin
3ca90df524
Fix: translation
2017-09-15 18:21:50 +02:00
Regis Houssin
7f57f737b3
New: Ping ldap server before ldap_connect for avoid waiting
2017-09-15 18:02:52 +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
Laurent Destailleur
a2b4e887bb
Merge pull request #7405 from tysauron/patch-9
...
Beaucoup beaucoup plus rapide
2017-09-15 15:46:51 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
77056d9adb
NEW All setup of accountancy can be done from menu "Accountancy-Setup"
2017-09-15 14:09:42 +02:00
Laurent Destailleur
1a78e2a055
Mutualize/share code of all payments modes
2017-09-15 13:43:16 +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
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +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
3b40c95107
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
2017-09-14 21:57:14 +02:00
Laurent Destailleur
c52e593ea8
Fix this->db
2017-09-14 21:27:14 +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
Laurent Destailleur
ed9c401ca6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 12:20:26 +02:00
Laurent Destailleur
b80b7bbcb9
Merge pull request #7384 from atm-ph/fix_6.0_get_class_self
...
Fix get_class(self) instead of get_class($this)
2017-09-14 12:16:16 +02:00
Laurent Destailleur
f2d092c815
Merge pull request #7377 from hregis/6.0_bug2
...
Fix: missing select2 combobox
2017-09-14 12:08:28 +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
dbb50d7b16
Fix PHP 7.2
2017-09-14 11:56:43 +02:00
Laurent Destailleur
74b55d8e8d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 11:49:43 +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
ed013c1b7e
Compatibilty php 7.2
2017-09-14 10:21:04 +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
e0eef2080e
FIX PDF output was sharing 2 different currencies in same total
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2017-09-13 18:13:43 +02:00
Laurent Destailleur
60078300b8
FIX PDF output was sharing 2 different currencies in same total
2017-09-13 17:57:41 +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
2cdea7e37c
Fix bug reported by scrutinizer
2017-09-12 19:21:26 +02:00
Laurent Destailleur
6e3174e71a
Fix menu to member cards generation page was lost.
2017-09-12 17:36:19 +02:00
atm-ph
30eb03af4c
Fix get_class(self) instead of get_class($this)
2017-09-12 16:36:14 +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
3001ee5fe7
Fix title of reports
2017-09-12 13:05:34 +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
Regis Houssin
e038e1a2f5
Fix: missing select2 combobox
2017-09-12 09:27:59 +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
44405e5415
Fix #7335 #7365 Better fix
2017-09-11 15:04:29 +02:00
Laurent Destailleur
dcc9cb4a16
Some fixes in various payment
2017-09-11 14:29:27 +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
Laurent Destailleur
19e780c53f
Merge pull request #7346 from hregis/6.0_bug3
...
Fix: avoid warning
2017-09-11 14:07:38 +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
61a0f04bbe
FIX dateSelector was not taken into account
2017-09-11 03:30:45 +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
e9e6a8e5ad
Fix center of button
2017-09-11 03:29:36 +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
ca5ef5cb11
FIX dateSelector was not taken into account
2017-09-11 01:20:15 +02:00
Laurent Destailleur
d13c4b7b84
Better autosize of extrafields
2017-09-11 01:05:55 +02:00
Laurent Destailleur
25ec124411
Better autosize of extrafields
2017-09-11 00:19:42 +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
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Regis Houssin
762b4eb876
Fix: some problems with medias in multicompany
2017-09-09 17:48:04 +02:00
Regis Houssin
67e9b65a2e
Fix: use $array_key value instead
2017-09-09 17:07:08 +02:00
Regis Houssin
db02c32a9f
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3
2017-09-09 12:14:22 +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
66cba0ad61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-09 09:43:49 +02:00
Laurent Destailleur
b645aeb954
Fix lang loading
2017-09-09 09:41:07 +02:00
Laurent Destailleur
4f52871c67
Merge pull request #7345 from AXeL-dev/develop
...
fix hidepriceinlabel when using ajax autocompleter
2017-09-08 21:22:38 +02:00
Laurent Destailleur
8b20c5edab
FIX Remove warning when using log into syslog
2017-09-08 15:46:06 +02:00
Laurent Destailleur
75172966c2
Fix selection of email templates
2017-09-08 14:40:39 +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
Laurent Destailleur
48765eb28b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-08 13:24:24 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
Regis Houssin
d4c20a919d
Fix: avoid warning
2017-09-08 12:52:56 +02:00
Laurent Destailleur
b7197530c2
NEW Each user can edit its own email template (menu tools)
2017-09-08 12:48:01 +02:00
AXeL-dev
a615a46a5a
fix hidepricelabel when using ajax autocompleter
2017-09-08 11:06:55 +01:00
arnaud
fdd758abb4
FIX empty test on conf fortask comment was bad
2017-09-08 09:17:22 +02:00
arnaud
3a782856f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
2017-09-08 09:15:02 +02:00
Laurent Destailleur
f92eded0a2
Merge pull request #7340 from Oeris/6.0-ficheinter
...
NEW Adds an option to hide duration in the "intervention" module
2017-09-07 18:07:14 +02:00
Laurent Destailleur
faaebbf5e1
Merge pull request #7336 from hregis/6.0_bug3
...
Fix: avoid "Uncaught Error: [] operator not supported for strings"
2017-09-07 18:04:08 +02:00
Laurent Destailleur
c546243f00
Merge pull request #7328 from Dolibarr/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2017-09-07 17:56:24 +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
Neil Orley
e43b13968e
New: Adds an hide hour button in the "intervention" module
...
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
2017-09-07 15:31:19 +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
Regis Houssin
9b35793608
Fix: avoid "Uncaught Error: [] operator not supported for strings"
2017-09-06 11:08:23 +02:00
Laurent Destailleur
9cc344f8cc
Fix problem in type and customer code substitution in numbering module
2017-09-06 10:11:07 +02:00
fappels
5a75e14a8a
Add supplier qty and supplier discount for export
2017-09-05 22:50:34 +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
Scrutinizer Auto-Fixer
c2d32aaf18
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-09-04 10:42:51 +00:00
Laurent Destailleur
61ee071f43
Fix regression
2017-09-04 10:17:51 +02:00
Laurent Destailleur
2c3a696b78
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-09-04 10:16:02 +02:00
Laurent Destailleur
f3b1f89bae
Fix warning
2017-09-03 15:21:37 +02:00
Laurent Destailleur
f963afa505
Fix warning
2017-09-03 15:21:17 +02:00
Laurent Destailleur
3126676ffb
FIX inert of extra field must not change extrafield values in memory
2017-09-03 14:27:46 +02:00
Laurent Destailleur
c6cbf2345d
FIX Management of default value in extrafields when default is '0'
2017-09-03 14:25:54 +02:00
Laurent Destailleur
a4d3e48773
FIX inert of extra field must not change extrafield values in memory
2017-09-03 12:40:49 +02:00
Laurent Destailleur
ca93be5eed
Fix priority of crons
2017-09-03 02:40:00 +02:00
Laurent Destailleur
e6f0e76988
Add option MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH
2017-09-02 15:30:00 +02:00
Laurent Destailleur
3beee569a6
Enhance support of default value in extrafields
2017-09-02 15:18:41 +02:00
Laurent Destailleur
9923c87fd8
Fix translation of extrafields
2017-09-02 13:03:14 +02:00
Laurent Destailleur
36eb21c135
Fix translation of extrafields
2017-09-02 13:02:01 +02:00
Laurent Destailleur
e5400a4a36
Fix translation of extrafields
2017-09-02 13:01:41 +02:00
Laurent Destailleur
7f7b4cddb4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-02 12:37:02 +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
015bc51c43
Fix regression adding a false error message
2017-09-02 12:17:29 +02:00
Laurent Destailleur
32c6acefd2
Merge pull request #7321 from ruistrecht-alt/NEW_Add_region_to_state/province_form_field
...
NEW Added Region name to state/province form field
2017-09-02 00:10:25 +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
Rui Strecht
1ee0077e4e
Fix: Added name to contributors
2017-09-01 16:10:19 +01:00
Laurent Destailleur
4660bc58fc
Fix nostop option
2017-09-01 17:08:47 +02:00
Laurent Destailleur
bda507d191
Fix nostop option
2017-09-01 17:07:26 +02:00
Laurent Destailleur
223e1b1cd4
Fix missing the nostop tag
2017-09-01 16:55:09 +02:00
Laurent Destailleur
920d6270c3
Fix missing the nostop tag
2017-09-01 16:54:06 +02:00
Rui Strecht
9443cb0c1b
NEW Added Region name to state/province form field
2017-09-01 15:53:06 +01:00
Laurent Destailleur
2768878618
FIX Bad condition on sms log debug
2017-09-01 16:39:49 +02:00
