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
|
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 |
|
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
|
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
|
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 |
|
Frédéric FRANCE
|
03cd321aeb
|
phpcs fix
|
2019-03-18 20:18:38 +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 |
|
ptibogxiv
|
030048db28
|
FIX compatibility of minute with php unit value
|
2019-03-18 14:07:31 +01:00 |
|
Philippe GRAND
|
5a48cd2f6a
|
translation
|
2019-03-18 14:01:03 +01:00 |
|
ptibogxiv
|
8657ff034b
|
Update card.php
|
2019-03-18 13:48:16 +01:00 |
|
Philippe GRAND
|
c13a1dbc63
|
translation
|
2019-03-18 13:45:24 +01:00 |
|
Philippe GRAND
|
0f03b16313
|
translation
|
2019-03-18 12:46:32 +01:00 |
|
Philippe Grand
|
4935aa2fe4
|
Update adherent.class.php
|
2019-03-18 12:25:35 +01:00 |
|
Philippe Grand
|
2a91629e57
|
Update accountingaccount.class.php
|
2019-03-18 12:24:52 +01:00 |
|
Philippe Grand
|
7942903548
|
Update actioncomm.class.php
|
2019-03-18 12:24:16 +01:00 |
|
Philippe GRAND
|
609dc5360b
|
add comments
|
2019-03-18 12:19:56 +01:00 |
|
Philippe GRAND
|
76a4792cd2
|
Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019
|
2019-03-18 12:11:57 +01:00 |
|
Frédéric FRANCE
|
03785aa53f
|
Update index.php
|
2019-03-18 11:45:54 +01:00 |
|
Frédéric FRANCE
|
135df4b3ce
|
Usage of ELSE IF is discouraged; use ELSEIF instead
|
2019-03-18 11:24:56 +01:00 |
|
Laurent Destailleur
|
ad3b0b1a62
|
Removed deprecated function function test_sql_and_script_inject that was
replaced with testSqlAndScriptInject
|
2019-03-18 11:19:16 +01:00 |
|
Laurent Destailleur
|
89087c6847
|
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice
Wrong vat if deposit from propal with multiple vat
|
2019-03-18 11:14:11 +01:00 |
|
Laurent Destailleur
|
76ae53c517
|
Merge pull request #10869 from atm-ph/develop_pgsql
Fix postgreSQL migration
|
2019-03-18 11:06:10 +01:00 |
|
Laurent Destailleur
|
de554750e4
|
Merge pull request #10802 from altatof/propindex
Harmonize propal index pages
|
2019-03-18 10:56:10 +01:00 |
|
Laurent Destailleur
|
22d61cd44d
|
Update index.php
|
2019-03-18 10:55:44 +01:00 |
|
Laurent Destailleur
|
7adba419fc
|
Update index.php
|
2019-03-18 10:54:45 +01:00 |
|
Laurent Destailleur
|
d8c1a50291
|
Update index.php
|
2019-03-18 10:53:58 +01:00 |
|
Regis Houssin
|
57091f08b0
|
FIX missing entity filter and wrong var name
|
2019-03-18 10:53:43 +01:00 |
|
atm-ph
|
466a5e2e81
|
Fix postgreSQL migration
|
2019-03-18 10:47:56 +01:00 |
|