Laurent Destailleur
|
1251807f54
|
Fix several pb in links to projects on create page
|
2017-12-12 10:37:51 +01:00 |
|
Laurent Destailleur
|
bb7c03906e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
|
2017-12-11 15:25:09 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
Laurent Destailleur
|
09d3db145b
|
Merge
|
2017-12-08 13:10:13 +01:00 |
|
Regis Houssin
|
1b16eb731d
|
Fix: missing load product translation file
|
2017-12-08 11:00:23 +01:00 |
|
Regis Houssin
|
1bdffa961f
|
Fix: wrong translation if multilang activated
|
2017-12-08 10:41:14 +01:00 |
|
Laurent Destailleur
|
50150cf897
|
Merge pull request #7918 from atm-maxime/develop
Fix scrutinizer
|
2017-12-08 10:35:24 +01:00 |
|
Maxime Kohlhaas
|
8a39e2a413
|
Fix : no need for action button on cards, link is now available
|
2017-12-07 00:36:23 +01:00 |
|
Maxime Kohlhaas
|
0fa77160d9
|
Fix scrutinizer
|
2017-12-06 23:21:58 +01:00 |
|
Laurent Destailleur
|
2e2ab54d19
|
Fix parameter in delete line
|
2017-12-03 20:51:26 +01:00 |
|
Laurent Destailleur
|
1f4a079f01
|
Fix bug reported by scrutinizers
|
2017-12-02 15:03:14 +01:00 |
|
Laurent Destailleur
|
e8327fd9a1
|
Fix the eatby/sellby date was not visible.
|
2017-12-02 10:43:01 +01:00 |
|
Laurent Destailleur
|
0a73daba01
|
Security: on target=_blank, we must have rel="noopener"
|
2017-12-02 03:04:52 +01:00 |
|
Laurent Destailleur
|
ce32da6217
|
Fix debugs APIs
|
2017-12-01 15:39:18 +01:00 |
|
Laurent Destailleur
|
670465fcd8
|
Fix responsive and search
|
2017-12-01 12:01:17 +01:00 |
|
Laurent Destailleur
|
c269dcc4d5
|
Fix scrutinizer
|
2017-11-29 17:58:13 +01:00 |
|
Laurent Destailleur
|
682afe8918
|
Fix scrutinizer
|
2017-11-29 16:25:12 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
Laurent Destailleur
|
0b9a3087ea
|
Fix bug reported by scrutinizer
|
2017-11-25 12:11:02 +01:00 |
|
Laurent Destailleur
|
944d666d1a
|
Fix bugs
|
2017-11-25 11:27:24 +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
|
b052722cf1
|
Merge pull request #7861 from hregis/develop_member
Fix: wrong table name and id field name
|
2017-11-24 16:36:22 +01:00 |
|
Laurent Destailleur
|
9c22b5f335
|
Replace deprecated dol_print_graph with DolGraph
|
2017-11-23 20:24:05 +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 |
|
Regis Houssin
|
2a7b04e795
|
Fix: wrong table name and id field name
|
2017-11-23 12:18:49 +01:00 |
|
Laurent Destailleur
|
5b77fe393e
|
Fix: contact not preselected
|
2017-11-23 00:59:43 +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
|
46d1318a32
|
Merge pull request #7828 from papoteur-mga/develop
Fix:[proposals]Allow lines to be added from REST API
|
2017-11-22 11:16:32 +01:00 |
|
Laurent Destailleur
|
ff9a62e519
|
Fix trackid from emailings
|
2017-11-21 11:15:33 +01:00 |
|
Papoteur
|
dfffd7497e
|
Correction of the previous commit.
Place the convertion into object at the good place.
|
2017-11-19 11:46:34 +01:00 |
|
Papoteur
|
f3f182b5bc
|
[proposals]Allow lines to be added from REST API
Prevously, only void lines was added. Need to convert array lines to object in this case.
|
2017-11-18 16:21:54 +01:00 |
|
atm-ph
|
fbc761cbac
|
Fix rename TContactId into socpeopleassigned
|
2017-11-18 12:36:03 +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
|
481b810fd2
|
Merge pull request #7810 from frederic34/patch-1
fix trigger when module not enabled
|
2017-11-17 12:59:59 +01:00 |
|
Laurent Destailleur
|
4f25bc5e3b
|
NEW detection of edge browser
|
2017-11-16 14:44:55 +01:00 |
|
Frédéric FRANCE
|
0d79cc50b0
|
Merge remote-tracking branch 'upstream/develop' into patch-1
|
2017-11-16 13:41:24 +01:00 |
|
Laurent Destailleur
|
a7aa3ee438
|
Rename file
|
2017-11-16 12:21:21 +01:00 |
|
Laurent Destailleur
|
c527189088
|
Standardize page name
|
2017-11-16 12:18:25 +01:00 |
|
Laurent Destailleur
|
19d0283b63
|
Fix doxygen
|
2017-11-16 12:13:23 +01:00 |
|
Laurent Destailleur
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +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
|
0e2f64af72
|
CSS
|
2017-11-14 12:18:02 +01:00 |
|
Laurent Destailleur
|
fa92c53ff6
|
Fix pb when showing dictionaries
|
2017-11-14 11:13:24 +01:00 |
|
Frédéric FRANCE
|
96031b0787
|
Update listactions.php
|
2017-11-14 11:05:58 +01:00 |
|
Laurent Destailleur
|
11cb9c0d81
|
Code simpler
|
2017-11-14 01:57:50 +01:00 |
|
Laurent Destailleur
|
d0d1d646fd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-14 01:35:16 +01:00 |
|
Laurent Destailleur
|
3dc06977af
|
Update listactions.php
|
2017-11-14 01:33:44 +01:00 |
|
Laurent Destailleur
|
a12186a0b8
|
Use HTTP response code 304 instead of 500 when nothing is done
|
2017-11-14 01:26:02 +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
|
1a5bbef266
|
FIX Locatax were not propagated when cloning order or proposal
|
2017-11-13 13:07:31 +01:00 |
|
alexis Algoud
|
19a2c2fe06
|
Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop
|
2017-11-13 10:05:29 +01:00 |
|
Laurent Destailleur
|
9a8423ba5e
|
Start to show work on repeat events
|
2017-11-13 02:46:13 +01:00 |
|
Laurent Destailleur
|
90615a8682
|
Fix busy tag not set sometimes
|
2017-11-13 02:44:02 +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 |
|
Alexis Algoud
|
7922fd0281
|
NEW add burger menu to list action comm
|
2017-11-11 18:41:35 +01:00 |
|
Laurent Destailleur
|
d1860b87f8
|
NEW Add a confirmation for all mass action 'delete'
|
2017-11-11 16:34:11 +01:00 |
|
Laurent Destailleur
|
d938a56282
|
Clean code
|
2017-11-11 01:10:17 +01:00 |
|
Laurent Destailleur
|
ea5dd3eb3d
|
NEW Add REST API for supplier proposals
|
2017-11-06 11:06:31 +01:00 |
|
Laurent Destailleur
|
a329f7dc75
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
|
2017-11-05 18:50:14 +01:00 |
|
Laurent Destailleur
|
d3a0cff30a
|
Merge pull request #7755 from frederic34/currency
default currency on propal create
|
2017-11-05 18:28:40 +01:00 |
|
Laurent Destailleur
|
bac6a434f4
|
Add link to make a direct download on card
|
2017-11-04 17:11:58 +01:00 |
|
Laurent Destailleur
|
048766bd24
|
Fix sql error
|
2017-11-03 17:24:14 +01:00 |
|
Laurent Destailleur
|
c479efa480
|
Fix encoding with select2
|
2017-11-03 16:29:23 +01:00 |
|
Frédéric FRANCE
|
b58df17545
|
default currency on propal create
|
2017-11-02 18:14:55 +01:00 |
|
gauthier
|
03544f783a
|
FIX : Wrong alias sql
|
2017-11-02 16:16:29 +01:00 |
|
Laurent Destailleur
|
310bf4bde4
|
Update peruser.php
|
2017-11-02 15:51:35 +01:00 |
|
Laurent Destailleur
|
ec3a07cd52
|
Try to restore compatibility when actioncode=CODE1,CODE2,...
|
2017-11-02 15:50:55 +01:00 |
|
Laurent Destailleur
|
63a363080e
|
Update index.php
|
2017-11-02 15:48:56 +01:00 |
|
Laurent Destailleur
|
323a0d7d0d
|
Update index.php
|
2017-11-02 15:48:24 +01:00 |
|
Laurent Destailleur
|
1b28c45e2c
|
PERF Links in getNomUrl use only one tag a instead of 2.
|
2017-11-02 15:19:14 +01:00 |
|
gauthier
|
b7cf434ebd
|
FIX : Filter type on actioncomm with multiselect doesn't work
|
2017-11-02 14:58:33 +01:00 |
|
Laurent Destailleur
|
c226fc69d1
|
Update actioncomm.class.php
|
2017-11-02 10:45:27 +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
|
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 |
|
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
|
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
|
708666349f
|
Minor fix
|
2017-10-26 18:35:32 +02:00 |
|
Laurent Destailleur
|
8058712d47
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
|
2017-10-26 17:06:11 +02:00 |
|
Laurent Destailleur
|
67208b111d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2017-10-26 17:02:40 +02:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Laurent Destailleur
|
f24204c79a
|
Error management after extrafield update
|
2017-10-24 19:04:40 +02:00 |
|
Laurent Destailleur
|
9f0f5eb5e8
|
Fix translation of extrafields type
|
2017-10-24 18:05:43 +02:00 |
|
Laurent Destailleur
|
c6e5115d34
|
Set default limit to 100 on all rest api that list
|
2017-10-22 15:42:19 +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 |
|
Juanjo Menent
|
75580f253e
|
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
|
2017-10-20 12:57:32 +02:00 |
|
Laurent Destailleur
|
f7556e7ad2
|
FIX make of link to other object during creation
|
2017-10-19 19:06:48 +02:00 |
|
TuxGasy
|
9c3805c0d5
|
Fix anchor after add line
|
2017-10-19 14:10:58 +02:00 |
|
Laurent Destailleur
|
93d16bf4d7
|
Fix several fixes in APIs
|
2017-10-19 12:30:36 +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 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
74b401b70d
|
Fix bad perm to delete file
|
2017-10-18 17:40:47 +02:00 |
|
Laurent Destailleur
|
8626d6279a
|
Fix perm to delete files
|
2017-10-18 17:21:30 +02:00 |
|
Laurent Destailleur
|
66538c7c0f
|
Position of method
|
2017-10-18 11:34:49 +02:00 |
|
Laurent Destailleur
|
037b90f2f3
|
NEW The comment when closing a proposal is added to commercial proposal
|
2017-10-18 11:23:16 +02:00 |
|
Laurent Destailleur
|
b124c7f16d
|
Clean params
|
2017-10-18 11:15:54 +02:00 |
|
Laurent Destailleur
|
000c1bddb2
|
Fix we lose the private not when closing proposal
|
2017-10-18 11:12:59 +02:00 |
|
Laurent Destailleur
|
d40dda83cf
|
Add API "close" for proposals
Standardize code
|
2017-10-18 11:10:08 +02:00 |
|
Laurent Destailleur
|
eb1fdca157
|
NEW Can create intervention from a proposal
|
2017-10-17 10:44:18 +02:00 |
|
Laurent Destailleur
|
082d59439f
|
Fix add missing seconds when adding event so sort order on date is ok
|
2017-10-17 10:43:37 +02:00 |
|
Laurent Destailleur
|
45ac8367bd
|
NEW Add API for contracts
|
2017-10-16 17:56:59 +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 |
|
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
|
7c9993ef0e
|
Various fixes
|
2017-10-13 12:14:57 +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 |
|
Laurent Destailleur
|
558f261b60
|
FIX #7593
|
2017-10-13 01:03:33 +02:00 |
|
Laurent Destailleur
|
8c5cf9ea45
|
Fix date output
|
2017-10-12 18:04:47 +02:00 |
|
Laurent Destailleur
|
084dc7798d
|
Standardize use of function getCommonSubstitutionArray
|
2017-10-09 14:51:42 +02:00 |
|
Laurent Destailleur
|
af1d2bfffd
|
Standardize code
|
2017-10-07 14:11:01 +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
|
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 |
|
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 |
|
Laurent Destailleur
|
ed467aa74b
|
FIX Only modified values must be modified
|
2017-10-06 15:01:31 +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 |
|
Laurent Destailleur
|
85606126a9
|
Standardize code for events
|
2017-10-04 12:58:13 +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 |
|
Regis Houssin
|
09e71f1390
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-10-02 11:51:27 +02:00 |
|
Laurent Destailleur
|
3f3a5e0921
|
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
New custom meteo
|
2017-10-02 00:48:52 +02:00 |
|
Laurent Destailleur
|
0e15aef44f
|
CSS
|
2017-09-30 00:30:58 +02:00 |
|
Laurent Destailleur
|
f007f9e7e5
|
NEW Add new property visible dy default on lists on extrafields
|
2017-09-29 13:26:44 +02:00 |
|
Laurent Destailleur
|
f510f3062b
|
Clean param type
|
2017-09-28 17:41:18 +02:00 |
|
Laurent Destailleur
|
30a9e40f4e
|
Fix position of fields
|
2017-09-28 17:29:37 +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 |
|
gauthier
|
1694737e0b
|
NEW : new param on load_board() function in ActionComm class to avoid duplicate code
|
2017-09-27 10:09:21 +02:00 |
|
Laurent Destailleur
|
36b199e78c
|
Merge pull request #7433 from tysauron/patch-11
For use ajax combobox for societe and contacts in action card create.
|
2017-09-26 20:13:52 +02:00 |
|
gauthier
|
7f938bc517
|
NEW : unexistant function load_state_board() on several objects
|
2017-09-26 12:32:58 +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 |
|
Regis Houssin
|
d592664150
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-09-25 06:48:26 +02:00 |
|
Laurent Destailleur
|
e3da4188e2
|
GETPOST must not clean data for text input.
|
2017-09-25 00:16:52 +02:00 |
|
Laurent Destailleur
|
adb3827d1e
|
FIX #7475
|
2017-09-24 22:55:27 +02:00 |
|
Laurent Destailleur
|
3a7aea48d7
|
FIX #7475
|
2017-09-24 22:38:18 +02:00 |
|
Laurent Destailleur
|
252f038468
|
Mutualize code of substitutions for emails
|
2017-09-22 14:34:31 +02:00 |
|
Laurent Destailleur
|
e56840b9ec
|
Clean deprecated code
|
2017-09-21 11:35:18 +02:00 |
|
Laurent Destailleur
|
d71916af7b
|
Merge pull request #7437 from tysauron/patch-12
Rename "->fk_action" in "->type_id"
|
2017-09-21 11:26:38 +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 |
|
tysauron
|
5643d4e867
|
Rename "->fk_action" in "->type_id"
(is old name)
|
2017-09-19 17:26:18 +02:00 |
|
tysauron
|
0803e03ca9
|
For use ajax combobox for societe and contacts in action card create.
|
2017-09-19 14:53:34 +02:00 |
|
Laurent Destailleur
|
1e33495f42
|
Fix remove warnings
|
2017-09-19 00:31:51 +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 |
|
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
|
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 |
|
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 |
|
Laurent Destailleur
|
630dc92a13
|
NEW Mass PDF Merging is available on contracts
|
2017-09-16 15:39:52 +02:00 |
|
Laurent Destailleur
|
e56b41c1ae
|
Clean code
|
2017-09-16 13:28:13 +02:00 |
|
Laurent Destailleur
|
0cf67944fa
|
Clean code
|
2017-09-16 13:14:46 +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
|
b13dbf1f06
|
Clean code. Make selection of template working even if public.
|
2017-09-16 00:49:46 +02:00 |
|
Laurent Destailleur
|
2fcedcad74
|
Merge pull request #7410 from atm-florian/dev_better_propal_singend_form
NEW: confirm form style to accept or reject proposal
|
2017-09-15 18:58:25 +02:00 |
|
Laurent Destailleur
|
b63b0933e7
|
Update card.php
|
2017-09-15 18:57:39 +02:00 |
|
Regis Houssin
|
db17eb80ec
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
|
2017-09-15 16:45:49 +02:00 |
|
florian HENRY
|
c9df299418
|
NEW: confirm form style to accept or reject proposal
|
2017-09-15 16:06:25 +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
|
1a78e2a055
|
Mutualize/share code of all payments modes
|
2017-09-15 13:43:16 +02:00 |
|
florian HENRY
|
8b9b99ac40
|
fix : advance target emailing
|
2017-09-15 13:02:49 +02:00 |
|
Laurent Destailleur
|
e254554461
|
Code comment
|
2017-09-15 11:28:21 +02:00 |
|
Laurent Destailleur
|
1ffcb5d94e
|
FIX background color not visible in emailing view
|
2017-09-15 11:24:32 +02:00 |
|
Laurent Destailleur
|
0ade500535
|
Better support of text editor when no js available.
|
2017-09-15 11:19:56 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +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
|
ed9c401ca6
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-14 12:20:26 +02:00 |
|
Laurent Destailleur
|
a38bbdcc05
|
Merge pull request #7382 from hregis/6.0_bug3
Fix: hide bank account field if module disabled
|
2017-09-14 12:14:45 +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
|
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 |
|
Laurent Destailleur
|
149ab80b3a
|
The event array of an object is visible even if no event yet recorded.
|
2017-09-13 14:18:36 +02:00 |
|
Laurent Destailleur
|
939d33cce7
|
Fix bug reported by scrutinizer
|
2017-09-12 19:12:39 +02:00 |
|
Laurent Destailleur
|
47d2350ad4
|
Fix bugs reported by scrutinizer
|
2017-09-12 19:03:12 +02:00 |
|
Laurent Destailleur
|
71ce82b6b9
|
NEW Better autoselect customer or supplier fields to save clicks
|
2017-09-12 16:51:10 +02:00 |
|
Regis Houssin
|
cd888a2149
|
Fix: hide bank account field if module disabled
|
2017-09-12 15:13:12 +02:00 |
|
Laurent Destailleur
|
5dcbebbd46
|
NEW Add filters on month/year on the accountancy binding tools
|
2017-09-12 13:48:45 +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 |
|
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
|
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 |
|
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
|
03fe9d4e97
|
Escape all status
|
2017-09-08 13:23:12 +02:00 |
|
arnaud
|
8906c95eea
|
NEW comments system on task
|
2017-09-07 16:23:51 +02:00 |
|
Laurent Destailleur
|
bde293af22
|
Fix filter on extrafield with type sellist
|
2017-09-07 15:34:25 +02:00 |
|
Regis Houssin
|
66e548427c
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-09-07 10:50:35 +02:00 |
|
Laurent Destailleur
|
c5567fafd4
|
Enhancement for smartphone
|
2017-09-04 09:25:53 +02:00 |
|
Laurent Destailleur
|
e549e6cde1
|
Error management
|
2017-09-03 04:16:43 +02:00 |
|
Laurent Destailleur
|
4b9f54e571
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
|
2017-09-01 17:34:57 +02:00 |
|
Laurent Destailleur
|
61cf69f2bb
|
NEW Include a color syntaxed HTML editor for emailing edition.
|
2017-09-01 13:09:13 +02:00 |
|
atm-ph
|
8188abd4cd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-08-31 11:09:02 +02:00 |
|
Regis Houssin
|
8e8f94df11
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
|
2017-08-30 19:33:23 +02:00 |
|
Laurent Destailleur
|
d3c95e030b
|
Fix delete file not possible for external user even with permissions
|
2017-08-30 14:34:36 +02:00 |
|
Laurent Destailleur
|
7aa09d8b71
|
NEW Can create thirdparty from card proposal, order or invoice
|
2017-08-28 18:37:16 +02:00 |
|
Laurent Destailleur
|
a60cd49fb0
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
|
2017-08-28 12:53:02 +02:00 |
|
Laurent Destailleur
|
075a138e14
|
Fix substitution of __EMAIL__
|
2017-08-28 12:49:57 +02:00 |
|
Laurent Destailleur
|
c573df4f0e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/card.php
|
2017-08-26 22:33:56 +02:00 |
|
Laurent Destailleur
|
4052e15565
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/comm/action/card.php
|
2017-08-26 21:58:29 +02:00 |
|
Laurent Destailleur
|
54cc1ac800
|
Merge emailing target selectors.
|
2017-08-25 21:20:27 +02:00 |
|
Laurent Destailleur
|
d108d04add
|
NEW Can filter on the "other" column on emailing target list
|
2017-08-25 19:26:48 +02:00 |
|
Regis Houssin
|
1befd9c67f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-23 21:05:36 +02:00 |
|
Laurent Destailleur
|
90afbcb034
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
|
2017-08-23 17:02:53 +02:00 |
|
Laurent Destailleur
|
aae24c26a3
|
Some fixes with smartphones
|
2017-08-22 20:20:34 +02:00 |
|
Regis Houssin
|
2f537a1ade
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-22 18:49:40 +02:00 |
|
Regis Houssin
|
18ca96e285
|
Fix: file delete link doesn't work
|
2017-08-22 18:33:00 +02:00 |
|
Laurent Destailleur
|
2104ab9aed
|
Disable event reminder
|
2017-08-21 13:11:29 +02:00 |
|
Laurent Destailleur
|
8cd2235b4b
|
Start to introduce cron for email reminder.
|
2017-08-03 11:42:22 +02:00 |
|
Laurent Destailleur
|
fa752348c8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
|
2017-08-02 17:56:09 +02:00 |
|
Laurent Destailleur
|
47ac770d93
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/expedition/card.php
htdocs/expedition/list.php
|
2017-08-02 17:51:19 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
b6a7ce6822
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-01 10:22:37 +02:00 |
|
Laurent Destailleur
|
ddee802324
|
Add second parameter in GETPOST
|
2017-08-01 10:22:09 +02:00 |
|
Regis Houssin
|
0dc0fe81fc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-31 07:40:01 +02:00 |
|
Laurent Destailleur
|
cfebbe3cc4
|
Fix css
|
2017-07-31 03:16:28 +02:00 |
|
Laurent Destailleur
|
80f096a9d8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-31 02:09:15 +02:00 |
|
Laurent Destailleur
|
837afa0e65
|
Fix better way to get info for contact/thirdparty on agenda
|
2017-07-29 04:07:46 +02:00 |
|
Laurent Destailleur
|
2a36166839
|
Fix error method on non object
|
2017-07-29 02:11:45 +02:00 |
|
Laurent Destailleur
|
cae21d3937
|
Fix in agenda output per user/type (reduce memory usage)
|
2017-07-29 01:59:26 +02:00 |
|
Laurent Destailleur
|
60493d0a47
|
Several fixes (permission, missing method or class) in REST APIs
|
2017-07-28 11:03:30 +02:00 |
|
Laurent Destailleur
|
ec27eb5b1e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
|
2017-07-27 02:09:40 +02:00 |
|
Laurent Destailleur
|
bdfb0b7561
|
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
|
2017-07-26 21:22:53 +02:00 |
|
Regis Houssin
|
acd5780e32
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-26 08:58:56 +02:00 |
|
Laurent Destailleur
|
5b9ac2a7a9
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/index.php
|
2017-07-25 21:11:36 +02:00 |
|
Laurent Destailleur
|
dafe1194c4
|
Merge pull request #7100 from tuxgasy/develop_addmoresummary_hook
Close: add new hook addMoreBoxStatsCustomer
|
2017-07-25 20:32:10 +02:00 |
|
Laurent Destailleur
|
f4857af7aa
|
Update card.php
|
2017-07-25 20:31:41 +02:00 |
|
Laurent Destailleur
|
cba898e2b9
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
|
2017-07-25 10:12:28 +02:00 |
|
Laurent Destailleur
|
25b107defb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
|
2017-07-23 19:09:00 +02:00 |
|
Regis Houssin
|
26df1389f4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-07-21 20:42:21 +02:00 |
|
Laurent Destailleur
|
d07741ada1
|
Merge branch 'develop' into patch-rib
|
2017-07-21 14:58:33 +02:00 |
|
phf
|
885fc3c5b7
|
Fix lost search value in list if come from thirdparty card
|
2017-07-17 11:04:48 +02:00 |
|
Regis Houssin
|
200f232164
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-16 07:51:20 +02:00 |
|
Laurent Destailleur
|
312b153005
|
Fix phpcs
|
2017-07-13 23:46:01 +02:00 |
|
Laurent Destailleur
|
4ee70e496e
|
Merge pull request #7143 from hregis/6.0_bug
Fix: missing entity filter (multicompany)
|
2017-07-13 14:33:45 +02:00 |
|
Laurent Destailleur
|
bea3ced763
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-07-13 14:32:03 +02:00 |
|
Laurent Destailleur
|
58ce8eaf46
|
Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing
Fix AdvtargetEmailing
|
2017-07-13 14:26:23 +02:00 |
|
Laurent Destailleur
|
743de4e586
|
FIX Option to classify proposal/order in workflow module must not set
source object to billed if amount differs.
|
2017-07-13 12:42:32 +02:00 |
|
Laurent Destailleur
|
028f1f5133
|
Fix default currency in creation form.
|
2017-07-13 10:16:40 +02:00 |
|
Laurent Destailleur
|
2870798d07
|
Fix remove warnings
|
2017-07-13 00:35:10 +02:00 |
|
Laurent Destailleur
|
4b4dcf2e01
|
Fix overload with a protection for rare case with very high nb of event
|
2017-07-12 23:05:26 +02:00 |
|
florian HENRY
|
816283d1e5
|
fix SQL
|
2017-07-12 17:51:32 +02:00 |
|
florian HENRY
|
67664331e3
|
Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing
|
2017-07-12 17:49:44 +02:00 |
|
Regis Houssin
|
9430952561
|
Fix: missing entity filter (multicompany)
|
2017-07-12 11:00:18 +02:00 |
|
Regis Houssin
|
cb6b81d897
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-11 19:10:22 +02:00 |
|
florian HENRY
|
c85bf18f0e
|
Fix AdvtargetEmailing
|
2017-07-11 14:47:37 +02:00 |
|
Laurent Destailleur
|
10cb7b2524
|
Fix remove warnings
|
2017-07-09 20:31:27 +02:00 |
|
Laurent Destailleur
|
e1ba69eee0
|
Fix edit of automatic event should keep its type.
|
2017-07-08 00:19:30 +02:00 |
|
Laurent Destailleur
|
34d0c79e32
|
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
New add trigger disable to updateline functions
|
2017-07-07 20:30:04 +02:00 |
|
Laurent Destailleur
|
640f66f017
|
Fix SQL syntax
|
2017-07-07 17:34:56 +02:00 |
|
Laurent Destailleur
|
de1a7042d4
|
Fix filter on list of actions
|
2017-07-07 10:55:42 +02:00 |
|
fappels
|
6effcb0829
|
New add trigger disable to updateline functions
|
2017-07-06 16:26:15 +02:00 |
|
TuxGasy
|
bec5bde363
|
Move addMoreBoxStatsCustomer after table tag
|
2017-07-06 12:18:54 +02:00 |
|
phf
|
49b8689f2d
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-07-05 11:02:39 +02:00 |
|
TuxGasy
|
67f11103a3
|
fix indent
|
2017-07-04 21:56:47 +02:00 |
|
Laurent Destailleur
|
0ee93fb00c
|
Fix conflict between option login and logina and logint in agenda export
|
2017-07-04 10:29:38 +02:00 |
|
Regis Houssin
|
3f882cb33a
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-07-03 09:24:05 +02:00 |
|
TuxGasy
|
1f9bd2538e
|
new addMoreBoxStatsCustomer hook
|
2017-07-02 22:20:07 +02:00 |
|
Laurent Destailleur
|
7ae52d843c
|
Look and feel v6
|
2017-07-01 14:23:24 +02:00 |
|
Regis Houssin
|
fa247ffd98
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-29 08:51:42 +02:00 |
|
Laurent Destailleur
|
b6002bd1f8
|
Fix bad link
|
2017-06-28 18:29:57 +02:00 |
|
Laurent Destailleur
|
6f82837b0f
|
Fix GETPOST of lang_id
|
2017-06-27 17:27:01 +02:00 |
|
Laurent Destailleur
|
08af9bf365
|
List before
|
2017-06-27 10:37:00 +02:00 |
|
Laurent Destailleur
|
34f3552dc7
|
Fix missing image of user
|
2017-06-27 04:31:29 +02:00 |
|
Laurent Destailleur
|
3fdfebf7ef
|
Fix position of top menu does not follow 'position' field.
|
2017-06-27 04:25:41 +02:00 |
|
Juan Bautista Mesa Roldán
|
0f5dc90bae
|
Fixing pages warning when value is null
|
2017-06-24 16:45:45 +02:00 |
|
Laurent Destailleur
|
4102403482
|
Look and feel v6
|
2017-06-21 11:37:34 +02:00 |
|
Regis Houssin
|
909826e24f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-20 06:25:35 +02:00 |
|
Laurent Destailleur
|
bb2d27280b
|
Fix sort link must be disabled for computed field
|
2017-06-19 14:31:08 +02:00 |
|
Regis Houssin
|
544d051fe3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-19 07:06:57 +02:00 |
|
Laurent Destailleur
|
996ec4926b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
|
2017-06-18 22:16:34 +02:00 |
|
Laurent Destailleur
|
317ab64d7c
|
Fix escapement
|
2017-06-18 22:03:25 +02:00 |
|
Laurent Destailleur
|
f3a5975cf8
|
Fix sql injection
|
2017-06-18 21:58:56 +02:00 |
|
Laurent Destailleur
|
0ef507ae7f
|
Fix rename of file to remove .noexe extension.
|
2017-06-18 21:52:51 +02:00 |
|
Laurent Destailleur
|
86a6a83647
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
|
2017-06-18 21:13:48 +02:00 |
|
Regis Houssin
|
a0299042e4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-17 12:05:33 +02:00 |
|
Laurent Destailleur
|
e813fd2dfa
|
Fix missing key import_key and extraparams
|
2017-06-16 12:57:30 +02:00 |
|
Laurent Destailleur
|
5a477bdd6d
|
Merge pull request #7018 from hregis/develop_bug_restapi
Fix: missing _cleanObjectDatas function
|
2017-06-16 12:53:11 +02:00 |
|
Laurent Destailleur
|
492ee135ba
|
Merge pull request #7011 from hregis/develop_bug3
Fix: error when the project module not enabled
|
2017-06-16 12:51:28 +02:00 |
|
Regis Houssin
|
c2901ae8cd
|
Fix: add/remove unset unsused fields
|
2017-06-16 11:01:58 +02:00 |
|
Regis Houssin
|
c656856ec2
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
|
2017-06-16 10:52:43 +02:00 |
|
Laurent Destailleur
|
07b676792a
|
Fix do not show localtax info if not used.
|
2017-06-16 01:02:53 +02:00 |
|
Regis Houssin
|
9410466d72
|
Fix: better check and security
|
2017-06-15 21:51:31 +02:00 |
|
Regis Houssin
|
78d5520741
|
Fix: missing _cleanObjectDatas function
|
2017-06-15 21:23:35 +02:00 |
|
Regis Houssin
|
cd095e99c9
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-14 12:16:10 +02:00 |
|
Regis Houssin
|
8eb3f3bc06
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug3
|
2017-06-14 12:13:23 +02:00 |
|
Laurent Destailleur
|
1b56e4a01c
|
Fix look and feel v6
|
2017-06-14 11:28:42 +02:00 |
|
Regis Houssin
|
50aa40da3b
|
Fix: error when the project module not enabled
|
2017-06-14 07:40:11 +02:00 |
|
Regis Houssin
|
773abff80e
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-12 21:24:10 +02:00 |
|
Laurent Destailleur
|
ba3a74576c
|
Merge 5.0
|
2017-06-12 18:22:51 +02:00 |
|
florian HENRY
|
71afaaa360
|
fix : availibity refresh
|
2017-06-12 17:24:36 +02:00 |
|
Regis Houssin
|
d1233755f6
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-11 11:41:02 +02:00 |
|
Laurent Destailleur
|
a96362e2f9
|
Fix #formmailbeforetitle not supported everywhere
|
2017-06-11 11:40:01 +02:00 |
|
Regis Houssin
|
cc75916599
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-11 11:26:24 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Regis Houssin
|
3445c9d329
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
|
2017-06-11 06:27:49 +02:00 |
|
Laurent Destailleur
|
6ab47a845e
|
Fix look and feel v6
|
2017-06-10 13:54:43 +02:00 |
|
Laurent Destailleur
|
a8e16910c0
|
Fix look and feel v6
|
2017-06-10 13:44:20 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
phf
|
0f80ee757f
|
Fix can not update extrafields values
|
2017-06-09 16:37:05 +02:00 |
|
Regis Houssin
|
fa58f0f3e8
|
Fix: add entity filter
|
2017-06-09 09:25:15 +02:00 |
|
Laurent Destailleur
|
b441c62e1d
|
Fix syntax error
|
2017-06-08 14:55:12 +02:00 |
|
Laurent Destailleur
|
b1f93ccb0c
|
Fix security
|
2017-06-08 14:33:46 +02:00 |
|
phf
|
d6d451b54a
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-06-08 12:03:59 +02:00 |
|
phf
|
711f9696aa
|
New multi contacts on actioncomm
|
2017-06-08 12:02:39 +02:00 |
|
Regis Houssin
|
2b36135641
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-07 20:14:03 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Regis Houssin
|
bfd6116e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
|
2017-06-06 15:03:36 +02:00 |
|
Laurent Destailleur
|
02b5d9e6f7
|
FIX #6945
|
2017-06-06 10:53:53 +02:00 |
|
Regis Houssin
|
2df33d1df3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-03 11:45:15 +02:00 |
|
Laurent Destailleur
|
7f18dfee0d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
|
2017-06-03 01:55:05 +02:00 |
|
phf
|
31aa8bdf05
|
Fix week view link has wrong link
|
2017-06-01 16:26:32 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
David
|
d8c5ec2aef
|
FIX: REST API not possible to add agendaevents
|
2017-05-29 13:47:42 +02:00 |
|
Laurent Destailleur
|
dc246fa44c
|
Merge pull request #6887 from hregis/develop_new
New: add REST api "dictionaryevents" for use with "agendaevents"
|
2017-05-29 10:16:35 +02:00 |
|
Laurent Destailleur
|
de1db57a9d
|
Merge pull request #6883 from dvasseur/develop
FIX: REST API not possible to add agendaevents
|
2017-05-29 10:12:33 +02:00 |
|
Regis Houssin
|
ee2019ae37
|
Fix: limit to 100 by default to avoid freeze
|
2017-05-26 16:52:27 +02:00 |
|
David
|
3898cfe02f
|
FIX: REST API not possible to add agendaevents
|
2017-05-23 18:27:41 +02:00 |
|
Laurent Destailleur
|
2da50f1eca
|
Look and feel v6
|
2017-05-23 01:32:19 +02:00 |
|
Laurent Destailleur
|
f5e29d6c86
|
Fix phpcs warning
|
2017-05-22 10:45:02 +02:00 |
|
Laurent Destailleur
|
b3dc73e611
|
Look and feel v6
|
2017-05-21 02:43:51 +02:00 |
|
Laurent Destailleur
|
807c77f754
|
Fix inconsistent options
|
2017-05-19 18:03:49 +02:00 |
|
Laurent Destailleur
|
bb2a9f9d0e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-19 17:24:31 +02:00 |
|
Laurent Destailleur
|
c30dcf78cb
|
Show info when link has been deleted
|
2017-05-19 17:24:15 +02:00 |
|
Laurent Destailleur
|
d1c4439a0f
|
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
NEW Module Agenda: Add option - Show linked object into agenda view
|
2017-05-19 17:23:54 +02:00 |
|
Laurent Destailleur
|
aec4cef5de
|
Clean some code for type of event deprecated since 3.3
|
2017-05-19 12:58:38 +02:00 |
|
Laurent Destailleur
|
ef575166c0
|
FIX #6651
|
2017-05-18 19:10:05 +02:00 |
|
Laurent Destailleur
|
7dbe3b1da9
|
Merge pull request #6843 from aspangaro/6.0-multijournal
Fix : Sql error on salaries index for accountancy multijournal + debug
|
2017-05-18 17:45:21 +02:00 |
|
KHELIFA
|
169859b708
|
Module Agenda: Add option - Show linked object into agenda view
|
2017-05-17 17:00:45 +02:00 |
|
Laurent Destailleur
|
68e333879f
|
Fix var not sanitized
|
2017-05-16 13:27:32 +02:00 |
|
Alexandre SPANGARO
|
93554b7e30
|
Typo searchpicto
|
2017-05-14 21:06:33 +02:00 |
|
Laurent Destailleur
|
553f5b990c
|
Fix scrutinizer errors
|
2017-05-13 18:50:55 +02:00 |
|
Laurent Destailleur
|
fa290c34fa
|
Fix against SQL injection. Add phpunit to detect missing escapement.
|
2017-05-12 16:55:11 +02:00 |
|
Laurent Destailleur
|
0d11fce834
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-12 15:45:30 +02:00 |
|
Laurent Destailleur
|
b81de35703
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
|
2017-05-12 15:44:09 +02:00 |
|
Laurent Destailleur
|
419c15ee8e
|
Fix escaping class
|
2017-05-12 15:28:10 +02:00 |
|
Laurent Destailleur
|
5581e5da72
|
FIX New vat code not correctly implemented if "1 price per customer".
|
2017-05-12 13:12:17 +02:00 |
|
Laurent Destailleur
|
2199c525bc
|
Merge pull request #6805 from grandoc/new_branch_06_05
Update code using new css class
|
2017-05-10 22:51:31 +02:00 |
|
Laurent Destailleur
|
5e54567558
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/skeleton_list.php
|
2017-05-10 13:30:35 +02:00 |
|
Laurent Destailleur
|
3e0fcf5ec2
|
Fix label "total for this page" on last page.
|
2017-05-10 11:57:59 +02:00 |
|
Laurent Destailleur
|
e5c898e0d6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
|
2017-05-10 00:48:27 +02:00 |
|
Laurent Destailleur
|
6d01bd712d
|
FIX Better sanitizing of search all parameter.
|
2017-05-09 19:36:10 +02:00 |
|
Laurent Destailleur
|
910a925167
|
NEW Add last activation author and ip of modules
|
2017-05-06 20:43:14 +02:00 |
|
philippe grand
|
55feea5d98
|
Update code using new css class
|
2017-05-06 10:54:28 +02:00 |
|
Laurent Destailleur
|
d53654e64f
|
Look and feel v6
|
2017-05-05 20:45:06 +02:00 |
|
Laurent Destailleur
|
d7e10085b8
|
Clean code. Using 2 different key for a param is not more allowed.
|
2017-05-05 18:42:11 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|