Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

17941 Commits

Author SHA1 Message Date
John Botella
bc0508164b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-06 09:57:49 +02:00
Frédéric FRANCE
7f23b77cbe Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
Regis Houssin
e81ccf1cff FIX addinf a "div" for better interaction with login submit button 2019-08-04 17:21:13 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
Laurent Destailleur
31648f856c FIX format of field with type timestamp 2019-08-04 13:04:37 +02:00
Laurent Destailleur
5b2ca3b631 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-08-03 16:37:25 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-08-03 16:35:15 +02:00
Laurent Destailleur
acf8314935 FIX Missing where on entity 2019-08-03 16:32:35 +02:00
Alexandre SPANGARO
7eb48a3f9c Fix month of the fiscal year start min 1 max 12 / january = 1 2019-08-03 06:04:42 +02:00
Alexandre SPANGARO
552f160235 Merge branch 'develop' into 11.0_fiscalyear 2019-08-03 05:59:57 +02:00
Laurent Destailleur
55e9335cd2 Fix code comment 2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security 
checks.
 2019-08-02 19:25:50 +02:00
Laurent Destailleur
5ee9a88181 NEW Add anonymous telemetry 2019-08-02 19:21:25 +02:00
Laurent Destailleur
4fb8f6663a Fix code comment 2019-08-02 17:16:13 +02:00
Laurent Destailleur
b9ee95314a SEC restrictedArea protects also the 'update' action 2019-08-02 17:12:59 +02:00
Laurent Destailleur
89a5a8188f Fix A file for a hidden feature provides a service without security 
checks.
 2019-08-02 17:12:03 +02:00
Laurent Destailleur
dc79f8d26b Code comment 2019-08-02 16:52:36 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Juanjo Menent
03a2377abc Fix: allow access from any other class that inherits Form class. 2019-08-02 12:31:24 +02:00
Laurent Destailleur
0bc90d81c8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-02 12:05:12 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00
Laurent Destailleur
ded8a71b9a Merge pull request #11614 from grandoc/patch_01_08_2019 
add some translation
 2019-08-01 16:39:05 +02:00
Laurent Destailleur
cd0d5c41f5 Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
Laurent Destailleur
a03771ce61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:40 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
Laurent Destailleur
bf14b4b3d5 Add Canada Dollar in currency that need symbol before 2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b Merge pull request #11605 from grandoc/new_branch_01_08_2019 
add CAN$ within list of currencies before
 2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af Update functions.lib.php 2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19 Update functions.lib.php 2019-08-01 16:14:53 +02:00
Philippe GRAND
18a56c7ef2 add some translation 2019-08-01 15:59:37 +02:00
dolibarr95
b066431e0e Add phone format for Jamaica 2019-08-01 15:46:34 +02:00
Philippe GRAND
b32dbbfb74 Merge remote-tracking branch 'upstream/develop' into develop 2019-08-01 15:43:30 +02:00
Laurent Destailleur
d6ae62478c FIX #10984 FIX reposition on "Build backup" button 
FIX Fatal error on dol_htmloutput_mesg with corrupted array
 2019-08-01 15:42:44 +02:00
Laurent Destailleur
90ddc0a214 FIX #10930 2019-08-01 14:27:57 +02:00
Laurent Destailleur
a260e7391f FIX for #11232 2019-08-01 14:24:54 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
12b530c418 FIX Setup of TakePos was not possible after a clean install 2019-08-01 11:27:35 +02:00
atm-arnaud
f64092a1e8 FIX order or proposals billed if both workflow conf activated 2019-08-01 11:00:49 +02:00
Philippe GRAND
4b8963587a add CAN$ within list of currencies before 2019-08-01 10:02:53 +02:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
9baf21f492 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 22:03:13 +02:00
Laurent Destailleur
754ed1b93b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-07-30 22:03:02 +02:00
Laurent Destailleur
6b789a13a1 Merge pull request #11562 from atm-quentin/FIX_pdf_cheque 
FIX name was able to be in field but went back to new line
 2019-07-30 22:00:58 +02:00
Laurent Destailleur
a7390e7e47 Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00