Laurent Destailleur
|
f09aecbdd8
|
v12
|
2019-12-23 14:28:55 +01:00 |
|
Laurent Destailleur
|
07c1a5717e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
|
2019-12-23 14:16:34 +01:00 |
|
Laurent Destailleur
|
9a08a6bf6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
|
2019-12-23 14:13:26 +01:00 |
|
Laurent Destailleur
|
7b08ce9fb8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-12-23 14:01:51 +01:00 |
|
Laurent Destailleur
|
eb32e98127
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-12-23 14:01:44 +01:00 |
|
Laurent Destailleur
|
36e6036e9e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-23 14:01:00 +01:00 |
|
Laurent Destailleur
|
76d23141fd
|
Merge pull request #12727 from fappels/patch-1
Update 6.0.0-7.0.0.sql
|
2019-12-23 14:00:15 +01:00 |
|
Laurent Destailleur
|
0ea5df36c1
|
Disable ping for alpha versions
|
2019-12-23 13:55:58 +01:00 |
|
Laurent Destailleur
|
e1446d10d5
|
Prepare v12
|
2019-12-23 13:52:15 +01:00 |
|
Laurent Destailleur
|
c6ed605d26
|
Add missing fk_user in import list
|
2019-12-23 13:49:13 +01:00 |
|
Laurent Destailleur
|
a076c3c20c
|
Add mig file for v12
|
2019-12-23 13:48:38 +01:00 |
|
Laurent Destailleur
|
1229e8bc4b
|
Merge pull request #12747 from OPEN-DSI/v10-fix-contact-card-select-state
FIX contact card state address selected after filling address
|
2019-12-23 13:47:16 +01:00 |
|
Laurent Destailleur
|
15031a3e87
|
Merge pull request #12746 from OPEN-DSI/v10-fix-categories-traduction-backurl
FIX add and modify category translate form with posted values on errors
|
2019-12-23 13:44:37 +01:00 |
|
Laurent Destailleur
|
93cece6a3a
|
Merge pull request #12738 from mapiolca/patch-16
#FIX Error Margin with Situation Invoice
|
2019-12-23 13:43:18 +01:00 |
|
Laurent Destailleur
|
b3400fac24
|
Merge pull request #12744 from OPEN-DSI/v10-fix-facture-duedate-and-paid
FIX set due date in object in create invoice
|
2019-12-23 13:42:31 +01:00 |
|
Laurent Destailleur
|
e963fa4b07
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-12-23 13:40:49 +01:00 |
|
Laurent Destailleur
|
4d12ecb072
|
FIX #12745
|
2019-12-23 13:40:35 +01:00 |
|
Laurent Destailleur
|
b1a99c1e23
|
CSS
|
2019-12-23 13:28:20 +01:00 |
|
Laurent Destailleur
|
b525025f9d
|
CSS
|
2019-12-23 13:13:59 +01:00 |
|
Laurent Destailleur
|
a92db7db39
|
Look and feel v11
|
2019-12-23 13:02:30 +01:00 |
|
Laurent Destailleur
|
89528e46f1
|
css
|
2019-12-23 12:47:00 +01:00 |
|
Laurent Destailleur
|
2df9df2db0
|
Debug v11
|
2019-12-23 12:24:27 +01:00 |
|
VESSILLER
|
e59514600b
|
FIX contact card state address selected after filling address
|
2019-12-23 12:10:51 +01:00 |
|
VESSILLER
|
558d577309
|
FIX add and modify category translate form with posted values on errors
|
2019-12-23 11:53:19 +01:00 |
|
Laurent Destailleur
|
d4138876af
|
Fix alignement in validation popup
|
2019-12-23 11:16:40 +01:00 |
|
VESSILLER
|
c39e45b81a
|
FIX set due date in object in create invoice
|
2019-12-23 10:57:51 +01:00 |
|
Laurent Destailleur
|
78fa75c6b0
|
css
|
2019-12-22 21:58:08 +01:00 |
|
Laurent Destailleur
|
77ab6604fd
|
Merge pull request #12740 from mapiolca/patch-17
FIX Invoice Situation integration into Margin
|
2019-12-22 21:39:15 +01:00 |
|
Laurent Destailleur
|
d59357d88d
|
Fix help
|
2019-12-22 21:34:52 +01:00 |
|
Laurent Destailleur
|
693551069b
|
Fix look and feel v11
|
2019-12-22 21:32:35 +01:00 |
|
Laurent Destailleur
|
30b8affdb7
|
Fix look and feel v11
|
2019-12-22 21:32:19 +01:00 |
|
Laurent Destailleur
|
daae053e39
|
Debug CashFence feature
|
2019-12-22 20:02:18 +01:00 |
|
Laurent Destailleur
|
3036ff637f
|
Fix bad url
|
2019-12-22 19:49:39 +01:00 |
|
Laurent Destailleur
|
3ae5901a64
|
Fix look and feel v11
|
2019-12-22 19:46:36 +01:00 |
|
Laurent Destailleur
|
dd9f25b13a
|
CSS
|
2019-12-22 16:33:15 +01:00 |
|
Laurent Destailleur
|
e60ae67aca
|
Fix stats page
|
2019-12-22 16:23:52 +01:00 |
|
Laurent Destailleur
|
4312a4b016
|
Typo
|
2019-12-22 16:06:32 +01:00 |
|
Laurent Destailleur
|
22b7b69c47
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-22 16:01:32 +01:00 |
|
Laurent Destailleur
|
a739a4dcc3
|
Fix zh_TW
|
2019-12-22 13:47:47 +01:00 |
|
Laurent Destailleur
|
b52deb94d4
|
CSS
|
2019-12-22 13:25:58 +01:00 |
|
Laurent Destailleur
|
39737c7c4b
|
Fix opacity on text with a href links inside
Fix var not defined
|
2019-12-22 13:19:14 +01:00 |
|
Laurent Destailleur
|
05a7e62bf4
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-22 12:56:25 +01:00 |
|
Laurent Destailleur
|
f9c3b25dbd
|
Sync transifex
|
2019-12-22 12:55:38 +01:00 |
|
Laurent Destailleur
|
0c721390c8
|
Fix phpcs
|
2019-12-22 12:28:02 +01:00 |
|
Laurent Destailleur
|
22f3b69666
|
Fix default value for situation invoice
|
2019-12-22 11:59:38 +01:00 |
|
Laurent Destailleur
|
adb4f33312
|
Merge pull request #12743 from hregis/10.0_mc
FIX missing nl2br conversion
|
2019-12-22 11:41:01 +01:00 |
|
Regis Houssin
|
8321fe6ad2
|
FIX missing nl2br conversion
|
2019-12-22 09:13:34 +01:00 |
|
Laurent Destailleur
|
c6d50ff786
|
Update demo sql file
|
2019-12-21 17:48:29 +01:00 |
|
Laurent Destailleur
|
bd4768670f
|
Update screenshots
|
2019-12-21 17:35:43 +01:00 |
|
Laurent Destailleur
|
e2451bcd26
|
Update images
Fix value of delay for warning on project not closed
|
2019-12-21 17:11:21 +01:00 |
|