Laurent Destailleur
|
1b3544e794
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-06-25 02:28:38 +02:00 |
|
Laurent Destailleur
|
480587c826
|
Fix travis errors
|
2017-06-25 02:28:07 +02:00 |
|
Laurent Destailleur
|
e6e8a014a3
|
Prepare 5.0.4
|
2017-06-24 21:39:01 +02:00 |
|
Laurent Destailleur
|
ab9be29356
|
Fix installers
|
2017-06-24 21:36:51 +02:00 |
|
Laurent Destailleur
|
e79f3715b4
|
FIX #7048 #6075
|
2017-06-24 16:21:25 +02:00 |
|
Laurent Destailleur
|
ee8924e101
|
Fix position of accounting periods
|
2017-06-24 10:23:38 +02:00 |
|
Laurent Destailleur
|
1211e0d7ab
|
FIX vat code not saved during product creation.
|
2017-06-23 12:09:21 +02:00 |
|
Laurent Destailleur
|
45004493e0
|
Fix multicurrency and vat_src_code not propaged on invoice from
shipment.
|
2017-06-23 11:12:17 +02:00 |
|
Laurent Destailleur
|
ecae2fc6b6
|
Fix translation
|
2017-06-23 11:08:49 +02:00 |
|
Laurent Destailleur
|
3ec0e6f7ef
|
FIX #6885
|
2017-06-20 12:31:08 +02:00 |
|
Laurent Destailleur
|
a7fb411a42
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-06-20 10:46:38 +02:00 |
|
Laurent Destailleur
|
d572bd4f34
|
FIX #7003
|
2017-06-20 10:45:20 +02:00 |
|
Laurent Destailleur
|
6d42922839
|
FIX #7012
|
2017-06-20 10:37:42 +02:00 |
|
Laurent Destailleur
|
d8b0199ba2
|
FIX #7040
|
2017-06-20 10:24:54 +02:00 |
|
Laurent Destailleur
|
dbeb31cad3
|
Merge pull request #7039 from marcosgdf/bug-5640
FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances
|
2017-06-20 01:15:33 +02:00 |
|
Laurent Destailleur
|
fd197c5780
|
Merge pull request #7041 from marcosgdf/bug-6541
FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working
|
2017-06-20 01:13:07 +02:00 |
|
Marcos García
|
eaaee59f92
|
FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working
|
2017-06-19 19:23:00 +02:00 |
|
Marcos García
|
ba87549124
|
FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances
|
2017-06-19 18:07:43 +02:00 |
|
Laurent Destailleur
|
4c55700157
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-06-19 04:15:20 +02:00 |
|
Laurent Destailleur
|
71641c5743
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-06-19 04:14:07 +02:00 |
|
Laurent Destailleur
|
ebc18cd2d4
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2017-06-19 04:13:24 +02:00 |
|
Laurent Destailleur
|
d0d9de37f4
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2017-06-19 04:05:40 +02:00 |
|
Laurent Destailleur
|
1bfdc7438a
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2017-06-19 04:03:26 +02:00 |
|
Regis Houssin
|
9352ecca1f
|
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
|
2017-06-19 04:01:34 +02:00 |
|
Laurent Destailleur
|
43f25b49a1
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-06-19 03:00:29 +02:00 |
|
Laurent Destailleur
|
5cd5986211
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-06-19 02:59:49 +02:00 |
|
Laurent Destailleur
|
39419bb411
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2017-06-19 02:59:16 +02:00 |
|
Laurent Destailleur
|
774c624687
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2017-06-19 02:58:44 +02:00 |
|
Laurent Destailleur
|
5439390461
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2017-06-19 02:57:12 +02:00 |
|
Laurent Destailleur
|
6fc4dacd42
|
Fix migration opensurvey
|
2017-06-19 02:55:33 +02:00 |
|
Laurent Destailleur
|
317ab64d7c
|
Fix escapement
|
2017-06-18 22:03:25 +02:00 |
|
Laurent Destailleur
|
f3a5975cf8
|
Fix sql injection
|
2017-06-18 21:58:56 +02:00 |
|
Laurent Destailleur
|
8debefa8ad
|
Fix php sanitazing
|
2017-06-18 21:53:06 +02:00 |
|
Laurent Destailleur
|
0ef507ae7f
|
Fix rename of file to remove .noexe extension.
|
2017-06-18 21:52:51 +02:00 |
|
Laurent Destailleur
|
abe736c6a6
|
Escape hml tags
|
2017-06-18 19:42:59 +02:00 |
|
Laurent Destailleur
|
c01bd37a82
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-06-17 18:23:38 +02:00 |
|
Laurent Destailleur
|
285b5563d6
|
Update changelog
|
2017-06-17 18:23:26 +02:00 |
|
Laurent Destailleur
|
7777bcc587
|
Merge pull request #7009 from atm-ph/fix_5.0_css_situation_invoice
Fix css to apply "pair" and "impair" style
|
2017-06-16 12:50:44 +02:00 |
|
phf
|
3333049341
|
Fix total aren't aligned
|
2017-06-15 11:11:49 +02:00 |
|
Laurent Destailleur
|
848f70e026
|
Fix bad merge
|
2017-06-14 10:38:34 +02:00 |
|
Laurent Destailleur
|
0e867229db
|
FIX Can't create invoice if PO disapproved
|
2017-06-14 10:28:02 +02:00 |
|
Laurent Destailleur
|
7939daa225
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
|
2017-06-14 10:18:24 +02:00 |
|
Laurent Destailleur
|
83a5b8e078
|
FIX Can set supplier invoice to billed.
|
2017-06-14 10:13:33 +02:00 |
|
phf
|
d2db5f60a8
|
Fix css to apply "pair" and "impair" style
|
2017-06-14 09:42:05 +02:00 |
|
Laurent Destailleur
|
fd2ab6371d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-06-13 15:58:22 +02:00 |
|
Laurent Destailleur
|
70c7bcc85f
|
Complete css to get value unique
|
2017-06-13 15:57:30 +02:00 |
|
Laurent Destailleur
|
7b8a35630c
|
Merge pull request #6997 from atm-ph/fix_6993
Fix 6993 - supplier propal check min price on update line
|
2017-06-13 15:03:27 +02:00 |
|
Laurent Destailleur
|
9e5af63c2c
|
Merge pull request #6996 from atm-ph/fix_5.0_display_situtation_amount
Fix display on situation invoice
|
2017-06-13 15:01:44 +02:00 |
|
Laurent Destailleur
|
9b979e3cb7
|
Fix wrong warning when user is disabled
|
2017-06-13 13:44:18 +02:00 |
|
phf
|
f2961b8652
|
Fix 6993 - supplier propal check min price on update line
|
2017-06-13 12:30:30 +02:00 |
|