Commit Graph

71733 Commits

Author SHA1 Message Date
Laurent Destailleur
05e56984d0
Merge pull request #10056 from frederic34/eldylib
reduce complexity of eldylib menu
2018-12-14 17:38:31 +01:00
Laurent Destailleur
0ac287c356
Merge pull request #10046 from frederic34/htmlformmail
reduce complexity of htmlformmail class
2018-12-14 17:37:34 +01:00
Laurent Destailleur
bd7df9869f
Update html.formmail.class.php 2018-12-14 17:37:08 +01:00
Laurent Destailleur
4dc32dafaa
Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook
NEW Add afterSelectContactOptions hook
2018-12-14 17:35:16 +01:00
Laurent Destailleur
89909ebab0
Update html.form.class.php 2018-12-14 17:32:41 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer
fix scrunitizer
2018-12-14 17:28:34 +01:00
Laurent Destailleur
c128ecf7dc
Merge pull request #10227 from altatof/allow_ajax_search_on_product_desc
allow product ajax search on description
2018-12-14 17:25:21 +01:00
Laurent Destailleur
7665c368a2
Merge branch 'develop' into allow_ajax_search_on_product_desc 2018-12-14 17:24:52 +01:00
Laurent Destailleur
ae67c04d05
Merge pull request #10228 from PMickael/develop
[Accounting][VAT] Fix balance should be based on period
2018-12-14 17:21:46 +01:00
Laurent Destailleur
2c5a5e5eac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 16:25:48 +01:00
Laurent Destailleur
e0011222d1 Fix syntax error 2018-12-14 16:25:37 +01:00
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members
NEW Add gender in member card
2018-12-14 16:24:00 +01:00
Laurent Destailleur
98b8113a39 Fix multicompany 2018-12-14 16:20:23 +01:00
PMickael
5a9d034b1b
[Accounting][VAT] Fix balance should be based on period
[Accounting][VAT] Fix balance should be based on period
2018-12-14 16:17:25 +01:00
Laurent Destailleur
e7b703f0c0
Merge pull request #10154 from bugness-chl/develop-hookfacturerec
NEW Adding hooks to facturerec
2018-12-14 16:11:34 +01:00
Laurent Destailleur
c377350c35
Update facture-rec.class.php 2018-12-14 16:09:12 +01:00
Laurent Destailleur
7c79c43e82
Merge pull request #10022 from hregis/develop_mc
FIX use getEntity('invoice') instead getEntity('facture')
2018-12-14 16:00:05 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
78cd503872
Merge pull request #10013 from frederic34/actionrefused
Add tooltip to butActionRefused
2018-12-14 15:50:33 +01:00
Laurent Destailleur
185524bd50
Update fiscalyear.php 2018-12-14 15:49:58 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
bcf2e751b5
Merge pull request #9743 from atm-maxime/new_mass_generate
New mass generate
2018-12-14 15:45:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
a37c07f625
Merge pull request #9893 from frederic34/fieldlabel
remove fieldlabel and add fieldeditkey
2018-12-14 15:43:23 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
59e38d4a81
Merge pull request #9897 from Vaadasch/develop
NEW Update working chkbxlst filter for lists
2018-12-14 15:33:50 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2
NEW Extend import option to Order's card and Propal's card
2018-12-14 15:29:27 +01:00
Laurent Destailleur
2024003b53
Merge pull request #9958 from OPEN-DSI/email-contact-card
[New] Email Contact card
2018-12-14 15:26:39 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
altatof
d5bf9691ee allow product ajax search on description 2018-12-14 15:10:32 +01:00
Laurent Destailleur
67b6ed05b6
Merge pull request #9927 from grandoc/new_branch_31_10_2018
Typo
2018-12-14 14:27:57 +01:00
Laurent Destailleur
9e83699193
Merge branch 'develop' into new_branch_31_10_2018 2018-12-14 14:27:35 +01:00
Laurent Destailleur
78cdade1a7
Merge pull request #10211 from atm-john/fix_error_message_details
Add détails to error message
2018-12-14 14:26:38 +01:00
Laurent Destailleur
7be2097e87 Fix phpcs 2018-12-14 12:00:14 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
8b0919d7e4 Fix phpcs 2018-12-14 11:26:37 +01:00
Laurent Destailleur
63aa7ac1ec Fix name of key 2018-12-14 11:16:05 +01:00
Laurent Destailleur
0113281cc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 11:13:59 +01:00
Laurent Destailleur
2f075147a3 Migrate to 10 2018-12-14 11:13:48 +01:00
Laurent Destailleur
0d6863ebb0
Merge pull request #10217 from torvista/langs_en_US
various en_US changes
2018-12-14 11:09:35 +01:00
Laurent Destailleur
55487da03e
Merge branch 'develop' into langs_en_US 2018-12-14 11:09:25 +01:00
Laurent Destailleur
dc4a122697
Merge pull request #10224 from fmarcet/develop
Qual: Better management of select type of lines
2018-12-14 11:06:33 +01:00
Laurent Destailleur
8c9f81807f
Merge pull request #9702 from bafbes/abb80027
New : Link to create new element on linked fields
2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334
Update commonobject.class.php 2018-12-14 11:01:27 +01:00
Laurent Destailleur
3765db422a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/tables/llx_loan.sql
2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28 Add missing column 2018-12-14 10:56:13 +01:00
Laurent Destailleur
54fa0e9502
Merge pull request #9864 from atm-greg/New_manage_loan_schedule
NEW manage loan schedule
2018-12-14 10:54:33 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Laurent Destailleur
fab6dde593 Close #9825 2018-12-14 10:51:32 +01:00
Laurent Destailleur
177675b73d
Merge pull request #10225 from madx666/contrib
Change type_mouvement on movement_list
2018-12-14 10:40:00 +01:00