Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-02 15:12:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
82,102 Commits 37 Branches 191 Tags
dec64b45e893b8e96fa752b4cd4ff0e7ea8ab814
Commit Graph

72151 Commits

Author SHA1 Message Date
lvessiller-opendsi
dec64b45e8 Merge branch 'develop' into new-propal-tooltip-note 2019-12-26 10:06:38 +01:00
VESSILLER
bf1bf10a53 FIX resolve conflicts 2019-12-26 09:56:35 +01:00
VESSILLER
23b4e3ad6d FIX resolve conflicts 2019-12-26 09:50:15 +01:00
Laurent Destailleur
4333cf2040 Show the stripe accoutn of a cu_ and a card_ 2019-12-24 12:53:10 +01:00
Laurent Destailleur
6f97d163f9 Fix: the stripe_account is not filled 2019-12-23 22:41:34 +01:00
Laurent Destailleur
d4f3d14b65 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:19:10 +01:00
Laurent Destailleur
9f5029aa0f Fix warning 2019-12-23 19:17:53 +01:00
Laurent Destailleur
094b37d79d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:12:32 +01:00
Laurent Destailleur
8e78dbad69 Fix for php 7.4 2019-12-23 16:41:22 +01:00
Laurent Destailleur
f193d3edd8 Fix for php7.4 2019-12-23 16:38:37 +01:00
Laurent Destailleur
92708e31ce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:51:59 +01:00
Laurent Destailleur
f45710a4b1 Fix phpcs 2019-12-23 15:51:23 +01:00
Laurent Destailleur
1ebf7e642f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:49:25 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
Laurent Destailleur
d5f6ccc7a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 14:40:36 +01:00
Laurent Destailleur
29cacec886 Fix month when using "Now" button addnowlink = 2 2019-12-23 14:39:24 +01:00
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