Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,090 Commits 36 Branches 189 Tags
edf9913c20c5d606fe545145c772384d23ebff1c
Commit Graph

6623 Commits

Author SHA1 Message Date
Frédéric FRANCE
9dd58cf9ce Update html.formfile.class.php 2019-02-23 16:52:26 +01:00
Laurent Destailleur
114cd5fa30 Merge pull request #10646 from grandoc/new_branch_21_02_2019 
fix : When comparing two booleans, it is generally considered safer t…
 2019-02-23 14:19:22 +01:00
Laurent Destailleur
50da34e26b Merge pull request #10660 from frederic34/patch-22 
Update html.formmail.class.php
 2019-02-23 14:09:54 +01:00
Laurent Destailleur
fa45d2c5a9 Merge pull request #10657 from frederic34/patch-17 
doc comment html.formfile.class.php
 2019-02-23 14:09:42 +01:00
Laurent Destailleur
0a83bc474c Merge pull request #10635 from grandoc/new_branch_19_02_2019 
update with html5 compliant code
 2019-02-23 14:09:17 +01:00
Frédéric FRANCE
b75519fefe Update html.formmail.class.php 2019-02-23 11:25:49 +01:00
Frédéric FRANCE
f7c0044e60 doc comment 2019-02-23 09:33:21 +01:00
Laurent Destailleur
5a18588bb7 CSS 2019-02-21 22:27:56 +01:00
Laurent Destailleur
2891758c23 FIX Stock visibility for service when option stock on service is on 
NEW Add option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
 2019-02-21 20:13:03 +01:00
Philippe GRAND
54da44b506 Translation 2019-02-21 19:50:03 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION 
Reorganize levels of menu accountancy
 2019-02-20 04:55:35 +01:00
Philippe GRAND
047ec90d78 update with html5 compliant code 2019-02-19 17:38:14 +01:00
Laurent Destailleur
163db3d132 Code comment 2019-02-18 19:41:23 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
 2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802 FIX Mark credit note as available for credit note in other currency 2019-02-18 18:27:06 +01:00
Alexandre SPANGARO
49a975beb3 Update works 2019-02-18 07:14:21 +01:00
Frédéric FRANCE
b017213131 selectMulticurrency avoid malformed empty value 2019-02-17 20:59:39 +01:00
Laurent Destailleur
a7af1b1765 Remove deprecated code 2019-02-14 16:29:13 +01:00
Laurent Destailleur
67c8ab47ea Merge branch 'develop' into patch-21 2019-02-14 13:27:46 +01:00
Laurent Destailleur
518d42e309 Merge pull request #10572 from aspangaro/10.0_subledger 
NEW: Add employee/user to subledger account list
 2019-02-14 13:24:59 +01:00
Laurent Destailleur
3050366372 Fix table of units already exists. Merge duplicate c_measuring_units 
with c_units.
 2019-02-14 13:02:44 +01:00
Frédéric FRANCE
b18927a6c1 Update cunits.class.php 2019-02-13 23:13:48 +01:00
Laurent Destailleur
2311912d8a Merge branch 'develop' into dev_importproduct_measuringunit 2019-02-13 16:35:46 +01:00
Laurent Destailleur
534eac1a54 Merge pull request #10566 from frederic34/patch-17 
Update rssparser.class.php
 2019-02-13 16:24:45 +01:00
Laurent Destailleur
ced386fdca Fix phpcs 2019-02-13 11:32:00 +01:00
florian HENRY
de87321c15 fix travcis 2019-02-13 10:28:08 +01:00
Alexandre SPANGARO
4c8ee6950b NEW: Add employee/user to subledger account list 
With ACCOUNTANCY_COMBO_FOR_AUX
 2019-02-13 09:41:44 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
Frédéric FRANCE
fa31f95356 Update rssparser.class.php 2019-02-12 23:31:21 +01:00
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
Laurent Destailleur
205152501e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/public/payment/newpayment.php
 2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
f42d07d6da Merge pull request #10529 from frederic34/patch-2 
desactivate button on click to avoid multiple clicks
 2019-02-12 13:12:30 +01:00
Laurent Destailleur
f0e56abac7 NEW Module ticket is available as a stable module 2019-02-11 19:16:37 +01:00
Laurent Destailleur
c095f802dd Dolibarrize module ticket 2019-02-11 14:51:59 +01:00
Frédéric FRANCE
152d8ffcbf Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
2d4ccec309 Fix document generation of modulebuilder 2019-02-09 14:12:36 +01:00
Frédéric FRANCE
580e5c42d2 GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
5483856543 Fix phpcs 2019-02-08 23:53:40 +01:00
Laurent Destailleur
e2934a6b5f Error message returned by old non "addreplace" hooks is propagated too 2019-02-08 19:38:52 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Frédéric FRANCE
f548a0ed79 desactivate button on click to avoid multiple clicks 2019-02-08 11:01:47 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
7334f02e5c Merge pull request #10514 from atm-florian/dev_defautselectcustomertype 
Dev defautselectcustomertype
 2019-02-08 09:56:29 +01:00
florian HENRY
6ee5a9e2a6 fix travis 2019-02-07 12:21:33 +01:00
florian HENRY
3f20cae6d3 NEW: setup default thridparty type (customer or prospect/customer) 2019-02-06 10:54:11 +01:00
florian HENRY
95cc9faf7e fix php warning 2019-02-06 09:01:24 +01:00
Frédéric FRANCE
e1e14ae6e6 wip 2019-02-03 22:58:56 +01:00