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

7215 Commits

Author SHA1 Message Date
Laurent Destailleur
deb6186338 Merge pull request #11569 from aspangaro/11.0_fiscalyear 
NEW Box use fiscal year
 2019-08-10 01:47:55 +02:00
John Botella
401dc12b93 Add color blind option in body for css impact 2019-08-07 12:15:55 +02:00
John Botella
63191dab7d Add user color blind option 2019-08-07 12:03:19 +02:00
John Botella
cafd4fc599 New living color for chart 2019-08-06 15:24:42 +02:00
John Botella
bc0508164b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-06 09:57:49 +02:00
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +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
4fb8f6663a Fix code comment 2019-08-02 17:16:13 +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
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +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
a260e7391f FIX for #11232 2019-08-01 14:24:54 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +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
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
Laurent Destailleur
ed7a57e3ef Merge pull request #11571 from atm-john/9.0_fix_showOutputField 
Fix sellist showOuputField
 2019-07-30 21:40:37 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Vaadasch
23bca6f4cd Change "DOCUMENT_URI" to "PHP_SELF" 
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
 2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec Change 0 and 1 to FALSE and TRUE for pgsql 
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
 2019-07-30 19:35:03 +02:00
Alexandre SPANGARO
b146004966 Fix travis 2019-07-30 11:06:40 +02:00
Alexandre SPANGARO
8228979e67 Fix travis 2019-07-30 09:18:18 +02:00
Laurent Destailleur
ecc0b4ed32 Add prefixsession in event table 2019-07-29 02:16:21 +02:00
Alexandre SPANGARO
3e69421ec3 Fix travis 2019-07-28 07:33:57 +02:00
ATM john
581ae226ff Fix sellist showOuputField 2019-07-27 18:25:25 +02:00
Maxime Kohlhaas
5c2763d0dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin 2019-07-27 10:53:43 +02:00
Alexandre SPANGARO
83e2f71e07 Fix travis 2019-07-27 07:56:33 +02:00
Alexandre SPANGARO
053ae8224b NEW Box use fiscal year (Thanks Yves57) 2019-07-27 06:36:39 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Nicolas ZABOURI
3bdbbc7147 NEW list of boxes area 2019-07-26 17:17:59 +02:00
Laurent Destailleur
1ca3c6e3ae Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:17:47 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
111c0dcadd Comment 2019-07-25 17:46:48 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
9ddb8a5b0b Fix tooltip to say closed project are not visibles 2019-07-23 14:41:29 +02:00
Laurent Destailleur
59555d00ff Merge pull request #11531 from BadPixxel/patch-5 
FIX: Units Scale Missing in Object CRUD
 2019-07-22 18:31:43 +02:00
Regis Houssin
6409cc06ae FIX duplicate on the check (TODO field $onetrtd not used ?) 2019-07-22 11:44:56 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99 FIX missing token 2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8 FIX missing token 2019-07-20 11:44:31 +02:00
Laurent Destailleur
de4142e23e FIX Add message from public interface 2019-07-19 23:57:35 +02:00
Laurent Destailleur
ec34ce1e64 Maxi debug of module ticket 2019-07-19 23:11:00 +02:00