2
0
forked from Wavyzz/dolibarr
Commit Graph

6736 Commits

Author SHA1 Message Date
Frédéric FRANCE
915841eeb9 wip 2019-02-25 22:50:19 +01:00
Frédéric FRANCE
c89e4d79b8 wip 2019-02-25 22:27:04 +01:00
Frédéric FRANCE
1e6ed94c5e Update extrafields.class.php
The property $errno was declared of type integer, but $this->db->lasterrno() is of type string
2019-02-25 21:39:45 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Laurent Destailleur
6b46a927f1 Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Laurent Destailleur
2eb48a6046 Merge pull request #10673 from frederic34/patch-3
Update extrafields.class.php
2019-02-24 20:43:44 +01:00
Laurent Destailleur
52bcef38fc Merge pull request #10672 from frederic34/patch-1
Update html.formfile.class.php
2019-02-24 20:39:32 +01:00
Laurent Destailleur
3fa2680859 Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
03714e4bed Update extrafields.class.php 2019-02-24 09:17:45 +01:00
Frédéric FRANCE
042c6cc56e Update html.formfile.class.php 2019-02-24 08:50:35 +01:00
Frédéric FRANCE
c7df326a91 replace html code by html5 2019-02-23 22:31:57 +01:00
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