Commit Graph

75768 Commits

Author SHA1 Message Date
Laurent Destailleur
039443a7f2
Merge pull request #10888 from grandoc/new_branch_19_03_2019
update with html5 compliant code
2019-03-19 13:45:44 +01:00
Laurent Destailleur
320fc47bf6
Merge pull request #10886 from frederic34/patch-2
phpcs fix
2019-03-19 13:45:20 +01:00
Laurent Destailleur
932d308c63
Merge pull request #10887 from frederic34/patch-4
correct replacement of align
2019-03-19 13:45:06 +01:00
Philippe GRAND
d118d269a2 update with html5 compliant code 2019-03-19 13:44:21 +01:00
Philippe GRAND
9af5aa8eaa update with html5 compliant code 2019-03-19 13:41:55 +01:00
Laurent Destailleur
07a8d00d40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-19 13:14:50 +01:00
Laurent Destailleur
eab11ce743 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2019-03-19 13:14:44 +01:00
Laurent Destailleur
e4e085e332 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:24 +01:00
Laurent Destailleur
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +01:00
Laurent Destailleur
b11403103b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Frédéric FRANCE
2fddf38da1
correct replacement of align 2019-03-19 12:55:33 +01:00
Frédéric FRANCE
013e536f32
Update actioncomm.class.php 2019-03-19 12:49:54 +01:00
Frédéric FRANCE
544934f322
phpcs fix 2019-03-19 12:48:44 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019
New branch 15 03 2019
2019-03-19 12:13:02 +01:00
Laurent Destailleur
eaaea2c2f9 Fix set of due date when invoice created from API 2019-03-19 12:08:55 +01:00
Laurent Destailleur
bca10084c5
Merge pull request #10882 from alexandreaj/patch-1
Update api_invoices.class.php
2019-03-19 12:07:16 +01:00
Laurent Destailleur
70cb042e58
Update api_invoices.class.php 2019-03-19 12:06:57 +01:00
Laurent Destailleur
a61ee00a7a
Merge pull request #10877 from ATM-Nicolas/9.0
FIX : Duplicate executeHook function
2019-03-19 12:04:46 +01:00
Laurent Destailleur
05cd2e280c Method load_measuring_units were renamed into selectMeasuringUnits and
select_measuring_units was deprecated
2019-03-19 12:04:32 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
1a05cdfaa1 Fix regressions in selecting duration of service 2019-03-19 11:42:50 +01:00
Laurent Destailleur
6970d066f8 Better compatibility 2019-03-19 11:23:38 +01:00
Laurent Destailleur
a4372e24bf Migration 2019-03-19 11:21:55 +01:00
Laurent Destailleur
77b675bec1
Merge pull request #10876 from ptibogxiv/patch-143
FIX support duration/time units with services
2019-03-19 11:20:13 +01:00
Laurent Destailleur
81fb18befe Complete unit table 2019-03-19 11:19:46 +01:00
Laurent Destailleur
eeab635c8e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-19 11:16:43 +01:00
Laurent Destailleur
2a8056b075
Merge pull request #10881 from frederic34/patch-5
phpcs fix
2019-03-19 11:15:16 +01:00
Laurent Destailleur
b10690ce88
Merge pull request #10874 from grandoc/translation
translation
2019-03-19 11:14:40 +01:00
Laurent Destailleur
661f95d780
Merge pull request #10873 from grandoc/new_branch_18_03_2019
New branch 18 03 2019
2019-03-19 11:13:39 +01:00
Laurent Destailleur
9a92ce678f
Merge pull request #10875 from ptibogxiv/patch-142
Use common function to select duration on service (using mesuring unit table)
2019-03-19 11:13:07 +01:00
Laurent Destailleur
bfaaa7983e
Merge pull request #10872 from frederic34/patch-4
Update index.php
2019-03-19 11:11:53 +01:00
Laurent Destailleur
775aa5ff91
Merge pull request #10870 from hregis/8.0_mc2
FIX missing entity filter and wrong var name
2019-03-19 11:11:22 +01:00
Laurent Destailleur
fccd2f00e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-19 10:43:59 +01:00
Laurent Destailleur
cb9f30ceeb Look and feel v10 2019-03-19 10:36:37 +01:00
Laurent Destailleur
4b363a2006
Merge pull request #10871 from frederic34/patch-2
Usage of ELSE IF is discouraged; use ELSEIF instead
2019-03-19 10:31:58 +01:00
Laurent Destailleur
6bead00260 Better text 2019-03-19 10:27:36 +01:00
Laurent Destailleur
3f62098b81 Add hours in date 2019-03-19 10:14:13 +01:00
alexandreaj
9bb1ede65a
Update api_invoices.class.php
Adding possibility to set due date (date_lim_reglement field in mysql) via the API.
2019-03-18 21:11:13 +01:00
wdammak
56bee8a20f
Update llx_product.key.sql 2019-03-18 20:23:45 +01:00
wdammak
cf0bc88601
Update llx_product.sql 2019-03-18 20:19:30 +01:00
Frédéric FRANCE
03cd321aeb
phpcs fix 2019-03-18 20:18:38 +01:00
Laurent Destailleur
41c737a213 Fix, Oops, test was inverted 2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753 Fix do we really must copy notes when creating an object from another
source object? Add a hack with hidden option to be able to change this.
2019-03-18 20:09:09 +01:00
Christophe Battarel
bd542b6b22 allow empty value for payment conditions like in orders 2019-03-18 16:39:59 +01:00
Christophe Battarel
8b3fd2eacf NEW : add constant NO_CONCAT_DESCRIPTION 2019-03-18 16:10:17 +01:00
ATM-Nicolas
1cf42726ff FIX : Duplicate executeHook function 2019-03-18 15:19:39 +01:00
ptibogxiv
eb196ba8e6
Update 9.0.0-10.0.0.sql 2019-03-18 14:25:13 +01:00
ptibogxiv
9178939fe6
ADD week, month, year 2019-03-18 14:21:36 +01:00
Christophe Battarel
042cceb8f8 Merge https://github.com/Dolibarr/dolibarr into develop 2019-03-18 14:17:30 +01:00