Commit Graph

68848 Commits

Author SHA1 Message Date
Laurent Destailleur
68b4b74d80
Merge pull request #8531 from all3kcis/patch-7
Add insertExtraFields into create/update
2018-04-11 16:34:21 +02:00
Laurent Destailleur
701aa53bdd
Update productlot.class.php 2018-04-11 16:33:12 +02:00
Laurent Destailleur
73a8966659
Merge pull request #8538 from atm-arnaud/FIX_8389_html_in_lang_DE
FIX #8389
2018-04-11 16:31:36 +02:00
Laurent Destailleur
307f217d56
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events
FIX : multiple creation of same event
2018-04-11 16:28:32 +02:00
Laurent Destailleur
23dba46c8c
Merge pull request #8551 from ATM-Nicolas/fix_datetime_extrafields
FIX : update wrong datetime extrafield
2018-04-11 16:28:04 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php 2018-04-11 16:27:56 +02:00
Laurent Destailleur
b732844e91
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag
FIX #8023
2018-04-11 16:25:33 +02:00
Laurent Destailleur
628b437e28
Update card.php 2018-04-11 16:25:05 +02:00
Laurent Destailleur
c392b9b8ef
Merge pull request #8541 from atm-gauthier/FIX_count_6.0
FIX #8478 !empty instead of count to avoid warning
2018-04-11 14:55:41 +02:00
Laurent Destailleur
75bc3d17e6
Update admin_extrafields_view.tpl.php 2018-04-11 14:55:29 +02:00
Laurent Destailleur
bc1515cb56
Merge pull request #8535 from atm-greg/Fix_dolGetFirstLastname
fix #8521
2018-04-11 14:54:15 +02:00
Laurent Destailleur
1f21078e08
Merge pull request #8536 from atm-florian/7.0_fix8474
fix #8474
2018-04-11 14:53:26 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement
FIX: payment term doc-specific label was not used (issue #8414)
2018-04-11 14:52:06 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
Laurent Destailleur
0d15d8e0ad Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/user/card.php
2018-04-11 14:45:11 +02:00
Laurent Destailleur
804703c9c9 Fix regression 2018-04-11 14:43:16 +02:00
Laurent Destailleur
e1c83df086 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 14:39:13 +02:00
Laurent Destailleur
560038fa18 Fix regression in update contact 2018-04-11 14:38:56 +02:00
All3kcis
00c8593567
remove hook 2018-04-11 14:09:30 +02:00
Laurent Destailleur
7adbc473c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 13:26:37 +02:00
Laurent Destailleur
b652c53379 Sync transifex 2018-04-11 13:26:23 +02:00
Laurent Destailleur
c2eb2bf10e
Merge pull request #8542 from ATM-Marc/FIX_user_autocomplete
FIX: weird password autocompletion in Google Chrome (issue #8479)
2018-04-11 13:22:42 +02:00
Laurent Destailleur
4f7fbb80ba Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:36 +02:00
Laurent Destailleur
21c65f812a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:20 +02:00
Laurent Destailleur
edb59c05dc
Merge pull request #8525 from atm-greg/Add_projettaskcard_hook
add doActions hook on projettaskcard
2018-04-11 13:20:07 +02:00
Laurent Destailleur
73aa34dfbe
Merge pull request #8528 from hregis/7.0_bug6
FIX avoid Error: Call to undefined method mysqli::get_charset()
2018-04-11 13:19:33 +02:00
Laurent Destailleur
f54113b1a1
Merge pull request #8524 from frederic34/patch-10
FIX do not fill error with success message when using SwiftMailer
2018-04-11 13:19:04 +02:00
Laurent Destailleur
273eadab43
Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)
2018-04-11 13:18:10 +02:00
Laurent Destailleur
e393e8b813
Merge pull request #8520 from aspangaro/8.0-a15
NEW Add file number in accountant card and update export filename
2018-04-11 13:17:26 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15 2018-04-11 13:17:12 +02:00
Laurent Destailleur
7d27af4778
Merge pull request #8552 from atm-arnaud/NEW_remove_element_in_categ
FIX #7730
2018-04-11 13:14:59 +02:00
Laurent Destailleur
ba526dd7f2
Merge pull request #8530 from hregis/7.0_bug3
FIX missing User object with API REST
2018-04-11 13:11:27 +02:00
Laurent Destailleur
b4d6811aff
Merge pull request #8522 from frederic34/patch-2
Update actions_mymodule.class.php
2018-04-11 13:10:07 +02:00
Laurent Destailleur
e642535389
Merge pull request #8561 from frederic34/patch-11
Update combinations.php
2018-04-11 13:09:34 +02:00
Laurent Destailleur
dcab5da980
Merge pull request #8553 from QuentinSu/patch-1
Update style.css.php
2018-04-11 13:08:12 +02:00
Laurent Destailleur
ab55426f2e
Merge pull request #8555 from aspangaro/8.0-a17
Fix : Migration 7.0.0 don't contains all new chart of accounts.
2018-04-11 13:07:50 +02:00
Laurent Destailleur
6731e238a3
Merge pull request #8550 from atm-quentin/FIX_Issue_8037
FIX issue #8037
2018-04-11 13:06:26 +02:00
Laurent Destailleur
7d7c0624d2
Update traduction.php 2018-04-11 12:59:24 +02:00
Laurent Destailleur
50dd75632c
Merge pull request #8532 from atm-arnaud/FIX_8359_project_link_categ_list
FIX #8359
2018-04-11 12:57:41 +02:00
Laurent Destailleur
9af052602a Fix css 2018-04-11 12:54:57 +02:00
Laurent Destailleur
c958a4f865
Merge pull request #8558 from atm-greg/Fix_contact_birthday_update
FIX #8259 can't update contact birthday with REST API
2018-04-11 12:53:41 +02:00
Laurent Destailleur
d02405dccd
Merge pull request #8533 from atm-quentin/FIX_issues_8470
FIX issue #8470
2018-04-11 12:52:44 +02:00
Laurent Destailleur
dfe93bce21
Merge pull request #8534 from atm-maxime/fix_suporder_defaultcurrency
FIX default currency not set on supplier order creation from commercial menu #8459
2018-04-11 12:52:17 +02:00
Laurent Destailleur
bf1e3705fb Fix english 2018-04-11 12:47:10 +02:00
Marc de Lima Lucio
2a265e9de9 NEW: default add action: new param $backurlforcard to redict to card 2018-04-11 12:32:55 +02:00
Marc de Lima Lucio
fa8cf98249 FIX: modulebuilder: handle 'price' fieldtype 2018-04-11 12:18:54 +02:00
Frédéric FRANCE
a95bc76afb
Update combinations.php 2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383
Update getCombinations.php 2018-04-11 12:05:23 +02:00
Marc de Lima Lucio
bbc12cf06b FIX: default addupdatedelete actions: uniformize add/update value checks 2018-04-11 11:49:29 +02:00
Marc de Lima Lucio
2f75bfcd83 FIX: modulebuilder: could not create html fields 2018-04-11 11:46:47 +02:00