Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,408 Commits 36 Branches 189 Tags
9c4ba1c5d2b51b2d25868f45c4ccfd7296b1722c
Commit Graph

19344 Commits

Author SHA1 Message Date
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
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
VESSILLER
720146c45f FIX class Facture undefined in displaying margin information 2019-12-23 15:37:12 +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
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
c6ed605d26 Add missing fk_user in import list 2019-12-23 13:49:13 +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
a92db7db39 Look and feel v11 2019-12-23 13:02:30 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Laurent Destailleur
d4138876af Fix alignement in validation popup 2019-12-23 11:16:40 +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
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Laurent Destailleur
ad039ff968 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2019-12-21 14:03:45 +01:00
Laurent Destailleur
58771c7d8a Debug MRP v11 2019-12-20 17:39:42 +01:00
Laurent Destailleur
03649ea2c8 Fix pb with svg images 2019-12-19 19:10:23 +01:00
Laurent Destailleur
43ff015157 Fix pb with svg images 2019-12-19 19:09:56 +01:00
Laurent Destailleur
44978db027 FIX The substitution variable array was not complete 2019-12-19 13:42:13 +01:00
Laurent Destailleur
0636682e91 FIX The substitution variable array was not complete 2019-12-19 13:41:43 +01:00
Laurent Destailleur
3cef84f26d Move feature from experimental to stable 2019-12-19 12:34:58 +01:00
Frédéric FRANCE
3d19e1321b NEW upload odt models for proposal 2019-12-19 11:10:55 +01:00
stickler-ci
863fa7360d Fixing style errors. 2019-12-19 09:57:37 +00:00
Laurent Destailleur
dd0a1b3e10 Merge branch 'develop' into develop_project 2019-12-19 10:56:03 +01:00
Laurent Destailleur
2afaed6981 Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies 2019-12-19 10:50:23 +01:00
Pierre Ardoin
538921f479 #FIX Error Margin with Situation Invoice 
Fix an issue that show a negative margin when $line->situation_percent is not 100%

Now, the margin price take progress into account.
 2019-12-19 10:35:38 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
3ae87924f1 Fix no user $global $conf into $conf object. 2019-12-18 14:32:23 +01:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Frédéric FRANCE
b6c9de3928 upload odt models for order 2019-12-17 14:49:18 +01:00
Laurent Destailleur
a24112fc91 Merge pull request #12718 from frederic34/patch-6 
The variable $num does not seem to be defined for all execution paths
 2019-12-17 03:02:26 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
138215fc3f Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non 
european users.
 2019-12-16 22:30:16 +01:00
Laurent Destailleur
6e2e02fd40 Look and feel v11 2019-12-16 21:06:32 +01:00
Frédéric FRANCE
9fdd1357d0 The variable $num does not seem to be defined for all execution paths 2019-12-16 20:21:06 +01:00
Laurent Destailleur
a3fa6eb473 Debug v11 2019-12-16 19:40:18 +01:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Laurent Destailleur
1af67a4336 Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Laurent Destailleur
44c967f1cc Merge pull request #12716 from Dolibarr/scrutinizer-patch-19 
Scrutinizer Auto-Fixes
 2019-12-16 19:01:53 +01:00
Laurent Destailleur
c3cd6ad1af Fix example 2019-12-16 13:10:57 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf Value "None" To unbind is more visible. 2019-12-16 11:50:25 +01:00