Laurent Destailleur
07fe7e58d8
Code comment
2018-11-20 19:04:58 +01:00
Laurent Destailleur
4b82538941
Better module position
2018-11-20 14:56:14 +01:00
Frédéric FRANCE
4e60e48f34
Update CMailFile.class.php
2018-11-19 23:43:58 +01:00
Frédéric FRANCE
2179e2011e
doc cmail class
2018-11-19 23:38:07 +01:00
Frédéric FRANCE
32706f570d
reduce complexity of htmlformmail class
2018-11-19 21:19:39 +01:00
Laurent Destailleur
e020597ba7
Fix deletion for class build with modulebuilder
2018-11-19 21:11:26 +01:00
Laurent Destailleur
62a5869db4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 20:08:14 +01:00
Laurent Destailleur
39621ec686
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-19 20:05:32 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view
...
FIX hidden extrafield
2018-11-19 18:37:18 +01:00
Laurent Destailleur
929635d468
Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter
...
Fix Contact Agenda events filter when no Third Party
2018-11-19 18:35:55 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124
...
Add societe extrafields on proposal export
2018-11-19 18:33:41 +01:00
Laurent Destailleur
8535844737
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb
Merge pull request #10041 from atm-ph/fix_8.0_optional_param
...
Fix new params has been added not optional
2018-11-19 18:26:21 +01:00
Laurent Destailleur
bd8856b988
Merge pull request #10033 from frederic34/patch-9
...
Update CMailFile.class.php
2018-11-19 18:20:20 +01:00
Laurent Destailleur
77bc1c4313
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-11-19 18:18:43 +01:00
Laurent Destailleur
4bedeabc5b
FIX #10036
2018-11-19 18:02:29 +01:00
François J
37f3b8bbde
Update @since version to 9.0
2018-11-19 17:51:00 +01:00
François J
6aaf0f4655
Add afterSelectOptions hook & selectcontacts context
2018-11-19 17:40:16 +01:00
gauthier
ecdfa5219b
FIX : We want to be able to send PDF of paid invoices
2018-11-19 17:31:45 +01:00
Laurent Destailleur
2f87ee6640
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 15:56:38 +01:00
atm-ph
129034ba76
Fix new params has been added not optional
2018-11-19 15:46:30 +01:00
Laurent Destailleur
ade0363224
Module status
2018-11-19 15:46:20 +01:00
Laurent Destailleur
5f93315097
Clean code
2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64
FIX Link between action and project must use field not the link table
2018-11-19 14:38:30 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export
2018-11-19 12:17:41 +01:00
Laurent Destailleur
824b1924e2
Fix loading of cronjob
2018-11-19 10:33:42 +01:00
Alexandre SPANGARO
2d55666a0b
NEW Add gender in member card
2018-11-18 21:50:58 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php
2018-11-17 11:33:01 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
François J
a5777d30e1
Fix Contact Agenda events filter when no Third Party
...
Handle case where the contact is not linked to any third party.
2018-11-16 10:09:25 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Laurent Destailleur
6d640ab83c
Fix feature to drag and drop rows of table (not generic)
2018-11-15 19:58:06 +01:00
Regis Houssin
2350908d4e
FIX change getEntity doc and changelog
2018-11-15 19:00:14 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
...
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
f3228dc4f8
Merge pull request #10010 from atm-john/Fix_cat_photo_upload
...
Fix event message on upload category picture fail
2018-11-15 16:43:59 +01:00
Laurent Destailleur
f2fba05475
Merge branch 'develop' into new_branch_13_11_2018
2018-11-15 16:23:54 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Laurent Destailleur
3ca45e0e40
Fix double dot in sql filename
2018-11-15 10:59:55 +01:00
Regis Houssin
0907a6d611
FIX wrong object name (travis error)
2018-11-14 16:55:14 +01:00
Regis Houssin
874e27ef84
FIX multicompany override constants of current entity
2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4
FIX new method: override constants of current entity
2018-11-14 15:34:39 +01:00
Regis Houssin
2bc25fc008
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-14 15:24:41 +01:00
Regis Houssin
9ff4b31843
FIX compatibility with invoice sharing and invoice number sharing
2018-11-14 15:24:22 +01:00
Laurent Destailleur
a7989eb893
Fix menu
2018-11-14 13:55:10 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Regis Houssin
04edcaa89c
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-13 20:20:46 +01:00
John BOTELLA
c6cf748ba7
Fix envent message on upload category picture
2018-11-13 14:44:10 +01:00
Laurent Destailleur
77582b2a41
FIX the autofocus feature
2018-11-13 11:36:57 +01:00
John BOTELLA
500bb7bc96
best conditions testing
2018-11-13 10:20:34 +01:00
Philippe GRAND
2ed060a070
fix: Invalid argument supplied for foreach()
2018-11-13 10:07:04 +01:00
Laurent Destailleur
628918f863
Remove var_dump
2018-11-12 16:43:33 +01:00
Laurent Destailleur
01e7b5747d
FIX user param is null not 0 when not defined
...
FIX properties email_xx were not set
2018-11-12 15:27:59 +01:00
François J
10dd5652ee
Add SELECT DISTINCT to show_actions_done() SQL request
2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4
Join llx_actioncomm_resources only if we have a contact object.
2018-11-12 12:20:07 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
ca3510e889
Merge pull request #9994 from ptibogxiv/patch-91
...
Fix Invalid argument supplied for foreach()
2018-11-11 17:30:06 +01:00
patrick Delcroix
fa9ecd9f97
clean: align with upstream
2018-11-10 15:46:51 +01:00
patrick Delcroix
e9d3db084a
new: link to the compta-files.php in the accountancy left menu
2018-11-10 15:35:56 +01:00
ptibogxiv
80782a366e
Fix Invalid argument supplied for foreach()
2018-11-10 15:04:38 +01:00
ptibogxiv
5c96689c87
Fix Invalid argument supplied for foreach()
2018-11-10 15:02:50 +01:00
delcroip
e0bae07f97
NEW:Invoice creation from task Time
2018-11-10 14:31:26 +01:00
Laurent Destailleur
e86e3ec7ac
Work on email collector
2018-11-09 19:30:44 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
9d15f83f4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/stats/index.php
2018-11-08 20:19:28 +01:00
Laurent Destailleur
4ced94f5fd
Merge pull request #9974 from frederic34/previewimage
...
can click on image to preview in doc list
2018-11-08 20:06:38 +01:00
Laurent Destailleur
9a31a61c9d
FIX #9971
2018-11-08 20:05:01 +01:00
Laurent Destailleur
01baddb096
Merge pull request #9959 from hregis/8.0_bug
...
FIX export only prices of the current entity !
2018-11-08 19:26:09 +01:00
Laurent Destailleur
588de2cc86
Fix filter on entity on project
2018-11-08 18:45:02 +01:00
Laurent BOUQUET
320e7adef7
Fix blank lines and whitespace at end of lines
2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f
Merge branch 'develop' into feature/product-search-barcode
2018-11-08 16:57:49 +01:00
Laurent Destailleur
c55f83b0b7
Fix multicompany filter missing
2018-11-08 11:25:29 +01:00
Laurent Destailleur
22170ac1c1
FIX Crop of large files was selecting wrong image area.
2018-11-08 10:45:39 +01:00
Laurent Destailleur
5bbf7e8f1d
Fix look and feel v8
2018-11-08 10:21:43 +01:00
Laurent Destailleur
c74ad61365
Fix look and feel v8
2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796
Fix look and feel v8
2018-11-08 09:51:46 +01:00
Frédéric FRANCE
3ba3a47f20
close window
2018-11-07 22:04:55 +01:00
Frédéric FRANCE
df224e4b54
can click on image to preview in doc list
2018-11-07 21:51:05 +01:00
François J
121297b5bd
SQL Join actioncomm_resources
2018-11-07 17:10:51 +01:00
François J
aea01b3208
NEW Work with new table actioncomm_resources and multiple contact affectation
2018-11-07 17:04:18 +01:00
Laurent Destailleur
6ba78b2bb3
Work on email collector
2018-11-07 16:33:06 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599
Fix extrafields
2018-11-07 12:25:22 +01:00
John BOTELLA
4f7be36249
fix extrafield hidden
2018-11-07 09:14:29 +01:00
Laurent Destailleur
c1cf4fbb95
Fix phpcs
2018-11-06 20:29:58 +01:00
Laurent Destailleur
e0070bd348
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2018-11-06 18:30:57 +01:00
Regis Houssin
d32fd9fda5
FIX export only prices of the current entity !
2018-11-06 18:08:29 +01:00
Laurent Destailleur
7e33af6677
Fix max size
2018-11-06 17:40:59 +01:00
Laurent Destailleur
1e801c7c8a
Fix css
2018-11-06 16:50:31 +01:00
François J
29c71b31fe
[New] Add Presend form & Actions to send emails to Contact card
...
Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.
2018-11-06 16:40:39 +01:00
Laurent Bouquet
f05b67909b
NEW : Add product search from barcode via REST api
2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900
NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and
...
SHIPPING_PDF_HIDE_QTYTOSHIP
2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008
Code comment
2018-11-06 09:39:22 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518
Debug modulebuilder
2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87
Debug new modules
2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Laurent Destailleur
4c591daab1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2018-11-05 10:39:22 +01:00
Laurent Destailleur
90729c03c4
Fix dependencies of new modules
2018-11-05 10:28:44 +01:00
Laurent Destailleur
56a70ab4e5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-05 10:23:15 +01:00
Laurent Destailleur
1afdf7a961
Merge pull request #9947 from bafbes/abb80042
...
New : help picto for fields in creation
2018-11-05 09:54:42 +01:00
Laurent Destailleur
7c3cb7d73c
Update commonfields_add.tpl.php
2018-11-05 09:54:11 +01:00
Laurent Destailleur
90d3b80efb
NEW Add email in event histor for reminder email of expired subsription
2018-11-03 22:53:55 +01:00
Laurent Destailleur
67fbb3dbb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Laurent Destailleur
7e55701774
2 remind of subscription expired by default
2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2
2 remind of expired subscription by default
2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178
Fix family of module
2018-11-03 11:38:29 +01:00
Abbes Bahfir
5f4d644cab
New : help picto for fields in creation
2018-11-03 11:12:50 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
4b402aa6d1
Fix regression on name of array
2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94
FIX Error generating ODT when option to use contact on doc on
2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f
Debug v9
2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2018-10-31 11:50:29 +01:00
Laurent Destailleur
866729cd21
FIX bad link in notification
2018-10-30 22:32:42 +01:00
Laurent Destailleur
c764d7f8d5
Fix remove var_dump
2018-10-30 21:34:17 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Marc de Lima Lucio
2fbc305683
FIX: task time screen: last fix was overkill
2018-10-30 16:00:56 +01:00
Laurent Destailleur
a3e49f021d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 15:32:25 +01:00
Laurent Destailleur
2c3cd7a668
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSyslog.class.php
2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58
Fix phpcs
2018-10-30 15:30:04 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias
...
FIX missing name alias field in societe import/export #9091
2018-10-30 15:00:34 +01:00
Laurent Destailleur
0c77f6c3c5
Merge pull request #9918 from bafbes/abb80041
...
Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject
2018-10-30 14:52:23 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27
...
make play and playdisable equals
2018-10-30 14:49:54 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change
...
Fix changing currency in a doc was recalculating amounts in company currency #9801
2018-10-30 14:48:46 +01:00
Laurent Destailleur
4a71374cf7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-30 14:28:25 +01:00
Laurent Destailleur
7a268d8d9f
Clean code
2018-10-30 14:27:14 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug
...
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-30 14:16:29 +01:00
Laurent Destailleur
d309f22e55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf
FIX #9907
2018-10-30 13:54:11 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
...
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php
2018-10-30 12:41:06 +01:00
Marc de Lima Lucio
8911d72be8
FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do
2018-10-30 12:28:04 +01:00
Laurent Destailleur
bddd658ba6
Merge pull request #9885 from frederic34/patch-15
...
code comment html form class
2018-10-30 12:27:19 +01:00
Laurent Destailleur
4ef0d2ce82
Merge branch 'develop' into 8.0_dict
2018-10-30 12:26:37 +01:00
Laurent Destailleur
2ced09e8ab
Merge pull request #9888 from aljawaid/patch-3
...
FIX: Expense Report Ref Not Showing in PDF File Properties
2018-10-30 12:20:12 +01:00
Laurent Destailleur
f88b922d9d
Merge pull request #9908 from frederic34/patch-26
...
Update box_graph_product_distribution.php
2018-10-30 12:19:45 +01:00
Laurent Destailleur
5935a420a8
Merge pull request #9886 from frederic34/catchblockempty
...
fill empty catch with log
2018-10-30 12:16:41 +01:00
Abbes Bahfir
7f7df8d001
Fix: To be possibly intercepted : create, update and delete of the object instead of commonobject must be called
2018-10-30 09:03:33 +01:00
Vaadasch
0d7dbace63
Update extrafields.class.php
2018-10-30 07:20:42 +01:00
Vaadasch
a4c7787d8c
Update extrafields.class.php
2018-10-29 22:00:08 +01:00
Frédéric FRANCE
450a837393
make play and playdisable equals
2018-10-29 18:50:15 +01:00
Laurent Destailleur
0266db7aa8
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:19:40 +01:00
Laurent Destailleur
27d82d0e8e
FIX Delete of draft invoice
2018-10-29 14:41:00 +01:00
Regis Houssin
977a88363e
FIX missing multidir_output for supplier modules
2018-10-29 12:50:40 +01:00
Regis Houssin
6e2d62bea6
FIX wrong entity id
2018-10-29 12:30:36 +01:00
Laurent Destailleur
0500f54237
Email collector
2018-10-29 11:29:08 +01:00
Laurent Destailleur
7785cae9aa
Code comment
2018-10-29 03:46:45 +01:00
Laurent Destailleur
fcfb9746a8
Fix trackid when email sent from mass actions
2018-10-29 03:42:02 +01:00
Laurent Destailleur
08862fb482
Log success of emails
2018-10-29 03:25:21 +01:00
Laurent Destailleur
b4600fdc06
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/js/timesheet.js
2018-10-29 02:31:05 +01:00
Laurent Destailleur
04f80f0925
FIX Do not show check box if not applicable
2018-10-29 02:27:51 +01:00
Laurent Destailleur
553e984465
FIX Selection of addmaindocfile is lost on error
2018-10-29 02:14:41 +01:00
Laurent Destailleur
244c7f8dc3
FIX thirdparty property of object not loaded when only one record
2018-10-29 02:14:36 +01:00
Laurent Destailleur
6e3822345c
Fix use setup of template for attached files in mass actions
2018-10-29 02:14:31 +01:00
Laurent Destailleur
770f8c3f3b
FIX Selection of addmaindocfile is lost on error
2018-10-29 02:11:33 +01:00
Laurent Destailleur
dbb2168b83
FIX thirdparty property of object not loaded when only one record
2018-10-29 02:02:43 +01:00
Laurent Destailleur
f8a49edf78
Fix use setup of template for attached files in mass actions
2018-10-29 00:55:55 +01:00
Frédéric FRANCE
9b3fc6527c
Update box_graph_product_distribution.php
2018-10-28 23:50:13 +01:00
Maxime Kohlhaas
b68b8fe412
Fix changing currency in a doc was recalculating amounts in company currency #9801
2018-10-28 11:02:51 +01:00
Vaadasch
2b91067966
Update working chkbxlst filter
...
Update line 1337 to make the filtering on chkbxlst working
2018-10-27 19:31:50 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
f29ee25ea7
remove fieldlabel and add fieldeditkey
2018-10-27 11:06:45 +02:00
Regis Houssin
fdde88cbe6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug
2018-10-27 11:01:06 +02:00
Maxime Kohlhaas
abb343d37e
Fix missing name alias field in societe import/export #9091
2018-10-27 09:42:08 +02:00
IJ
71c64c0944
FIX: Expense Report Ref Not Showing in PDF File Properties
...
The generated pdf title field in the pdf file document properties was blank. This fixes that.
2018-10-27 01:57:07 +01:00
Frédéric FRANCE
b80d2fa12d
fill empty catch with log
2018-10-26 21:09:46 +02:00
Frédéric FRANCE
47ac420133
code comment html form class
2018-10-26 20:12:46 +02:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Regis Houssin
866a7df510
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-26 18:23:48 +02:00
Laurent Destailleur
087b68948d
Fix: do not use point for graph with too many points.
2018-10-26 17:32:32 +02:00
De Coninck Laurent
d347cf3a85
set a message
2018-10-26 16:18:27 +02:00
Laurent Destailleur
4955ae03e8
Merge pull request #9867 from atm-john/develop_jflot
...
FIX hover stability and modernize style
2018-10-26 15:33:47 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto
...
improve img_picto by returning ASAP
2018-10-26 15:20:40 +02:00
Laurent Destailleur
e875aee2c5
Merge pull request #9868 from atm-ph/fix_develop_php_warnings_in_js
...
Fix PHP warnings printed in javascript
2018-10-26 15:19:21 +02:00
Laurent Destailleur
ed0393dfa8
Merge pull request #9875 from atm-john/Fix_title
...
FIX title
2018-10-26 15:14:44 +02:00
Laurent Destailleur
35421d135a
FIX Total of timespent
...
Conflicts:
htdocs/core/js/timesheet.js
2018-10-26 15:04:02 +02:00
Laurent Destailleur
20d7c8bb8c
FIX Total of timespent
2018-10-26 15:01:50 +02:00
Laurent Destailleur
5d249d71ca
Fix menu at wrong place
2018-10-26 14:38:26 +02:00
atm-john
8a9b9f1736
Fix title
2018-10-25 21:53:48 +02:00
atm-john
759b2b6ccf
Extend import option to Order's card and Propal's card
2018-10-25 21:39:22 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
De Coninck Laurent
70cd68ebef
improve img_picto by returning ASAP
...
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
2018-10-25 18:21:00 +02:00
Laurent Destailleur
9ccdd10a81
FIXx format (html/text) of emails sent on leave request module
2018-10-25 13:19:56 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
Marc de Lima Lucio
16c35035c1
FIX: pdf typhon: order reference duplicate
2018-10-25 12:07:40 +02:00
atm-ph
f41e7e05e1
Fix PHP warnings printed in javascript
2018-10-25 12:01:17 +02:00
atm-john
d0dc8b2a9c
Add points to lines charts and remove shadow to improve performances
2018-10-25 00:24:25 +02:00
atm-john
b5c47f16e6
Fix hover stability and modernize style
2018-10-24 23:25:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-24 13:31:31 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9
2018-10-24 12:24:00 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
aa0bcc6878
Fix phpcs
2018-10-24 11:15:14 +02:00
John BOTELLA
fccea99e23
FIX translation in select unit form
2018-10-24 10:23:27 +02:00
Frédéric FRANCE
2bc208675f
Update pdf_cyan.modules.php
2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2
Update pdf_sponge.modules.php
2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39
Update pdf_eratosthene.modules.php
2018-10-24 08:18:21 +02:00
Laurent Destailleur
eaab953ba2
Renamed mouvement.php into movement_list.php to follow dev rules
2018-10-24 03:50:18 +02:00
Laurent Destailleur
65a39269d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
Laurent Destailleur
047d130081
Fix phpcs
2018-10-24 03:38:12 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f0dc2df526
Fix code comment
2018-10-24 03:30:06 +02:00
Laurent Destailleur
0f48cc1d0f
Merge branch 'develop' into fixpdf
2018-10-24 03:01:52 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
612e3a9805
Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
...
into aspangaro-9.0_accountancy
# Conflicts:
# htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
# htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
# htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
4060dd5377
Merge pull request #9826 from frederic34/patch-9
...
Update ajax.lib.php
2018-10-24 02:29:20 +02:00
Laurent Destailleur
ddd267f4c3
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-24 02:21:53 +02:00
Laurent Destailleur
4b4d422126
Merge pull request #9835 from frederic34/patch-20
...
Update ajaxdirtree.php
2018-10-24 02:21:19 +02:00
Laurent Destailleur
83dacf6290
Merge pull request #9845 from frederic34/patch-22
...
remove deprecated form_confirm
2018-10-24 02:06:54 +02:00
Laurent Destailleur
f10cb76597
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5
Disable duplicate feature with emailing module and field "unsubscribe
...
requested"
2018-10-24 02:00:43 +02:00
Laurent Destailleur
03b93781a0
Merge pull request #9848 from bafbes/abb80038
...
New : parameter for getnomurl in field specification
2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359
Update commonobject.class.php
2018-10-24 01:53:07 +02:00
Laurent Destailleur
f8ea9e7099
Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref
...
NEW hidden conf to search product by supplier ref
2018-10-24 01:48:17 +02:00
Laurent Destailleur
914e4f0501
Merge pull request #9855 from atm-john/Fix_printer
...
FIX/ADD missing print button for delivery form
2018-10-24 01:46:20 +02:00
Laurent Destailleur
c6cfb977bb
Merge pull request #9852 from atm-john/fix_develop_travis
...
Fix travis messages
2018-10-24 01:45:12 +02:00
Laurent Destailleur
54b0fa1057
Merge pull request #9846 from bafbes/abb80037
...
Fix:empty value instead of 0 for empty links
2018-10-24 01:43:37 +02:00
atm-john
82f40fb4b9
NEW hidden conf to search by supplier ref
2018-10-23 23:21:30 +02:00
atm-john
0fe2c63bc0
FIX missing print button for delivery form
2018-10-23 22:11:39 +02:00
John BOTELLA
d9965d1986
Fix travis messages
2018-10-23 17:18:30 +02:00
atm-quentin
04eb9ca167
fix dont change num version
2018-10-23 17:06:21 +02:00
atm-quentin
52236d1f0c
set to development module
2018-10-23 15:58:38 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
Laurent Destailleur
e0b20c2632
Add holiday for India
2018-10-23 12:49:48 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
Abbes Bahfir
7e7473e7df
New : parameter for getnomurl in field dpecification
2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6
Fix:empty value instead of 0 for empty links
2018-10-23 00:03:34 +01:00
Frédéric FRANCE
90b85c1106
Update html.form.class.php
2018-10-22 22:23:43 +02:00
Frédéric FRANCE
e49f2bc562
Update document_actions_post_headers.tpl.php
2018-10-22 22:20:26 +02:00
Frédéric FRANCE
4aec343b24
Update html.form.class.php
2018-10-22 22:13:54 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf
2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541
NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF
2018-10-22 20:06:03 +02:00
Laurent Destailleur
bf46a35a31
Fix size of key for extrafield of type select
2018-10-22 19:05:04 +02:00
atm-quentin
7684d7bddd
FIX export comment better than desc of order line
2018-10-22 15:51:47 +02:00
ATM-Nicolas
cf28e4e442
FIX : Variable name
2018-10-22 15:19:33 +02:00
Alexandre SPANGARO
3f79580b19
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-22 06:33:34 +02:00
Laurent Destailleur
4e6b21881f
Fix bug reported by scrutinizer
2018-10-21 12:14:20 +02:00
Laurent Destailleur
868caa4991
Missing ref_customer in popup
2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb
Fix thirdparty popup
2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f
Fix thirdparty popup
2018-10-21 11:55:25 +02:00
Laurent Destailleur
d38c68e54f
Remove unexpected char
2018-10-21 11:10:04 +02:00
Frédéric FRANCE
f169ec9259
Update ajaxdirtree.php
2018-10-21 10:37:49 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php
2018-10-19 22:52:18 +02:00
Frédéric FRANCE
042118fe38
fix it
2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf
2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
...
Experimental new pdf documents using new column system
2018-10-19 15:51:54 +02:00
Laurent Destailleur
897a2b09a7
Removed scrutinizer warning
2018-10-19 15:02:54 +02:00
Laurent Destailleur
e4b5cc154e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5
Fix regression in creating discount
2018-10-19 14:43:10 +02:00
Laurent Destailleur
4e82a6da46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
91745491ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-19 14:27:37 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
47abbd3eb2
Fix bad merge
2018-10-19 14:23:36 +02:00
Laurent Destailleur
36ae81c749
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18
...
Update menubase.class.php
2018-10-19 13:44:11 +02:00
Laurent Destailleur
762d82f2fe
Move declaration into common
2018-10-19 13:38:05 +02:00
Laurent Destailleur
c13e555d5f
Merge pull request #9811 from frederic34/patch-24
...
use strict comparaison
2018-10-19 13:17:24 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15
...
Update html.formmail.class.php
2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9
...
add errors def to form class
2018-10-19 13:01:31 +02:00
Laurent Destailleur
c4e67de5c9
Merge pull request #9814 from Mavyre/patch-2
...
Fixed all resources displaying on add in projects, events...
2018-10-19 12:57:07 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt
...
add log and comment
2018-10-19 12:53:54 +02:00
Laurent Destailleur
696023c1aa
NEW Enhancement in the generic file manager
2018-10-19 12:47:59 +02:00
Laurent Destailleur
985ab1efda
FIX delete of a file in file_manager return to same dir
2018-10-19 10:59:34 +02:00
Mavyre
32a3779d23
Fixed all ressources displaying
2018-10-18 22:08:23 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment
2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison
2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b
Code comment and debug filemanager
2018-10-18 21:22:30 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15
2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9
2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18
2018-10-18 20:39:45 +02:00
atm-greg
f0849aaf81
schedule as a tab
2018-10-18 17:16:38 +02:00
atm-quentin
ba997a0d0f
FIX for mask
2018-10-18 14:48:20 +02:00
Laurent Destailleur
52840478c0
Clean code
2018-10-17 21:11:07 +02:00
atm-quentin
8ef7c29d19
FIX PDF Total Ordered
2018-10-17 17:17:11 +02:00
gauthier
aea7299970
FIX : use discount with multicurrency
2018-10-17 15:49:08 +02:00
atm-quentin
dd0a57d39e
FIX pdf for creating invoice without massaction
2018-10-17 15:36:47 +02:00
Laurent Destailleur
a66256a799
FIX Hover on the filemanager
2018-10-17 13:22:52 +02:00
Alexandre SPANGARO
e614d33aa4
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-17 05:57:22 +02:00
