Commit Graph

66189 Commits

Author SHA1 Message Date
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
6cb0793d14
Merge pull request #7969 from marcosgdf/bug-4875
FIX #4875 Remove external module code from Dolibarr core code - Introduce hook initSendToSocid instead
2018-04-11 18:33:10 +02:00
Laurent Destailleur
e468584783
Update actions_sendmails.inc.php 2018-04-11 18:31:46 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser
NEW : Can select from the user list into send form email (For field to and CC)
2018-04-11 17:55:40 +02:00
Laurent Destailleur
ac8520c114
Merge pull request #8557 from Gecka-Apps/7.0-substitution
Passes the list of third parties and the list of objects ref to the complete_substitutions_array function as parameters.
2018-04-11 17:40:38 +02:00
Laurent Destailleur
e543a6bf85
Merge pull request #8549 from atm-greg/fix_multiselect_filter
FIX #8480
2018-04-11 17:38:30 +02:00
Laurent Destailleur
1aace69b1a
Update functions.lib.php 2018-04-11 17:37:00 +02:00
Laurent Destailleur
e71ea882b3
Merge pull request #8556 from sadlig/develop
Fix value cond_reglement_id & mode_reglement_id
2018-04-11 17:30:00 +02:00
Laurent Destailleur
9634f4c82a
Update supplier_proposal.class.php 2018-04-11 17:29:45 +02:00
Laurent Destailleur
693f0da2a6
Merge pull request #8545 from atm-florian/7.0_fix8436
fix #8436
2018-04-11 17:23:40 +02:00
Laurent Destailleur
b68975f106 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 17:14:56 +02:00
Laurent Destailleur
c70e0c1cda FIX #8475 #8540 2018-04-11 17:14:34 +02:00
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
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
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
Frédéric FRANCE
2c76a6cd80
Update combinations.php 2018-04-11 11:44:22 +02:00
Laurent Destailleur
aa3c81c8bd Translation 2018-04-11 10:15:54 +02:00
Laurent Destailleur
5cdebb4daa Fix typo 2018-04-11 10:00:53 +02:00