Commit Graph

75026 Commits

Author SHA1 Message Date
Laurent Destailleur
bb9cd05ea8 Fix phpcs 2019-04-02 20:02:43 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-02 19:34:49 +02:00
Laurent Destailleur
26fbd6e2ec Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:16 +02:00
Laurent Destailleur
cb1489e2fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:10 +02:00
Laurent Destailleur
9b77cc4db8 Translation of currency 2019-04-02 19:33:14 +02:00
Laurent Destailleur
37b8796f3c NEW Add line total on list of payments 2019-04-02 17:54:34 +02:00
Laurent Destailleur
8a6e28860b A better transition with deprecation 2019-04-01 22:09:24 +02:00
Laurent Destailleur
7db443e8ab Better compatibility 2019-04-01 21:14:15 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
fc983fa65c Move a function into functions2.lib.php 2019-04-01 18:46:13 +02:00
Laurent Destailleur
2956bbe734 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-01 18:44:16 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
c7e4cd7fa1 More complete examples 2019-04-01 18:39:36 +02:00
Laurent Destailleur
80b2605537
Merge pull request #10917 from Tetras-Libre/NegativeBills
Negative bills
2019-04-01 18:31:04 +02:00
Laurent Destailleur
5d9a7e0d80 Fix phpcs 2019-04-01 18:21:59 +02:00
Laurent Destailleur
6e161a96c7 Enhance phpunit 2019-04-01 18:16:50 +02:00
Laurent Destailleur
0091b65a83 Fix phpcs 2019-04-01 18:10:14 +02:00
Laurent Destailleur
c07159fee9 Fix regression in timesheet. Keep extrafield of task for the moment. 2019-03-31 22:06:41 +02:00
ptibogxiv
69b04e2189
Update html.formother.class.php 2019-03-31 19:28:45 +02:00
ptibogxiv
13c93ba1c2
transfert from html.form.class.php 2019-03-31 19:26:40 +02:00
ptibogxiv
1a228ed95c
transfert to html.otherform.class.php 2019-03-31 19:25:45 +02:00
Laurent Destailleur
3dc24cbf55
Merge pull request #10899 from atm-ph/new_evol_time_spent_views
New evol time spent views
2019-03-31 19:19:47 +02:00
Laurent Destailleur
d572a9258c
Merge branch 'develop' into new_evol_time_spent_views 2019-03-31 19:12:27 +02:00
Laurent Destailleur
2302c5ef1f
Merge pull request #10943 from OPEN-DSI/v9-fix-fichinter-list-project-contract
Fix project and contract fields in fichinter list
2019-03-31 19:08:03 +02:00
Laurent Destailleur
24fef25fd8
Update list.php 2019-03-31 19:07:25 +02:00
Laurent Destailleur
b3f81d2c1a
Update list.php 2019-03-31 19:06:44 +02:00
Laurent Destailleur
48ce60dd17
Update list.php 2019-03-31 19:04:28 +02:00
Laurent Destailleur
84f895bbaf
Merge pull request #10941 from inoveaconseil/modulebuilder2
NEW advanced parameters for initiate a new module
2019-03-31 19:02:13 +02:00
Laurent Destailleur
ce62e7f7ec
Merge pull request #10939 from OPEN-DSI/new-exports-fields
New add fields in contact export
2019-03-31 19:00:16 +02:00
Laurent Destailleur
61fad96bcb
Merge pull request #10926 from joseplluis/patch-1
FIX filter by name_alias field on fetch
2019-03-31 18:55:58 +02:00
Laurent Destailleur
2f51221660
Merge pull request #10933 from atm-greg/Add_final_hooks_on_replenish
Add all missing hooks on replenish
2019-03-31 18:50:34 +02:00
Laurent Destailleur
29e0c98185
Merge pull request #10934 from aspangaro/10.0_product_account
NEW: Add import of accounting account for intra/export selling on product card
2019-03-31 18:50:15 +02:00
Laurent Destailleur
f671b8bce7
Merge pull request #10945 from aspangaro/7_p1
FIX: Don't show accountingjournal:getNomUrl without data
2019-03-31 18:49:50 +02:00
Laurent Destailleur
143cbba09b
Update card.php 2019-03-31 18:49:38 +02:00
Laurent Destailleur
039e6034d1
Merge pull request #10936 from aspangaro/10.0_WARNING
LOG_WARNING on function dol_print_date with deprecated value
2019-03-31 18:45:01 +02:00
Laurent Destailleur
2b41d0c59d
Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter
FIX missing hook
2019-03-31 18:44:07 +02:00
Laurent Destailleur
4233307384
Merge pull request #10946 from frederic34/patch-4
phpcs fix
2019-03-31 18:41:22 +02:00
Laurent Destailleur
31963be6a0
Merge pull request #10922 from altatof/cloneorder
clone of order like in propal (ref_client, contacts)
2019-03-31 18:25:48 +02:00
Laurent Destailleur
361254a4c0 Fix regression after renamind valdate_invoices 2019-03-31 18:23:54 +02:00
Laurent Destailleur
0d564cdd6c
Merge pull request #10919 from grandoc/new_branch_26_03_2019
New branch 26 03 2019
2019-03-31 18:23:05 +02:00
Laurent Destailleur
5dfc1c0897
Merge pull request #10921 from atm-greg/Fix_hook_in_margins_heads
FIX missing hook completeTabsHead in margins module
2019-03-31 18:21:48 +02:00
Laurent Destailleur
c959c8b645 Fix api with prestashop 2019-03-31 18:21:00 +02:00
Laurent Destailleur
ecd049b4e6 Debug dolistore 2019-03-31 13:39:51 +02:00
Laurent Destailleur
bb2545c7b4 Clean code 2019-03-31 13:05:35 +02:00
Laurent Destailleur
b10682e5db Fix search in dolistore 2019-03-31 13:03:38 +02:00
Laurent Destailleur
9f0d712957 Fix style 2019-03-31 11:27:12 +02:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Frédéric FRANCE
ddd1c04eae
phpcs fix 2019-03-31 09:27:11 +02:00